alias diffing/insertion is now handled by matitaEngine (invoked both

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

diff --git a/helm/matita/matitaEngine.ml b/helm/matita/matitaEngine.ml
index 40a80afddba86e6efe2b181c8a2154a9c0eef59b..fa9292c8986a7e7033d48c96f27f755b65c46830 100644 (file)
--- a/helm/matita/matitaEngine.ml
+++ b/helm/matita/matitaEngine.ml
@@ -52,39 +52,68 @@ let disambiguate_tactic lexicon_status_ref status goal tac =
   GrafiteTypes.set_metasenv metasenv status,tac
 
 let eval_ast ?do_heavy_checks ?clean_baseuri lexicon_status
- status ast
+ grafite_status ast
 =
  let lexicon_status_ref = ref lexicon_status in
- let status,new_objs =
+ let new_grafite_status,new_objs =
   GrafiteEngine.eval_ast
    ~disambiguate_tactic:(disambiguate_tactic lexicon_status_ref)
    ~disambiguate_command:(disambiguate_command lexicon_status_ref)
-   ?do_heavy_checks ?clean_baseuri status ast
+   ?do_heavy_checks ?clean_baseuri grafite_status ast in
+ let new_lexicon_status =
+  LexiconSync.add_aliases_for_objs !lexicon_status_ref new_objs in
+ let new_aliases =
+  LexiconSync.alias_diff ~from:lexicon_status new_lexicon_status in
+ let _,intermediate_states = 
+  let baseuri = GrafiteTypes.get_string_option new_grafite_status "baseuri" in
+  List.fold_left
+   (fun (lexicon_status,acc) (k,((v,_) as value)) -> 
+     let b =
+      try
+       UriManager.buri_of_uri (UriManager.uri_of_string v) = baseuri
+      with
+       UriManager.IllFormedUri _ -> false (* v is a description, not a URI *)
+     in
+      if b then 
+       lexicon_status,acc
+      else
+       let new_lexicon_status =
+        LexiconEngine.set_proof_aliases lexicon_status [k,value]
+       in
+        new_lexicon_status,
+         ((new_grafite_status,new_lexicon_status),Some (k,value))::acc
+   ) (lexicon_status,[]) new_aliases
  in
-  let lexicon_status =
-   LexiconSync.add_aliases_for_objs !lexicon_status_ref new_objs
-  in
-   lexicon_status,status
+  ((new_grafite_status,new_lexicon_status),None)::intermediate_states
 
 let eval_from_stream ~include_paths ?(prompt=false) ?do_heavy_checks
- ?clean_baseuri lexicon_status status str cb 
+ ?clean_baseuri lexicon_status grafite_status str cb 
 =
- let rec loop lexicon_status status =
-  if prompt then (print_string "matita> "; flush stdout);
-  try
-   let lexicon_status,ast = GrafiteParser.parse_statement ~include_paths str lexicon_status in
-    (match ast with
-        GrafiteParser.LNone _ -> loop lexicon_status status
-      | GrafiteParser.LSome ast ->
-         cb status ast;
-         let lexicon_status,status =
-          eval_ast ?do_heavy_checks ?clean_baseuri lexicon_status status ast
-         in
-          loop lexicon_status status)
-  with
-   End_of_file -> lexicon_status,status
-in
- loop lexicon_status status
+ let rec loop lexicon_status grafite_status statuses =
+   if prompt then (print_string "matita> "; flush stdout);
+   try
+    let lexicon_status,ast =
+     GrafiteParser.parse_statement ~include_paths str lexicon_status
+    in
+     (match ast with
+         GrafiteParser.LNone _ ->
+          loop lexicon_status grafite_status
+           (((grafite_status,lexicon_status),None)::statuses)
+       | GrafiteParser.LSome ast ->
+          cb grafite_status ast;
+          let new_statuses =
+           eval_ast ?do_heavy_checks ?clean_baseuri lexicon_status
+            grafite_status ast in
+          let grafite_status,lexicon_status =
+           match new_statuses with
+              [] -> assert false
+            | (s,_)::_ -> s
+          in
+           loop lexicon_status grafite_status (new_statuses @ statuses))
+   with
+    End_of_file -> statuses
+ in
+  loop lexicon_status grafite_status []
 ;;
 
 let eval_string ~include_paths ?do_heavy_checks ?clean_baseuri lexicon_status