X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_parser%2FgrafiteDisambiguate.ml;h=c1fd03af2225403f5fd3d5204f8a1525cdd34f88;hb=5c30190ffa401334eb2fa9fab0be7db0de26a458;hp=fbbbf6e02c450e86e335459449423e6682166918;hpb=6d80ab08869042fc89f54ab781a27045023acd6f;p=helm.git

diff --git a/helm/software/components/grafite_parser/grafiteDisambiguate.ml b/helm/software/components/grafite_parser/grafiteDisambiguate.ml
index fbbbf6e02..c1fd03af2 100644
--- a/helm/software/components/grafite_parser/grafiteDisambiguate.ml
+++ b/helm/software/components/grafite_parser/grafiteDisambiguate.ml
@@ -570,11 +570,45 @@ let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) =
          | None -> raise BaseUriNotSetYet)
     | CicNotationPt.Inductive _ -> assert false
     | CicNotationPt.Theorem _ -> None in
-  (*
-  (let time = Unix.gettimeofday () in
-   prerr_endline "INIZIO NUOVA DISAMBIGUAZIONE";
+ let try_new cic =
+  (NCicLibrary.clear_cache ();
+   NCicEnvironment.invalidate ();
+   OCic2NCic.clear ();
    (match obj with
       CicNotationPt.Theorem (_,_,ty,_) ->
+   let graph = 
+     match cic with
+     | Cic.CurrentProof (_,metasenv, _, ty,_,_) ->
+         let _, ugraph = 
+           CicTypeChecker.type_of_aux' metasenv [] ty CicUniv.empty_ugraph
+         in
+           ugraph
+     | Cic.Constant (_,_, ty,_,_) ->
+         let _, ugraph = 
+                 CicTypeChecker.type_of_aux' [] [] ty CicUniv.empty_ugraph
+         in
+           ugraph
+     | _ -> CicUniv.empty_ugraph
+   in
+(*
+   let _,l = CicUniv.do_rank graph in
+   List.iter (fun k -> 
+     prerr_endline (CicUniv.string_of_universe k ^ " = " ^ string_of_int
+     (CicUniv.get_rank k))) l;
+*)
+   let graph =
+       List.fold_left 
+         (fun graph (_,_,l) ->
+           List.fold_left
+             (fun graph (uri,_,_) ->
+                let _,g = CicTypeChecker.typecheck uri in
+                CicUniv.merge_ugraphs ~base_ugraph:graph ~increment:(g,uri))
+             graph l)
+       graph (CoercDb.to_list ())
+   in
+   ignore(CicUniv.do_rank graph);
+   prerr_endline "INIZIO NUOVA DISAMBIGUAZIONE";
+   let time = Unix.gettimeofday () in
        (try
          (match 
           NCicDisambiguate.disambiguate_term
@@ -582,9 +616,10 @@ let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) =
            ~description_of_alias:LexiconAst.description_of_alias
            ~mk_choice:ncic_mk_choice
            ~mk_implicit
+           ~coercion_db:(NCicCoercion.db ())
            ~context:[] ~metasenv:[] ~subst:[]
-        ~aliases:lexicon_status.LexiconEngine.aliases
-        ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) 
+           ~aliases:lexicon_status.LexiconEngine.aliases
+           ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) 
            (text,prefix_len,ty)
          with
          | [_,metasenv,subst,ty],_ ->
@@ -601,9 +636,14 @@ let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) =
 (*        | exn -> prerr_endline (Printexc.to_string exn) *)
        )
     | _ -> ())
-  ); 
-  let time = Unix.gettimeofday () in
-  *)
+  )
+ in 
+
+(*
+ try
+  let time = Unix.gettimeofday () in 
+*)
+
   let (diff, metasenv, _, cic, _) =
     singleton "third"
       (CicDisambiguate.disambiguate_obj 
@@ -614,12 +654,26 @@ let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) =
         ~aliases:lexicon_status.LexiconEngine.aliases
         ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) ~uri 
         (text,prefix_len,obj)) in
+
 (*
   let time = Unix.gettimeofday () -. time in
   prerr_endline ("VECCHIA DISAMBIGUAZIONE: " ^ string_of_float time);
+  try_new cic;
 *)
+
+
   let lexicon_status = LexiconEngine.set_proof_aliases lexicon_status diff in
   lexicon_status, metasenv, cic
+
+(*
+ with 
+ | Sys.Break as exn -> raise exn
+ | exn ->
+   try_new (Cic.InductiveDefinition ([],[],0,[])); 
+   raise exn
+*)
+
+;;
   
 let disambiguate_command lexicon_status ?baseuri metasenv (text,prefix_len,cmd)=
   match cmd with
@@ -642,6 +696,12 @@ let disambiguate_command lexicon_status ?baseuri metasenv (text,prefix_len,cmd)=
 	 disambiguate_term None text prefix_len lexicon_status_ref [] in
       let metasenv,t = disambiguate_term metasenv t in
       !lexicon_status_ref, metasenv, GrafiteAst.Coercion (loc,t,b,a,s)
+   | GrafiteAst.UnificationHint (loc, t) ->
+       let lexicon_status_ref = ref lexicon_status in 
+       let disambiguate_term =
+	 disambiguate_term None text prefix_len lexicon_status_ref [] in
+      let metasenv,t = disambiguate_term metasenv t in
+      !lexicon_status_ref, metasenv, GrafiteAst.UnificationHint (loc,t)
    | GrafiteAst.Default _
    | GrafiteAst.Drop _
    | GrafiteAst.Include _