- hmysql removed (RIP)

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

diff --git a/matita/matita/matitaEngine.ml b/matita/matita/matitaEngine.ml
index c13004c24917f51fcbe1609607656636e745ed9d..c80405922efa8eab9905065805da10e40f994ad0 100644 (file)
--- a/matita/matita/matitaEngine.ml
+++ b/matita/matita/matitaEngine.ml
@@ -30,33 +30,14 @@ module G = GrafiteAst
 let debug = false ;;
 let debug_print = if debug then prerr_endline else ignore ;;
 
-let disambiguate_tactic text prefix_len lexicon_status_ref grafite_status goal tac =
- let metasenv,tac =
-  GrafiteDisambiguate.disambiguate_tactic
-   lexicon_status_ref
-   (GrafiteTypes.get_proof_context grafite_status goal)
-   (GrafiteTypes.get_proof_metasenv grafite_status) (Some goal)
-   tac
- in
-  GrafiteTypes.set_metasenv metasenv grafite_status,tac
-
 let disambiguate_command lexicon_status_ref grafite_status cmd =
  let baseuri = grafite_status#baseuri in
- let lexicon_status,metasenv,cmd =
+ let lexicon_status,cmd =
   GrafiteDisambiguate.disambiguate_command ~baseuri
-   !lexicon_status_ref (GrafiteTypes.get_proof_metasenv grafite_status) cmd
+   !lexicon_status_ref cmd
  in
   lexicon_status_ref := lexicon_status;
-  GrafiteTypes.set_metasenv metasenv grafite_status,cmd
-
-let disambiguate_macro lexicon_status_ref grafite_status macro context =
- let metasenv,macro =
-  GrafiteDisambiguate.disambiguate_macro
-   lexicon_status_ref
-   (GrafiteTypes.get_proof_metasenv grafite_status)
-   context macro
- in
-  GrafiteTypes.set_metasenv metasenv grafite_status,macro
+  grafite_status,cmd
 
 let eval_macro_screenshot (status : GrafiteTypes.status) name =
   let _,_,metasenv,subst,_ = status#obj in
@@ -86,12 +67,11 @@ let eval_ast ?do_heavy_checks status (text,prefix_len,ast) =
      | 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 []
+        status, `New []
      | ast -> 
   GrafiteEngine.eval_ast
-   ~disambiguate_tactic:(disambiguate_tactic text prefix_len lexicon_status_ref)
    ~disambiguate_command:(disambiguate_command lexicon_status_ref)
-   ~disambiguate_macro:(disambiguate_macro lexicon_status_ref)
+   ~disambiguate_macro:((* MATITA 1.0*) fun _ -> assert false)
    ?do_heavy_checks status (text,prefix_len,ast)
  in
  let new_status =
@@ -107,18 +87,11 @@ let eval_ast ?do_heavy_checks status (text,prefix_len,ast) =
      let v = LexiconAst.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