diff options
| author | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
|---|---|---|
| committer | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:17:50 +0200 |
| commit | 136986c204af19341aeb455d72fe817b16fa6fff (patch) | |
| tree | 02e9178d9f2cf942bd32366891d480ff161406f6 /cparser/validator/Interpreter.v | |
| parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
| parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
| download | compcert-136986c204af19341aeb455d72fe817b16fa6fff.tar.gz compcert-136986c204af19341aeb455d72fe817b16fa6fff.zip | |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'cparser/validator/Interpreter.v')
| -rw-r--r-- | cparser/validator/Interpreter.v | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cparser/validator/Interpreter.v b/cparser/validator/Interpreter.v index 16be3859..2242065c 100644 --- a/cparser/validator/Interpreter.v +++ b/cparser/validator/Interpreter.v @@ -98,7 +98,7 @@ Fixpoint pop (symbols_to_pop:list symbol) (stack_cur:stack): result (stack * A) := match symbols_to_pop return forall {A:Type} (action:arrows_right A (map _ symbols_to_pop)), _ with | [] => fun A action => OK (stack_cur, action) - | t::q => fun A action => + | t::q => fun A action => match stack_cur with | existT state_cur sem::stack_rec => match compare_eqdec (last_symb_of_non_init_state state_cur) t with |