X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Flexicon%2FlexiconEngine.ml;h=12200193e034c4d9af35a84b5df2edbb6b51c1bb;hb=0ef9250d71eacd6b1022194128e6acfb74d52aac;hp=6f30801a4b1c284d5ee6758e1bd02678217d2268;hpb=6cc401c4136bafb6515bd39d86db6b5a917318bf;p=helm.git

diff --git a/helm/software/components/lexicon/lexiconEngine.ml b/helm/software/components/lexicon/lexiconEngine.ml
index 6f30801a4..12200193e 100644
--- a/helm/software/components/lexicon/lexiconEngine.ml
+++ b/helm/software/components/lexicon/lexiconEngine.ml
@@ -27,25 +27,19 @@
 
 module L = LexiconAst
 
-let debug = ref true
+let debug = ref false
 
 (* lexicon file name * ma file name *)
 exception IncludedFileNotCompiled of string * string 
 exception MetadataNotFound of string        (* file name *)
 
-type status = {
+type lexicon_status = {
   aliases: L.alias_spec DisambiguateTypes.Environment.t;
   multi_aliases: L.alias_spec list DisambiguateTypes.Environment.t;
   lexicon_content_rev: LexiconMarshal.lexicon;
   notation_ids: CicNotation.notation_id list;      (** in-scope notation ids *)
 }
 
-let dump_aliases out msg status =
-   out (if msg = "" then "aliases dump:" else msg ^ ": aliases dump:");
-   DisambiguateTypes.Environment.iter
-      (fun _ x -> out (LexiconAstPp.pp_alias x))
-      status.aliases
-   
 let initial_status = {
   aliases = DisambiguateTypes.Environment.empty;
   multi_aliases = DisambiguateTypes.Environment.empty;
@@ -53,8 +47,24 @@ let initial_status = {
   notation_ids = [];
 }
 
+class status =
+ object
+  val lstatus = initial_status
+  method lstatus = lstatus
+  method set_lstatus v = {< lstatus = v >}
+  method set_lexicon_engine_status
+   : 'status. < lstatus: lexicon_status; .. > as 'status -> 'self
+   = fun o -> {< lstatus = o#lstatus >}
+ end
+
+let dump_aliases out msg status =
+   out (if msg = "" then "aliases dump:" else msg ^ ": aliases dump:");
+   DisambiguateTypes.Environment.iter
+      (fun _ x -> out (LexiconAstPp.pp_alias x))
+      status#lstatus.aliases
+   
 let add_lexicon_content cmds status =
-  let content = status.lexicon_content_rev in
+  let content = status#lstatus.lexicon_content_rev in
   let content' =
     List.fold_right
      (fun cmd acc -> 
@@ -70,7 +80,8 @@ let add_lexicon_content cmds status =
      String.concat "; " (List.map LexiconAstPp.pp_command content')
   );
 *)
-  { status with lexicon_content_rev = content' }
+  status#set_lstatus
+   { status#lstatus with lexicon_content_rev = content' }
 
 let set_proof_aliases mode status new_aliases =
  if mode = L.WithoutPreferences then
@@ -82,30 +93,28 @@ let set_proof_aliases mode status new_aliases =
    in
    let aliases =
     List.fold_left (fun acc (d,c) -> DisambiguateTypes.Environment.add d c acc)
-     status.aliases new_aliases in
+     status#lstatus.aliases new_aliases in
    let multi_aliases =
     List.fold_left (fun acc (d,c) -> 
       DisambiguateTypes.Environment.cons L.description_of_alias 
          d c acc)
-     status.multi_aliases new_aliases
+     status#lstatus.multi_aliases new_aliases
    in
    let new_status =
-     { status with multi_aliases = multi_aliases ; aliases = aliases}
-   in
-   if new_aliases = [] then
-     new_status
-   else
-     let status = 
-       add_lexicon_content (commands_of_aliases new_aliases) new_status 
-     in
-     status
-
+     { status#lstatus with
+        multi_aliases = multi_aliases ; aliases = aliases} in
+   let new_status = status#set_lstatus new_status in
+    if new_aliases = [] then
+      new_status
+    else
+      add_lexicon_content (commands_of_aliases new_aliases) new_status 
 
-let rec eval_command ?(mode=L.WithPreferences) status cmd =
+let rec eval_command ?(mode=L.WithPreferences) sstatus cmd =
 (*
  let bmode = match mode with L.WithPreferences -> true | _ -> false in
  Printf.eprintf "Include preferences: %b\n" bmode;
 *) 
+ let status = sstatus#lstatus in
  let cmd =
   match cmd with
   | L.Interpretation (loc, dsc, (symbol, args), cic_appl_pattern) ->
@@ -120,16 +129,19 @@ let rec eval_command ?(mode=L.WithPreferences) status cmd =
           ->
            let item = DisambiguateTypes.Id id in
             begin try
-              let uri =
-               match DisambiguateTypes.Environment.find item status.aliases with
-                  L.Ident_alias (_, uri)-> UriManager.uri_of_string uri
-                | _ -> assert false
-              in
-               CicNotationPt.UriPattern uri
+              match DisambiguateTypes.Environment.find item status.aliases with
+                 L.Ident_alias (_, uri) ->
+                  (try
+                    CicNotationPt.NRefPattern
+                     (NReference.reference_of_string uri)
+                   with
+                    NReference.IllFormedReference _ ->
+                     CicNotationPt.UriPattern (UriManager.uri_of_string uri))
+               | _ -> assert false
              with Not_found -> 
               prerr_endline ("LexiconEngine.eval_command: domain item not found: " ^ 
                (DisambiguateTypes.string_of_domain_item item));
-	      dump_aliases prerr_endline "" status;
+	      dump_aliases prerr_endline "" sstatus;
               assert false
 	    end
        | p -> p
@@ -141,6 +153,7 @@ let rec eval_command ?(mode=L.WithPreferences) status cmd =
  let notation_ids' = CicNotation.process_notation cmd in
  let status =
    { status with notation_ids = notation_ids' @ status.notation_ids } in
+ let sstatus = sstatus#set_lstatus status in
   match cmd with
   | L.Include (loc, baseuri, mode, fullpath) ->
      let lexiconpath_rw, lexiconpath_r = 
@@ -155,8 +168,7 @@ let rec eval_command ?(mode=L.WithPreferences) status cmd =
           raise (IncludedFileNotCompiled (lexiconpath_rw,fullpath))
      in
      let lexicon = LexiconMarshal.load_lexicon lexiconpath in
-     let status = List.fold_left (eval_command ~mode) status lexicon in
-     status
+      List.fold_left (eval_command ~mode) sstatus lexicon
   | L.Alias (loc, spec) -> 
      let diff =
       (*CSC: Warning: this code should be factorized with the corresponding
@@ -169,9 +181,9 @@ let rec eval_command ?(mode=L.WithPreferences) status cmd =
       | L.Number_alias (instance,desc) ->
          [DisambiguateTypes.Num instance,spec]
      in
-      set_proof_aliases mode status diff
+      set_proof_aliases mode sstatus diff
   | L.Interpretation (_, dsc, (symbol, _), _) as stm ->
-      let status = add_lexicon_content [stm] status in
+      let sstatus = add_lexicon_content [stm] sstatus in
       let diff =
        try
         [DisambiguateTypes.Symbol (symbol, 0),
@@ -181,10 +193,10 @@ let rec eval_command ?(mode=L.WithPreferences) status cmd =
           prerr_endline (Lazy.force msg);
           assert false
       in
-      let status = set_proof_aliases mode status diff in
-      status
+      let sstatus = set_proof_aliases mode sstatus diff in
+      sstatus
   | L.Notation _ as stm ->
-      add_lexicon_content [stm] status
+      add_lexicon_content [stm] sstatus
 
 let eval_command status cmd = 
    if !debug then dump_aliases prerr_endline "before eval_command" status;