X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FgTopLevel%2FoldDisambiguate.ml;h=24dd30f91077f48c7daf21a87a130e988cb83553;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=db118b5187516a129ed59278a3e2cd059f9a2953;hpb=978a25d9392e5fc1a19fa37c86339c5d0b67ddd6;p=helm.git diff --git a/helm/gTopLevel/oldDisambiguate.ml b/helm/gTopLevel/oldDisambiguate.ml index db118b518..24dd30f91 100644 --- a/helm/gTopLevel/oldDisambiguate.ml +++ b/helm/gTopLevel/oldDisambiguate.ml @@ -160,10 +160,10 @@ module Make(C:Callbacks) = let metasenv',expr = mk_metasenv_and_expr resolve_id' in (*CSC: Bug here: we do not try to typecheck also the metasenv' *) try - let term,_,metasenv'' = - CicRefine.type_of_aux' metasenv' context expr + let term,_,metasenv'',_ = (* TASSI: FIXME what are we doning here?*) + CicRefine.type_of_aux' metasenv' context expr CicUniv.empty_ugraph in - Ok (term,metasenv'') + Ok (term,metasenv'') (* TASSI: whould we pass back the ugraph? *) with CicRefine.Uncertain _ -> prerr_endline ("%%% UNCERTAIN!!! " ^ CicPp.ppterm expr) ; @@ -322,12 +322,13 @@ module EnvironmentP3 = let regexpr = let alfa = "[a-zA-Z_-]" in let digit = "[0-9]" in - let ident = alfa ^ "\(" ^ alfa ^ "\|" ^ digit ^ "\)*" in - let blanks = "\( \|\t\|\n\)+" in + let ident = alfa ^ "\\(" ^ alfa ^ "\\|" ^ digit ^ "\\)*" in + let blanks = "\\( \\|\t\\|\n\\)+" in let nonblanks = "[^ \t\n]+" in - let uri = "/\(" ^ ident ^ "/\)*" ^ nonblanks in (* not very strict check *) + let uri = "/\\(" ^ ident ^ "/\\)*" ^ nonblanks in + (* not very strict check *) Str.regexp - ("alias" ^ blanks ^ "\(" ^ ident ^ "\)" ^ blanks ^ "\(" ^ uri ^ "\)") + ("alias" ^ blanks ^ "\\(" ^ ident ^ "\\)" ^ blanks ^ "\\(" ^ uri ^ "\\)") in let rec aux n = try