let irl = identity_relocation_list_for_metavariable context in
(*CSC: Bug: se ci sono due term uguali nella prova dovrei bucarne uno solo!!!*)
let bo' =
- ProofEngineReduction.replace (==) term (C.Meta (newmeta,irl)) bo
+ ProofEngineReduction.replace (==) [term] [C.Meta (newmeta,irl)] bo
in
(* It may be possible that some metavariables occurred only in *)
(* the term we are perforating and they now occurs no more. We *)
(* Some easy tactics. *)
(************************************************************)
-(*CSC: generatore di nomi? Chiedere il nome? *)
-let fresh_name =
- let next_fresh_index = ref 0 in
- function () ->
- incr next_fresh_index ;
- "fresh_name" ^ string_of_int !next_fresh_index
-
(* Reduces [term] using [reduction_function] in the current scratch goal [ty] *)
-let reduction_tactic_in_scratch reduction_function term ty =
+let reduction_tactic_in_scratch reduction_function terms ty =
let metasenv =
match !proof with
None -> []
None -> assert false
| Some metano -> List.find (function (m,_,_) -> m=metano) metasenv
in
- let term' = reduction_function context term in
+ let terms' = List.map (reduction_function context) terms in
ProofEngineReduction.replace
- ~equality:(==) ~what:term ~with_what:term' ~where:ty
+ ~equality:(==) ~what:terms ~with_what:terms' ~where:ty
;;
let whd_in_scratch = reduction_tactic_in_scratch CicReduction.whd
let can_apply term = can_apply_tactic (PrimitiveTactics.apply_tac ~term)
let apply term = apply_tactic (PrimitiveTactics.apply_tac ~term)
-let intros () =
- apply_tactic (PrimitiveTactics.intros_tac ~mknames:fresh_name)
-let cut term = apply_tactic (PrimitiveTactics.cut_tac ~term)
-let letin term = apply_tactic (PrimitiveTactics.letin_tac ~term)
+let intros ?mk_fresh_name_callback () =
+ apply_tactic (PrimitiveTactics.intros_tac ?mk_fresh_name_callback ())
+let cut ?mk_fresh_name_callback term =
+ apply_tactic (PrimitiveTactics.cut_tac ?mk_fresh_name_callback term)
+let letin ?mk_fresh_name_callback term =
+ apply_tactic (PrimitiveTactics.letin_tac ?mk_fresh_name_callback term)
let exact term = apply_tactic (PrimitiveTactics.exact_tac ~term)
-let elim_simpl_intros term =
- apply_tactic (PrimitiveTactics.elim_simpl_intros_tac ~term)
+let elim_intros_simpl term =
+ apply_tactic (PrimitiveTactics.elim_intros_simpl_tac ~term)
let change ~goal_input:what ~input:with_what =
apply_tactic (PrimitiveTactics.change_tac ~what ~with_what)
(* reduction tactics *)
-let whd term =
+let whd terms =
apply_tactic
- (ReductionTactics.whd_tac ~also_in_hypotheses:true ~term:(Some term))
-let reduce term =
+ (ReductionTactics.whd_tac ~also_in_hypotheses:true ~terms:(Some terms))
+let reduce terms =
apply_tactic
- (ReductionTactics.reduce_tac ~also_in_hypotheses:true ~term:(Some term))
-let simpl term =
+ (ReductionTactics.reduce_tac ~also_in_hypotheses:true ~terms:(Some terms))
+let simpl terms =
apply_tactic
- (ReductionTactics.simpl_tac ~also_in_hypotheses:true ~term:(Some term))
+ (ReductionTactics.simpl_tac ~also_in_hypotheses:true ~terms:(Some terms))
let fold_whd term =
apply_tactic
apply_tactic
(ReductionTactics.fold_tac ~reduction:ProofEngineReduction.reduce
~also_in_hypotheses:true ~term)
+let fold_simpl term =
+ apply_tactic
+ (ReductionTactics.fold_tac ~reduction:ProofEngineReduction.simpl
+ ~also_in_hypotheses:true ~term)
(* other tactics *)
-let elim_type term = apply_tactic (VariousTactics.elim_type_tac ~term)
+let elim_type term = apply_tactic (EliminationTactics.elim_type_tac ~term)
let ring () = apply_tactic Ring.ring_tac
let fourier () = apply_tactic FourierR.fourier_tac
-let rewrite_simpl term = apply_tactic (VariousTactics.rewrite_simpl_tac ~term)
-let reflexivity () = apply_tactic VariousTactics.reflexivity_tac
-let symmetry () = apply_tactic VariousTactics.symmetry_tac
-let transitivity term = apply_tactic (VariousTactics.transitivity_tac ~term)
+let rewrite_simpl term = apply_tactic (EqualityTactics.rewrite_simpl_tac ~term)
+let rewrite_back_simpl term = apply_tactic (EqualityTactics.rewrite_back_simpl_tac ~term)
+let replace ~goal_input:what ~input:with_what =
+ apply_tactic (EqualityTactics.replace_tac ~what ~with_what)
-let exists () = apply_tactic VariousTactics.exists_tac
-let split () = apply_tactic VariousTactics.split_tac
-let left () = apply_tactic VariousTactics.left_tac
-let right () = apply_tactic VariousTactics.right_tac
+let reflexivity () = apply_tactic EqualityTactics.reflexivity_tac
+let symmetry () = apply_tactic EqualityTactics.symmetry_tac
+let transitivity term = apply_tactic (EqualityTactics.transitivity_tac ~term)
+
+let exists () = apply_tactic IntroductionTactics.exists_tac
+let split () = apply_tactic IntroductionTactics.split_tac
+let left () = apply_tactic IntroductionTactics.left_tac
+let right () = apply_tactic IntroductionTactics.right_tac
let assumption () = apply_tactic VariousTactics.assumption_tac
-let generalize term = apply_tactic (VariousTactics.generalize_tac ~term)
+let generalize ?mk_fresh_name_callback terms =
+ apply_tactic (VariousTactics.generalize_tac ?mk_fresh_name_callback terms)
-let absurd term = apply_tactic (VariousTactics.absurd_tac ~term)
-let contradiction () = apply_tactic VariousTactics.contradiction_tac
+let absurd term = apply_tactic (NegationTactics.absurd_tac ~term)
+let contradiction () = apply_tactic NegationTactics.contradiction_tac
-let decompose ~clist = apply_tactic (VariousTactics.decompose_tac ~clist)
+let decompose ~uris_choice_callback term =
+ apply_tactic (EliminationTactics.decompose_tac ~uris_choice_callback term)
-(*
-let decide_equality () = apply_tactic VariousTactics.decide_equality_tac
-let compare term1 term2 = apply_tactic (VariousTactics.compare_tac ~term1 ~term2)
-*)
+let injection term = apply_tactic (DiscriminationTactics.injection_tac ~term)
+let discriminate term = apply_tactic (DiscriminationTactics.discriminate_tac ~term)
+let decide_equality () = apply_tactic DiscriminationTactics.decide_equality_tac
+let compare term = apply_tactic (DiscriminationTactics.compare_tac ~term)
(*
let prova_tatticali () = apply_tactic Tacticals.prova_tac