dead code removal: the parser used to be able to return LNone when it

[helm.git] / matita / matita / matitaEngine.ml

diff --git a/matita/matita/matitaEngine.ml b/matita/matita/matitaEngine.ml
index ab357e5c356e72d5001605ec87bc005448746692..43a09d2a6e50cd329592086ea0eefe28a6976a12 100644 (file)
--- a/matita/matita/matitaEngine.ml
+++ b/matita/matita/matitaEngine.ml
@@ -30,15 +30,6 @@ 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,cmd =
-  GrafiteDisambiguate.disambiguate_command ~baseuri
-   !lexicon_status_ref cmd
- in
-  lexicon_status_ref := lexicon_status;
-  grafite_status,cmd
-
 let eval_macro_screenshot (status : GrafiteTypes.status) name =
   assert false (* MATITA 1.0
   let _,_,metasenv,subst,_ = status#obj in
@@ -60,26 +51,17 @@ let eval_macro_screenshot (status : GrafiteTypes.status) name =
   *)
 ;;
 
-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 =
-  GrafiteEngine.eval_ast
-   ~disambiguate_command:(disambiguate_command lexicon_status_ref)
-   ?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,new_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
        let NReference.Ref (uri,_) = NReference.reference_of_string v in
@@ -91,58 +73,49 @@ let eval_ast ?do_heavy_checks status (text,prefix_len,ast) =
       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,[]) new_aliases
+        status, (status ,Some (k,value))::acc
+   ) (status,[]) new_aliases (* WARNING: this must be the old status! *)
  in
-  ((new_status),None)::intermediate_states
+  (new_status,None)::intermediate_states
 ;;
 
 exception TryingToAdd of string
 exception EnrichedWithStatus of exn * GrafiteTypes.status
 
-let eval_from_stream ~first_statement_only ~include_paths 
- ?do_heavy_checks ?(enforce_no_new_aliases=true)
- ?(watch_statuses=fun _ -> ()) status str cb 
+let eval_from_stream ~include_paths ?do_heavy_checks
+ ?(enforce_no_new_aliases=true) status str cb 
 =
  let matita_debug = Helm_registry.get_bool "matita.debug" in
  let rec loop status statuses =
-  let loop =
-   if first_statement_only then fun _ statuses -> statuses
-   else loop
-  in
   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) ->
-       (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
-            if enforce_no_new_aliases then
-             List.iter 
-              (fun (_,alias) ->
-                match alias with
-                  None -> ()
-                | Some (k,value) ->
-                   let newtxt = LexiconAstPp.pp_alias value in
-                    raise (TryingToAdd newtxt)) new_statuses;
-            let status =
-             match new_statuses with
-                [] -> assert false
-              | (s,_)::_ -> s
-            in
-             watch_statuses status ;
-             false, status, (new_statuses @ statuses))
+     | Some ast ->
+        cb status ast;
+        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 = GrafiteAstPp.pp_alias value in
+                raise (TryingToAdd newtxt)) new_statuses;
+        let status =
+         match new_statuses with
+            [] -> assert false
+          | (s,_)::_ -> s
+        in
+         false, status, (new_statuses @ statuses)
    with exn when not matita_debug ->
      raise (EnrichedWithStatus (exn, status))
   in