diff options
| author |  Stephane Glondu <steph@glondu.net> | 2014-01-19 15:09:26 +0100 |
|---|---|---|
| committer | Stephane Glondu <steph@glondu.net> | 2014-01-19 15:09:26 +0100 |
| commit | 58545b00a1c1825d9e51b16c2986976dd45dd3b2 (patch) | |
| tree | c19584a3daef4f5cb042291f8079225e09e5e751 /plugins/setoid_ring/Field_tac.v | |
| parent | bdb99a4e91d98fa7be517808945e7f1c96dd8003 (diff) | |
| parent | d2c5c5e616a6e118291fe1ce9965c731adac03a8 (diff) | |
Merge tag 'upstream/8.4pl3dfsg'
Upstream version 8.4pl3dfsg
Diffstat (limited to 'plugins/setoid_ring/Field_tac.v')
| -rw-r--r-- | plugins/setoid_ring/Field_tac.v | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/setoid_ring/Field_tac.v b/plugins/setoid_ring/Field_tac.v index 8ac952c0..013fd0ef 100644 --- a/plugins/setoid_ring/Field_tac.v +++ b/plugins/setoid_ring/Field_tac.v @@ -201,7 +201,8 @@ Ltac fold_field_cond req := Ltac simpl_PCond FLD := let req := get_FldEq FLD in let lemma := get_CondLemma FLD in - try apply lemma; + try (apply lemma; intros lock lock_def; vm_compute; rewrite lock_def; + clear lock_def lock); protect_fv "field_cond"; fold_field_cond req; try exact I. @@ -209,7 +210,8 @@ Ltac simpl_PCond FLD := Ltac simpl_PCond_BEURK FLD := let req := get_FldEq FLD in let lemma := get_CondLemma FLD in - apply lemma; + try (apply lemma; intros lock lock_def; vm_compute; rewrite lock_def; + clear lock_def lock); protect_fv "field_cond"; fold_field_cond req. |