diff options
| author | barras | 2006-10-30 12:41:21 +0000 |
|---|---|---|
| committer | barras | 2006-10-30 12:41:21 +0000 |
| commit | 07b11f799ba50ccd5e59d35dbab570ec76c2fecc (patch) | |
| tree | 10e0d3262611233cafd152d88a350ff3ef1e4246 /theories | |
| parent | b01035b569bfd2767afd5e557cb975b24ddaf5ea (diff) | |
fixed field_simplify + changed precedence of let and fun in ltac
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@9319 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'theories')
| -rw-r--r-- | theories/Reals/Ranalysis.v | 19 | ||||
| -rw-r--r-- | theories/ZArith/Int.v | 4 |
2 files changed, 11 insertions, 12 deletions
diff --git a/theories/Reals/Ranalysis.v b/theories/Reals/Ranalysis.v index 854abdd601..44be747dad 100644 --- a/theories/Reals/Ranalysis.v +++ b/theories/Reals/Ranalysis.v @@ -789,14 +789,13 @@ Ltac reg := try (change (continuity_pt aux X2) in |- *; is_cont_pt) || is_cont_pt) | |- (derive_pt ?X1 ?X2 ?X3 = ?X4) => let trm := eval cbv beta in (X1 AppVar) in - let aux := rew_term trm in - (intro_hyp_pt aux X2; - let aux2 := deriv_proof aux X2 in - (try - (replace (derive_pt X1 X2 X3) with (derive_pt aux X2 aux2); - [ simplify_derive aux X2; - try - unfold plus_fct, minus_fct, mult_fct, div_fct, id, fct_cte, - inv_fct, opp_fct in |- *; (ring || ring_simplify) - | try apply pr_nu ]) || is_diff_pt)) + let aux := rew_term trm in + intro_hyp_pt aux X2; + (let aux2 := deriv_proof aux X2 in + try + (replace (derive_pt X1 X2 X3) with (derive_pt aux X2 aux2); + [ simplify_derive aux X2; + try unfold plus_fct, minus_fct, mult_fct, div_fct, id, fct_cte, + inv_fct, opp_fct in |- *; ring || ring_simplify + | try apply pr_nu ]) || is_diff_pt) end. diff --git a/theories/ZArith/Int.v b/theories/ZArith/Int.v index e7a9e06b69..4c9470b36e 100644 --- a/theories/ZArith/Int.v +++ b/theories/ZArith/Int.v @@ -374,8 +374,8 @@ Module MoreInt (I:Int). Ltac omega_max_genspec x y := generalize (max_spec x y); - let z := fresh "z" in let Hz := fresh "Hz" in - (set (z:=Zmax x y); clearbody z). + (let z := fresh "z" in let Hz := fresh "Hz" in + set (z:=Zmax x y); clearbody z). Ltac omega_max_loop := match goal with |