Avoid generating invalid names with "'" in the middle of them.

[helm.git] / helm / software / components / cic_proof_checking / freshNamesGenerator.ml

diff --git a/helm/software/components/cic_proof_checking/freshNamesGenerator.ml b/helm/software/components/cic_proof_checking/freshNamesGenerator.ml
index 99c9e4d76c9d93f51e070fce5aca31487c6099af..3cfda02dff123a649bf51005ed6a0c01647c275d 100755 (executable)
--- a/helm/software/components/cic_proof_checking/freshNamesGenerator.ml
+++ b/helm/software/components/cic_proof_checking/freshNamesGenerator.ml
@@ -60,8 +60,10 @@ let rec guess_a_name context ty =
   | Cic.Implicit _ -> assert false
   | Cic.Cast (t1,t2) -> guess_a_name context t1
   | Cic.Prod (na_,_,t) -> higher_name 1 t
-  | Cic.Lambda _ -> assert false                   
-  | Cic.LetIn (_,s,t) -> guess_a_name context (CicSubstitution.subst s t)
+(* warning: on appl we should beta reduce before the recursive call
+  | Cic.Lambda _ -> assert false   
+*)
+  | Cic.LetIn (_,s,t) -> guess_a_name context (CicSubstitution.subst ~avoid_beta_redexes:true s t)
   | Cic.Appl [] -> assert false
   | Cic.Appl (he::_) -> guess_a_name context he 
   | Cic.Const (uri,_)
@@ -81,7 +83,8 @@ let mk_fresh_name ~subst metasenv context name ~typ =
        (try
         let ty,_ = 
           CicTypeChecker.type_of_aux' ~subst metasenv context typ 
-            CicUniv.empty_ugraph in 
+            CicUniv.oblivion_ugraph 
+        in 
          (match ty with
              C.Sort C.Prop
            | C.Sort C.CProp -> "H"
@@ -90,7 +93,7 @@ let mk_fresh_name ~subst metasenv context name ~typ =
         with CicTypeChecker.TypeCheckerFailure _ -> "H"
        )
     | C.Name name ->
-       Str.global_replace (Str.regexp "[0-9]*$") "" name
+       Str.global_replace (Str.regexp "[0-9']*$") "" name
   in
    let already_used name =
     List.exists (function Some (n,_) -> n=name | _ -> false) context