X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2FmatitaEngine.ml;h=4c246a2539657b5da052a5be203bb84551141aa0;hb=f4460413546165a7fabbf1e1da4cf2f5a44b26b9;hp=c96132b8aefcd2c2134ecd071b15e6d3e252333e;hpb=179cb3108e88369d855ba0088084be285fb19fdc;p=helm.git

diff --git a/matita/matita/matitaEngine.ml b/matita/matita/matitaEngine.ml
index c96132b8a..4c246a253 100644
--- a/matita/matita/matitaEngine.ml
+++ b/matita/matita/matitaEngine.ml
@@ -30,16 +30,8 @@ module G = GrafiteAst
 let debug = false ;;
 let debug_print = if debug then prerr_endline else ignore ;;
 
-let disambiguate_command lexicon_status_ref grafite_status cmd =
- let baseuri = grafite_status#baseuri in
- let lexicon_status,metasenv,cmd =
-  GrafiteDisambiguate.disambiguate_command ~baseuri
-   !lexicon_status_ref (GrafiteTypes.get_proof_metasenv grafite_status) cmd
- in
-  lexicon_status_ref := lexicon_status;
-  GrafiteTypes.set_metasenv metasenv grafite_status,cmd
-
 let eval_macro_screenshot (status : GrafiteTypes.status) name =
+  assert false (* MATITA 1.0
   let _,_,metasenv,subst,_ = status#obj in
   let sequent = List.hd metasenv in
   let mathml = 
@@ -56,61 +48,39 @@ let eval_macro_screenshot (status : GrafiteTypes.status) name =
     Filename.quote (name^".png")));
   HLog.debug ("generated " ^ name ^ ".png");
   status, `New []
+  *)
 ;;
 
-let eval_ast ?do_heavy_checks status (text,prefix_len,ast) =
- let dump = not (Helm_registry.get_bool "matita.moo") in
- let lexicon_status_ref = ref (status :> LexiconEngine.status) in
+let eval_ast ~include_paths ?do_heavy_checks status (text,prefix_len,ast) =
  let baseuri = status#baseuri in
- let new_status,new_objs =
-  match ast with 
-     | G.Executable (_, G.Command (_, G.Coercion _)) when dump ->
-(* FG: some commands can not be executed when mmas are parsed *************)
-(* To be removed when mmas will be executed                               *)
-        status, `Old []
-     | ast -> 
-  GrafiteEngine.eval_ast
-   ~disambiguate_tactic:((* MATITA 1.0*) fun _ -> assert false)
-   ~disambiguate_command:(disambiguate_command lexicon_status_ref)
-   ~disambiguate_macro:((* MATITA 1.0*) fun _ -> assert false)
-   ?do_heavy_checks status (text,prefix_len,ast)
- in
- let new_status =
-  if !lexicon_status_ref#lstatus != status#lstatus then
-   new_status#set_lstatus (!lexicon_status_ref#lstatus)
-  else
-   new_status in
- let new_status = LexiconSync.add_aliases_for_objs new_status new_objs in
- let new_aliases = LexiconSync.alias_diff ~from:status new_status in
+ let new_aliases,status =
+  GrafiteDisambiguate.eval_with_new_aliases status
+   (fun status ->
+     GrafiteEngine.eval_ast ~include_paths ?do_heavy_checks status
+      (text,prefix_len,ast)) in
  let _,intermediate_states = 
   List.fold_left
    (fun (status,acc) (k,value) -> 
-     let v = LexiconAst.description_of_alias value in
+     let v = GrafiteAst.description_of_alias value in
      let b =
       try
-       (* this hack really sucks! *)
-       UriManager.buri_of_uri (UriManager.uri_of_string v) = baseuri
+       let NReference.Ref (uri,_) = NReference.reference_of_string v in
+        NUri.baseuri_of_uri uri = baseuri
       with
-       UriManager.IllFormedUri _ ->
-        try
-         (* this too! *)
-         let NReference.Ref (uri,_) = NReference.reference_of_string v in
-         let ouri = NCic2OCic.ouri_of_nuri uri in
-          UriManager.buri_of_uri ouri = baseuri
-        with
-         NReference.IllFormedReference _ ->
-          false (* v is a description, not a URI *)
+       NReference.IllFormedReference _ ->
+        false (* v is a description, not a URI *)
      in
       if b then 
        status,acc
       else
-       let new_status =
-        LexiconEngine.set_proof_aliases status [k,value]
+       let status =
+        GrafiteDisambiguate.set_proof_aliases status ~implicit_aliases:false
+         GrafiteAst.WithPreferences [k,value]
        in
-        new_status, (new_status ,Some (k,value))::acc
+        status, (status ,Some (k,value))::acc
    ) (status,[]) new_aliases
  in
-  ((new_status),None)::intermediate_states
+  (status,None)::intermediate_states
 ;;
 
 exception TryingToAdd of string
@@ -129,25 +99,26 @@ let eval_from_stream ~first_statement_only ~include_paths
   let stop,g,s = 
    try
      let cont =
-       try Some (GrafiteParser.parse_statement ~include_paths str status)
+       try Some (GrafiteParser.parse_statement status str)
        with End_of_file -> None in
      match cont with
      | None -> true, status, statuses
-     | Some (status,ast) ->
+     | Some ast ->
        (match ast with
            GrafiteParser.LNone _ ->
             watch_statuses status ;
             false, status, ((status,None)::statuses)
          | GrafiteParser.LSome ast ->
             cb status ast;
-            let new_statuses = eval_ast ?do_heavy_checks status ("",0,ast) in
+            let new_statuses =
+              eval_ast ~include_paths ?do_heavy_checks status ("",0,ast) in
             if enforce_no_new_aliases then
              List.iter 
               (fun (_,alias) ->
                 match alias with
                   None -> ()
                 | Some (k,value) ->
-                   let newtxt = LexiconAstPp.pp_alias value in
+                   let newtxt = GrafiteAstPp.pp_alias value in
                     raise (TryingToAdd newtxt)) new_statuses;
             let status =
              match new_statuses with