X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2Fring.ml;h=4691239f411eb78362ce68dc29e839450675c6e2;hb=b41886e9d21d756279bd6a2ec3f19c17b1a64401;hp=f9755474c0a59cdd418665328ca663f7d542fbb1;hpb=1db1b755ae0878041b3051886823275c19b01419;p=helm.git diff --git a/helm/ocaml/tactics/ring.ml b/helm/ocaml/tactics/ring.ml index f9755474c..4691239f4 100644 --- a/helm/ocaml/tactics/ring.ml +++ b/helm/ocaml/tactics/ring.ml @@ -130,15 +130,16 @@ let uri_of_proof ~proof:(uri, _, _, _) = uri @raise Failure if proof is None @return current goal's metasenv *) -let metasenv_of_status ~status:((_,m,_,_), _) = m +let metasenv_of_status ((_,m,_,_), _) = m (** @param status a proof engine status @raise Failure when proof or goal are None @return context corresponding to current goal *) -let context_of_status ~status:(proof, goal as status) = - let metasenv = metasenv_of_status ~status:status in +let context_of_status status = + let (proof, goal) = status in + let metasenv = metasenv_of_status status in let _, context, _ = CicUtil.lookup_meta goal metasenv in context @@ -376,10 +377,10 @@ let status_of_single_goal_tactic_result = @param status current proof engine status @param term term to cut *) -let elim_type_tac ~term ~status = +let elim_type_tac ~term status = warn "in Ring.elim_type_tac"; Tacticals.thens ~start:(cut_tac ~term) - ~continuations:[elim_simpl_intros_tac ~term:(Cic.Rel 1) ; Tacticals.id_tac] ~status + ~continuations:[elim_simpl_intros_tac ~term:(Cic.Rel 1) ; Tacticals.id_tac] status *) (** @@ -388,11 +389,15 @@ let elim_type_tac ~term ~status = @param term term to cut @param proof term used to prove second subgoal generated by elim_type *) -let elim_type2_tac ~term ~proof ~status = +let elim_type2_tac ~term ~proof = + let elim_type2_tac ~term ~proof status = let module E = EliminationTactics in warn "in Ring.elim_type2"; - Tacticals.thens ~start:(E.elim_type_tac ~term) - ~continuations:[Tacticals.id_tac ; exact_tac ~term:proof] ~status + ProofEngineTypes.apply_tactic + (Tacticals.thens ~start:(E.elim_type_tac ~term) + ~continuations:[Tacticals.id_tac ; exact_tac ~term:proof]) status + in + ProofEngineTypes.mk_tactic (elim_type2_tac ~term ~proof) (* Galla: spostata in variousTactics.ml (** @@ -401,11 +406,11 @@ let elim_type2_tac ~term ~proof ~status = only refl_eqT, coq's one also try "refl_equal" @param status current proof engine status *) -let reflexivity_tac ~status:(proof, goal) = +let reflexivity_tac (proof, goal) = warn "in Ring.reflexivity_tac"; let refl_eqt = mkCtor ~uri:refl_eqt_uri ~exp_named_subst:[] in try - apply_tac ~status:(proof, goal) ~term:refl_eqt + apply_tac (proof, goal) ~term:refl_eqt with (Fail _) as e -> let e_str = Printexc.to_string e in raise (Fail ("Reflexivity failed with exception: " ^ e_str)) @@ -422,15 +427,18 @@ let lift ~n (a,b,c,d,e,f,g,h) = @param count number of hypotheses to remove @param status current proof engine status *) -let purge_hyps_tac ~count ~status:(proof, goal as status) = +let purge_hyps_tac ~count = + let purge_hyps_tac ~count status = let module S = ProofEngineStructuralRules in + let (proof, goal) = status in let rec aux n context status = assert(n>=0); match (n, context) with | (0, _) -> status | (n, hd::tl) -> aux (n-1) tl - (status_of_single_goal_tactic_result (S.clear ~hyp:hd ~status)) + (status_of_single_goal_tactic_result + (ProofEngineTypes.apply_tactic (S.clear ~hyp:hd) status)) | (_, []) -> failwith "Ring.purge_hyps_tac: no hypotheses left" in let (_, metasenv, _, _) = proof in @@ -438,6 +446,8 @@ let purge_hyps_tac ~count ~status:(proof, goal as status) = let proof',goal' = aux count context status in assert (goal = goal') ; proof',[goal'] + in + ProofEngineTypes.mk_tactic (purge_hyps_tac ~count) (** THE TACTIC! *) @@ -445,11 +455,13 @@ let purge_hyps_tac ~count ~status:(proof, goal as status) = Ring tactic, does associative and commutative rewritings in Reals ring @param status current proof engine status *) -let ring_tac ~status:((proof, goal) as status) = + +let ring_tac status = + let (proof, goal) = status in warn "in Ring tactic"; let eqt = mkMutInd (Logic.eq_URI, 0) [] in let r = Reals.r in - let metasenv = metasenv_of_status ~status in + let metasenv = metasenv_of_status status in let (metano, context, ty) = CicUtil.lookup_meta goal metasenv in let (t1, t2) = split_eq ty in (* goal like t1 = t2 *) match (build_segments ~terms:[t1; t2]) with @@ -464,8 +476,8 @@ let ring_tac ~status:((proof, goal) as status) = t2; t2'; t2''; t2'_eq_t2'']); try let new_hyps = ref 0 in (* number of new hypotheses created *) - Tacticals.try_tactics - ~status + ProofEngineTypes.apply_tactic + (Tacticals.try_tactics ~tactics:[ "reflexivity", EqualityTactics.reflexivity_tac ; "exact t1'_eq_t1''", exact_tac ~term:t1'_eq_t1'' ; @@ -480,15 +492,19 @@ let ring_tac ~status:((proof, goal) as status) = ] ; t1'_eq_t1'' ]) ; - "elim_type eqt su t1 ...", (fun ~status -> + "elim_type eqt su t1 ...", ProofEngineTypes.mk_tactic (fun status -> let status' = (* status after 1st elim_type use *) - let context = context_of_status ~status in - if not (are_convertible context t1'' t1) then begin + let context = context_of_status status in + let b,_ = (*TASSI : FIXME*) + are_convertible context t1'' t1 CicUniv.empty_ugraph in + if not b then begin warn "t1'' and t1 are NOT CONVERTIBLE"; let newstatus = - elim_type2_tac (* 1st elim_type use *) - ~status ~proof:t1'_eq_t1'' - ~term:(Cic.Appl [eqt; r; t1''; t1]) + ProofEngineTypes.apply_tactic + (elim_type2_tac (* 1st elim_type use *) + ~proof:t1'_eq_t1'' + ~term:(Cic.Appl [eqt; r; t1''; t1])) + status in incr new_hyps; (* elim_type add an hyp *) match newstatus with @@ -503,8 +519,8 @@ let ring_tac ~status:((proof, goal) as status) = lift 1 (t1,t1',t1'',t1'_eq_t1'', t2,t2',t2'',t2'_eq_t2'') in let status'' = - Tacticals.try_tactics (* try to solve 1st subgoal *) - ~status:status' + ProofEngineTypes.apply_tactic + (Tacticals.try_tactics (* try to solve 1st subgoal *) ~tactics:[ "exact t2'_eq_t2''", exact_tac ~term:t2'_eq_t2''; "exact sym_eqt su t2 ...", @@ -518,15 +534,21 @@ let ring_tac ~status:((proof, goal) as status) = ] ; t2'_eq_t2'' ]) ; - "elim_type eqt su t2 ...", (fun ~status -> + "elim_type eqt su t2 ...", + ProofEngineTypes.mk_tactic (fun status -> let status' = - let context = context_of_status ~status in - if not (are_convertible context t2'' t2) then begin + let context = context_of_status status in + let b,_ = (* TASSI:FIXME *) + are_convertible context t2'' t2 CicUniv.empty_ugraph + in + if not b then begin warn "t2'' and t2 are NOT CONVERTIBLE"; let newstatus = - elim_type2_tac (* 2nd elim_type use *) - ~status ~proof:t2'_eq_t2'' - ~term:(Cic.Appl [eqt; r; t2''; t2]) + ProofEngineTypes.apply_tactic + (elim_type2_tac (* 2nd elim_type use *) + ~proof:t2'_eq_t2'' + ~term:(Cic.Appl [eqt; r; t2''; t2])) + status in incr new_hyps; (* elim_type add an hyp *) match newstatus with @@ -539,12 +561,16 @@ let ring_tac ~status:((proof, goal) as status) = in try (* try to solve main goal *) warn "trying reflexivity ...."; - EqualityTactics.reflexivity_tac ~status:status' + ProofEngineTypes.apply_tactic + EqualityTactics.reflexivity_tac status' with (Fail _) -> (* leave conclusion to the user *) warn "reflexivity failed, solution's left as an ex :-)"; - purge_hyps_tac ~count:!new_hyps ~status:status')] + ProofEngineTypes.apply_tactic + (purge_hyps_tac ~count:!new_hyps) status')]) + status' in - status'')] + status'')]) + status with (Fail s) -> raise (Fail ("Ring failure: " ^ s)) end @@ -552,9 +578,12 @@ let ring_tac ~status:((proof, goal) as status) = assert false (* wrap ring_tac catching GoalUnringable and raising Fail *) -let ring_tac ~status = + +let ring_tac status = try - ring_tac ~status + ring_tac status with GoalUnringable -> raise (Fail "goal unringable") +let ring_tac = ProofEngineTypes.mk_tactic ring_tac +