1. Macros are now handled using an execption that is caught by matitacLib

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

diff --git a/helm/matita/matitaEngine.ml b/helm/matita/matitaEngine.ml
index bd240032cbc289d714de0e21eadd104b3611a714..f5527bec95898b925d5183e4c3d05745182f1544 100644 (file)
--- a/helm/matita/matitaEngine.ml
+++ b/helm/matita/matitaEngine.ml
@@ -28,28 +28,38 @@ open Printf
 let debug = false ;;
 let debug_print = if debug then prerr_endline else ignore ;;
 
-let disambiguate_command lexicon_status_ref status cmd =
+let disambiguate_tactic 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)
+   tac
+ in
+  GrafiteTypes.set_metasenv metasenv grafite_status,tac
+
+let disambiguate_command lexicon_status_ref grafite_status cmd =
  let lexicon_status,metasenv,cmd =
   GrafiteDisambiguate.disambiguate_command
    ~baseuri:(
      try
-      Some (GrafiteTypes.get_string_option status "baseuri")
+      Some (GrafiteTypes.get_string_option grafite_status "baseuri")
      with
       GrafiteTypes.Option_error _ -> None)
-   !lexicon_status_ref (GrafiteTypes.get_proof_metasenv status) cmd
+   !lexicon_status_ref (GrafiteTypes.get_proof_metasenv grafite_status) cmd
  in
   lexicon_status_ref := lexicon_status;
-  GrafiteTypes.set_metasenv metasenv status,cmd
+  GrafiteTypes.set_metasenv metasenv grafite_status,cmd
 
-let disambiguate_tactic lexicon_status_ref status goal tac =
- let metasenv,tac =
-  GrafiteDisambiguate.disambiguate_tactic
+let disambiguate_macro lexicon_status_ref grafite_status macro goal =
+ let metasenv,macro =
+  GrafiteDisambiguate.disambiguate_macro
    lexicon_status_ref
-   (GrafiteTypes.get_proof_context status goal)
-   (GrafiteTypes.get_proof_metasenv status)
-   tac
+   (GrafiteTypes.get_proof_metasenv grafite_status)
+   (GrafiteTypes.get_proof_context grafite_status goal)
+   macro
  in
-  GrafiteTypes.set_metasenv metasenv status,tac
+  GrafiteTypes.set_metasenv metasenv grafite_status,macro
 
 let eval_ast ?do_heavy_checks ?clean_baseuri lexicon_status
  grafite_status ast
@@ -59,6 +69,7 @@ let eval_ast ?do_heavy_checks ?clean_baseuri lexicon_status
   GrafiteEngine.eval_ast
    ~disambiguate_tactic:(disambiguate_tactic lexicon_status_ref)
    ~disambiguate_command:(disambiguate_command lexicon_status_ref)
+   ~disambiguate_macro:(disambiguate_macro lexicon_status_ref)
    ?do_heavy_checks ?clean_baseuri grafite_status ast in
  let new_lexicon_status =
   LexiconSync.add_aliases_for_objs !lexicon_status_ref new_objs in