X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Focaml%2Ftactics%2FfourierR.ml;h=8b910bded8ebabe6c5695016930b4ef4325c721b;hb=b555e6b8c27c765a4611dda9528963ebff116412;hp=f586455a24d41a606204f445409cdfda6fac2c4c;hpb=d1126c6b78a3333bbf415daf027004496b77c2f4;p=helm.git diff --git a/helm/ocaml/tactics/fourierR.ml b/helm/ocaml/tactics/fourierR.ml index f586455a2..8b910bded 100644 --- a/helm/ocaml/tactics/fourierR.ml +++ b/helm/ocaml/tactics/fourierR.ml @@ -23,6 +23,8 @@ * http://cs.unibo.it/helm/. *) +(* $Id$ *) + (******************** THE FOURIER TACTIC ***********************) @@ -194,8 +196,8 @@ let rational_of_const = rational_of_term;; *) let fails f a = try - let tmp = (f a) in - false + ignore (f a); + false with _-> true ;; @@ -660,11 +662,7 @@ let tac_zero_inf_false gl (n,d) = apply_tactic (PrimitiveTactics.apply_tac ~term:_Rnot_lt0) status else apply_tactic (Tacticals.then_ - ~start:( mk_tactic (fun status -> - let (proof, goal) = status in - let curi,metasenv,pbo,pty = proof in - let metano,context,ty = CicUtil.lookup_meta goal metasenv in - apply_tactic (PrimitiveTactics.apply_tac ~term:_Rle_not_lt) status)) + ~start:(mk_tactic (apply_tactic (PrimitiveTactics.apply_tac ~term:_Rle_not_lt))) ~continuation:(tac_zero_infeq_pos gl (-n,d))) status in @@ -900,7 +898,7 @@ let equality_replace a b = let tcl_fail a (proof,goal) = match a with - 1 -> raise (ProofEngineTypes.Fail "fail-tactical") + 1 -> raise (ProofEngineTypes.Fail (lazy "fail-tactical")) | _ -> (proof,[goal]) ;; @@ -941,8 +939,6 @@ let rec fourier (s_proof,s_goal)= debug ("invoco fourier_tac sul goal "^string_of_int(s_goal)^" e contesto:\n"); debug_pcontext s_context; - let fhyp = String.copy "new_hyp_for_fourier" in - (* here we need to negate the thesis, but to do this we need to apply the right theoreme,so let's parse our thesis *)