aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authornotin2007-08-16 11:16:43 +0000
committernotin2007-08-16 11:16:43 +0000
commit4e06ff81b384ab51009abfeede8bce5f95f2bf39 (patch)
treecfbc8f7e8fe98c6c90da8f375bcc057cea8c7b97 /contrib
parentdd547b82c2aefa5127f2aadf6925d4cdb11b92d4 (diff)
Correction du bug #1680: ajout d'un champ avoid_ids dans interp_sign;
modification de interp_ltac_reference pour passer les ids utilisées dans le contexte d'appel d'une tactique. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10076 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'contrib')
-rw-r--r--contrib/field/field.ml42
-rw-r--r--contrib/romega/ReflOmegaCore.v8
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/field/field.ml4 b/contrib/field/field.ml4
index b8a978d84e..93de6118b6 100644
--- a/contrib/field/field.ml4
+++ b/contrib/field/field.ml4
@@ -159,7 +159,7 @@ let field g =
| Some (eq,t::args) when eq = (Coqlib.build_coq_eq_data()).Coqlib.eq -> t
| _ -> error "The statement is not built from Leibniz' equality" in
let th = VConstr (lookup (pf_env g) typ) in
- (interp_tac_gen [(id_of_string "FT",th)] (get_debug ())
+ (interp_tac_gen [(id_of_string "FT",th)] [] (get_debug ())
<:tactic< match goal with |- (@eq _ _ _) => field_gen FT end >>) g
(* Verifies that all the terms have the same type and gives the right theory *)
diff --git a/contrib/romega/ReflOmegaCore.v b/contrib/romega/ReflOmegaCore.v
index 0c18f47fc4..f3a82c05ed 100644
--- a/contrib/romega/ReflOmegaCore.v
+++ b/contrib/romega/ReflOmegaCore.v
@@ -2160,7 +2160,7 @@ Theorem not_exact_divide_valid :
Proof.
unfold valid_hyps, not_exact_divide in |- *; intros;
generalize (nth_valid ep e i lp); Simplify.
- rewrite (scalar_norm_add_stable t e), <-H0.
+ rewrite (scalar_norm_add_stable t e), <-H1.
do 2 rewrite <- scalar_norm_add_stable; simpl in *; intros.
absurd (interp_term e body * k1 + k2 = 0);
[ now apply OMEGA4 | symmetry; auto ].
@@ -2370,9 +2370,9 @@ Theorem exact_divide_valid :
Proof.
unfold valid1, exact_divide in |- *; intros k1 k2 t ep e p1;
Simplify; simpl; auto; subst;
- rewrite <- scalar_norm_stable; simpl; intros;
- [ destruct (mult_integral _ _ (sym_eq H)); intuition
- | swap H; rewrite <- H1, mult_0_l; auto
+ rewrite <- scalar_norm_stable; simpl; intros;
+ [ destruct (mult_integral _ _ (sym_eq H0)); intuition
+ | swap H0; rewrite <- H1, mult_0_l; auto
].
Qed.