X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_unification%2FfreshNamesGenerator.ml;h=0dc5dadae51d2b58317098888c3688ba48e10319;hb=46f19eadce5f3a11c0ae26934fd8d1b597906416;hp=fc1b4f36e7c5cabf9efe6c992dedf428087e573e;hpb=1c04fd27caa8bfb794848c90202bbc65b29c0cfa;p=helm.git diff --git a/helm/ocaml/cic_unification/freshNamesGenerator.ml b/helm/ocaml/cic_unification/freshNamesGenerator.ml index fc1b4f36e..0dc5dadae 100644 --- a/helm/ocaml/cic_unification/freshNamesGenerator.ml +++ b/helm/ocaml/cic_unification/freshNamesGenerator.ml @@ -23,18 +23,23 @@ * http://cs.unibo.it/helm/. *) +let debug_print = fun _ -> () + (* mk_fresh_name context name typ *) (* returns an identifier which is fresh in the context *) (* and that resembles [name] as much as possible. *) (* [typ] will be the type of the variable *) -let mk_fresh_name metasenv context name ~typ = +let mk_fresh_name ~subst metasenv context name ~typ = let module C = Cic in let basename = match name with C.Anonymous -> (*CSC: great space for improvements here *) (try - (match CicTypeChecker.type_of_aux' metasenv context typ with + let ty,_ = + CicTypeChecker.type_of_aux' ~subst metasenv context typ + CicUniv.empty_ugraph in + (match ty with C.Sort C.Prop | C.Sort C.CProp -> "H" | C.Sort C.Set -> "x" @@ -95,7 +100,7 @@ let clean_dummy_dependent_types t = in C.Meta(i,l'),rels | C.Sort _ as t -> t,[] - | C.Implicit as t -> t,[] + | C.Implicit _ as t -> t,[] | C.Cast (te,ty) -> let te',rels1 = aux k te in let ty',rels2 = aux k ty in @@ -108,7 +113,7 @@ let clean_dummy_dependent_types t = C.Anonymous -> if List.mem k rels2 then ( - prerr_endline "If this happens often, we can do something about it (i.e. we can generate a new fresh name; problem: we need the metasenv and context ;-(. Alternative solution: mk_implicit does not generate entries for the elements in the context that have no name" ; + debug_print "If this happens often, we can do something about it (i.e. we can generate a new fresh name; problem: we need the metasenv and context ;-(. Alternative solution: mk_implicit does not generate entries for the elements in the context that have no name" ; C.Anonymous ) else