Added new module DiscriminationTactics

diff --git a/helm/gTopLevel/proofEngine.ml b/helm/gTopLevel/proofEngine.ml
index 1d7eae9a59d9dda14b097c67be747a231e82d941..afa63689bf64daceda2e4dc14f2c3e9e878121a9 100644 (file)
--- a/helm/gTopLevel/proofEngine.ml
+++ b/helm/gTopLevel/proofEngine.ml
@@ -238,10 +238,10 @@ let contradiction () = apply_tactic NegationTactics.contradiction_tac
 let decompose ~uris_choice_callback term =
  apply_tactic (EliminationTactics.decompose_tac ~uris_choice_callback term)
 
-let injection term = apply_tactic (DiscriminateTactics.injection_tac ~term)
-let discriminate term = apply_tactic (DiscriminateTactics.discriminate_tac ~term)
-let decide_equality () = apply_tactic DiscriminateTactics.decide_equality_tac
-let compare term = apply_tactic (DiscriminateTactics.compare_tac ~term)
+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

diff --git a/helm/ocaml/tactics/.depend b/helm/ocaml/tactics/.depend
index 9519dd6aa401d2a756fd655f241e2182f422b0df..e6dc05be5832c4c58ae1048b674e014002dc86f6 100644 (file)
--- a/helm/ocaml/tactics/.depend
+++ b/helm/ocaml/tactics/.depend
@@ -8,7 +8,7 @@ introductionTactics.cmi: proofEngineTypes.cmo
 eliminationTactics.cmi: proofEngineTypes.cmo 
 negationTactics.cmi: proofEngineTypes.cmo 
 equalityTactics.cmi: proofEngineTypes.cmo 
-discriminateTactics.cmi: proofEngineTypes.cmo 
+discriminationTactics.cmi: proofEngineTypes.cmo 
 ring.cmi: proofEngineTypes.cmo 
 fourierR.cmi: proofEngineTypes.cmo 
 proofEngineReduction.cmo: proofEngineReduction.cmi 
@@ -31,10 +31,12 @@ primitiveTactics.cmo: proofEngineHelpers.cmi proofEngineReduction.cmi \
 primitiveTactics.cmx: proofEngineHelpers.cmx proofEngineReduction.cmx \
     proofEngineTypes.cmx reductionTactics.cmx tacticals.cmx \
     primitiveTactics.cmi 
-variousTactics.cmo: primitiveTactics.cmi proofEngineReduction.cmi \
-    proofEngineTypes.cmo tacticals.cmi variousTactics.cmi 
-variousTactics.cmx: primitiveTactics.cmx proofEngineReduction.cmx \
-    proofEngineTypes.cmx tacticals.cmx variousTactics.cmi 
+variousTactics.cmo: primitiveTactics.cmi proofEngineHelpers.cmi \
+    proofEngineReduction.cmi proofEngineTypes.cmo tacticals.cmi \
+    variousTactics.cmi 
+variousTactics.cmx: primitiveTactics.cmx proofEngineHelpers.cmx \
+    proofEngineReduction.cmx proofEngineTypes.cmx tacticals.cmx \
+    variousTactics.cmi 
 introductionTactics.cmo: primitiveTactics.cmi proofEngineTypes.cmo \
     introductionTactics.cmi 
 introductionTactics.cmx: primitiveTactics.cmx proofEngineTypes.cmx \
@@ -55,12 +57,12 @@ equalityTactics.cmx: introductionTactics.cmx primitiveTactics.cmx \
     proofEngineHelpers.cmx proofEngineReduction.cmx \
     proofEngineStructuralRules.cmx proofEngineTypes.cmx reductionTactics.cmx \
     tacticals.cmx equalityTactics.cmi 
-discriminateTactics.cmo: eliminationTactics.cmi equalityTactics.cmi \
+discriminationTactics.cmo: eliminationTactics.cmi equalityTactics.cmi \
     introductionTactics.cmi primitiveTactics.cmi proofEngineTypes.cmo \
-    tacticals.cmi discriminateTactics.cmi 
-discriminateTactics.cmx: eliminationTactics.cmx equalityTactics.cmx \
+    tacticals.cmi discriminationTactics.cmi 
+discriminationTactics.cmx: eliminationTactics.cmx equalityTactics.cmx \
     introductionTactics.cmx primitiveTactics.cmx proofEngineTypes.cmx \
-    tacticals.cmx discriminateTactics.cmi 
+    tacticals.cmx discriminationTactics.cmi 
 ring.cmo: eliminationTactics.cmi equalityTactics.cmi primitiveTactics.cmi \
     proofEngineStructuralRules.cmi proofEngineTypes.cmo tacticals.cmi \
     ring.cmi 

diff --git a/helm/ocaml/tactics/Makefile b/helm/ocaml/tactics/Makefile
index 016c8098842bad683802e795050f0c39e43379b2..f82a7d48fc2a1384a24baa2ffbc9486f3a758c2a 100644 (file)
--- a/helm/ocaml/tactics/Makefile
+++ b/helm/ocaml/tactics/Makefile
@@ -6,14 +6,14 @@ INTERFACE_FILES =     \
        tacticals.mli reductionTactics.mli proofEngineStructuralRules.mli       \
        primitiveTactics.mli variousTactics.mli introductionTactics.mli \
        eliminationTactics.mli negationTactics.mli equalityTactics.mli  \
-       discriminateTactics.mli ring.mli        \
+       discriminationTactics.mli ring.mli      \
        fourierR.mli
 IMPLEMENTATION_FILES = \
        proofEngineTypes.ml proofEngineReduction.ml proofEngineHelpers.ml       \
        fourier.ml tacticals.ml reductionTactics.ml proofEngineStructuralRules.ml       \
        primitiveTactics.ml variousTactics.ml introductionTactics.ml    \
        eliminationTactics.ml negationTactics.ml equalityTactics.ml     \
-       discriminateTactics.ml ring.ml  \
+       discriminationTactics.ml ring.ml        \
        fourierR.ml