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:08:33 +0200 |
commit | 8b817cda643d180d43ab8c84809ca2d55c7dd3df (patch) | |
tree | 812fe2f7ec68c03c5f0762f1266f383193bbfe92 /cparser/validator/Interpreter_correct.v | |
parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
download | compcert-8b817cda643d180d43ab8c84809ca2d55c7dd3df.tar.gz compcert-8b817cda643d180d43ab8c84809ca2d55c7dd3df.zip |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'cparser/validator/Interpreter_correct.v')
-rw-r--r-- | cparser/validator/Interpreter_correct.v | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cparser/validator/Interpreter_correct.v b/cparser/validator/Interpreter_correct.v index 095b26ca..3a285158 100644 --- a/cparser/validator/Interpreter_correct.v +++ b/cparser/validator/Interpreter_correct.v @@ -68,7 +68,7 @@ Qed. Lemma pop_invariant: forall (symbols_to_pop symbols_popped:list symbol) (stack_cur:stack) - (A:Type) + (A:Type) (action:arrows_left (map symbol_semantic_type (rev_append symbols_to_pop symbols_popped)) A), forall word_stack word_popped, forall sem_popped, @@ -96,12 +96,12 @@ destruct e; simpl. dependent destruction H. destruct H0, H1. apply (Cons_ptl X), inhabits in X0. specialize (IHsymbols_to_pop _ _ _ action0 _ _ _ H X0). -match goal with +match goal with IHsymbols_to_pop:match ?p1 with Err => _ | OK _ => _ end |- match ?p2 with Err => _ | OK _ => _ end => replace p2 with p1; [destruct p1 as [|[]]|]; intuition end. destruct IHsymbols_to_pop as [word1res [word2res [sem_full []]]]; intuition; subst. -exists word1res. +exists word1res. eexists. exists sem_full. intuition. |