passes ~subst to FreshNameGenerator

diff --git a/helm/ocaml/tactics/equalityTactics.ml b/helm/ocaml/tactics/equalityTactics.ml
index a649d4a23e2df518e77f37f96662fd02a3fb718e..fe566ab74f779a5e8ed27ab8a5f4ed2c020ea2ee 100644 (file)
--- a/helm/ocaml/tactics/equalityTactics.ml
+++ b/helm/ocaml/tactics/equalityTactics.ml
@@ -52,7 +52,7 @@ let rewrite_tac ~term:equality =
         ~what:[t1'] ~with_what:[C.Rel 1] ~where:gty'
       in
        C.Lambda
-        (FreshNamesGenerator.mk_fresh_name metasenv context C.Anonymous ty,
+        (FreshNamesGenerator.mk_fresh_name ~subst:[] metasenv context C.Anonymous ~typ:ty,
           ty, gty'')
      in
      let fresh_meta = ProofEngineHelpers.new_meta_of_proof proof in
@@ -113,7 +113,7 @@ let rewrite_back_tac ~term:equality =
         ~what:[t1'] ~with_what:[C.Rel 1] ~where:gty'
       in
        C.Lambda
-        (FreshNamesGenerator.mk_fresh_name metasenv context C.Anonymous ty,
+        (FreshNamesGenerator.mk_fresh_name ~subst:[] metasenv context C.Anonymous ~typ:ty,
           ty, gty'')
      in
      let fresh_meta = ProofEngineHelpers.new_meta_of_proof proof in

diff --git a/helm/ocaml/tactics/primitiveTactics.ml b/helm/ocaml/tactics/primitiveTactics.ml
index fa696856010431f53bb14546df11163a440c61b0..f959746e221a3912be73c7e04f3e7dedf838ba7d 100644 (file)
--- a/helm/ocaml/tactics/primitiveTactics.ml
+++ b/helm/ocaml/tactics/primitiveTactics.ml
@@ -119,7 +119,7 @@ let eta_expand metasenv context t arg =
     T.type_of_aux' metasenv context arg
    in
     let fresh_name =
-     FreshNamesGenerator.mk_fresh_name
+     FreshNamesGenerator.mk_fresh_name ~subst:[]
       metasenv context (Cic.Name "Heta") ~typ:argty
     in
      (C.Appl [C.Lambda (fresh_name,argty,aux 0 t) ; arg])
@@ -362,9 +362,9 @@ let apply_tac ~term =
  in
   mk_tactic (apply_tac ~term)
 
-let intros_tac ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name) ()=
+let intros_tac ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[]) ()=
  let intros_tac
-  ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name) ()
+  ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[]) ()
   (proof, goal)
  =
   let module C = Cic in
@@ -382,9 +382,9 @@ let intros_tac ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name) ()=
  in
   mk_tactic (intros_tac ~mk_fresh_name_callback ())
   
-let cut_tac ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name) ~term=
+let cut_tac ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[]) ~term=
  let cut_tac
-  ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name)
+  ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[])
   term (proof, goal)
  =
   let module C = Cic in
@@ -417,9 +417,9 @@ let cut_tac ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name) ~term=
  in
   mk_tactic (cut_tac ~mk_fresh_name_callback term)
 
-let letin_tac ?(mk_fresh_name_callback=FreshNamesGenerator.mk_fresh_name) ~term=
+let letin_tac ?(mk_fresh_name_callback=FreshNamesGenerator.mk_fresh_name ~subst:[]) ~term=
  let letin_tac
-  ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name)
+  ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[])
   term (proof, goal)
  =
   let module C = Cic in

diff --git a/helm/ocaml/tactics/variousTactics.ml b/helm/ocaml/tactics/variousTactics.ml
index 5be94e7df0dd87ee7b2c1368e30052d1e7318602..5e2e39c5df9343dab2d814aff8e59d4633469501 100644 (file)
--- a/helm/ocaml/tactics/variousTactics.ml
+++ b/helm/ocaml/tactics/variousTactics.ml
@@ -65,7 +65,7 @@ e li aggiunga nel context, poi si conta la lunghezza di questo nuovo
 contesto e si lifta di tot... COSA SIGNIFICA TUTTO CIO'?????? *)
 
 let generalize_tac 
- ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name) terms
+ ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[]) terms
  =
   let module PET = ProofEngineTypes in
   let generalize_tac mk_fresh_name_callback terms status =