Keeping track of locations of disambiguated ids and symbols.

[helm.git] / matitaB / components / grafite_engine / grafiteEngine.ml

diff --git a/matitaB/components/grafite_engine/grafiteEngine.ml b/matitaB/components/grafite_engine/grafiteEngine.ml
index ff9d00b819e74ae57830a8bc4f234d004636ad93..d2f12dc9dde5640dde9b910928c203140314718e 100644 (file)
--- a/matitaB/components/grafite_engine/grafiteEngine.ml
+++ b/matitaB/components/grafite_engine/grafiteEngine.ml
@@ -54,7 +54,7 @@ let inject_unification_hint =
 ;;
 
 let eval_unification_hint status t n = 
- let newast,metasenv,subst,status,t =
+ let metasenv,subst,status,t =
   GrafiteDisambiguate.disambiguate_nterm status None [] [] [] ("",0,t) in
  assert (metasenv=[]);
  let t = NCicUntrusted.apply_subst status subst [] t in
@@ -79,13 +79,12 @@ let basic_eval_interpretation ~alias_only (dsc, (symbol, args), cic_appl_pattern
   else
    status
  in
- let mode = GrafiteAst.WithPreferences (*assert false*) in (* MATITA 1.0 VEDI SOTTO *)
  let diff =
   (* FIXME! the uri should be filled with something meaningful! *)
-  [DisambiguateTypes.Symbol (symbol, Some (None,dsc)),
+  [DisambiguateTypes.Symbol symbol,
    GrafiteAst.Symbol_alias (symbol,None,dsc)]
  in
-  GrafiteDisambiguate.set_proof_aliases status ~implicit_aliases:false mode diff
+  GrafiteDisambiguate.add_to_disambiguation_univ status diff
 ;;
 
 let inject_interpretation =
@@ -116,7 +115,7 @@ let eval_interpretation status data=
 
 let basic_eval_alias (mode,diff) status =
   prerr_endline "basic_eval_alias";
-  GrafiteDisambiguate.set_proof_aliases status ~implicit_aliases:false mode diff
+  GrafiteDisambiguate.add_to_disambiguation_univ status diff
 ;;
 
 let inject_alias =
@@ -135,8 +134,15 @@ let eval_alias status data=
 let basic_eval_input_notation (l1,l2) status =
   GrafiteParser.extend status l1 
    (fun env loc ->
-     NotationPt.AttributedTerm
-      (`Loc loc,TermContentPres.instantiate_level2 status env l2)) 
+     let rec inner_loc default = function
+       | [] -> default
+       | (_,(NotationEnv.NoType,NotationEnv.LocValue l))::_ -> l
+       | _::tl -> inner_loc default tl
+     in
+     let inner_loc = inner_loc loc env in
+     let l2' = TermContentPres.instantiate_level2 status env inner_loc l2 in
+     prerr_endline ("new l2 ast : " ^ (NotationPp.pp_term status l2'));
+     NotationPt.AttributedTerm (`Loc loc,l2')) 
 ;;
 
 let inject_input_notation =
@@ -618,7 +624,7 @@ let rec eval_ncommand ~include_paths opts status (text,prefix_len,cmd) =
             List.fold_left
              (fun status (name,cpos,arity) ->
                try
-                 let newast,metasenv,subst,status,t =
+                 let metasenv,subst,status,t =
                   GrafiteDisambiguate.disambiguate_nterm status None [] [] []
                    ("",0,NotationPt.Ident (name,`Ambiguous)) in
                  assert (metasenv = [] && subst = []);
@@ -711,7 +717,7 @@ let rec eval_ncommand ~include_paths opts status (text,prefix_len,cmd) =
       let metasenv,subst,status,sort = match sort with
         | None -> [],[],status,NCic.Sort NCic.Prop
         | Some s ->
-            let newast,metasenv,subst,status,sort = 
+            let metasenv,subst,status,sort = 
               GrafiteDisambiguate.disambiguate_nterm status None [] [] []
               (text,prefix_len,s) 
             in metasenv,subst,status,sort
@@ -726,7 +732,7 @@ let rec eval_ncommand ~include_paths opts status (text,prefix_len,cmd) =
             "ninverter: found target %s, which is not a sort"
              (status#ppterm ~metasenv ~subst ~context:[] sort))) in
       let status = status#set_ng_mode `ProofMode in
-      let newast,metasenv,subst,status,indty =
+      let metasenv,subst,status,indty =
        GrafiteDisambiguate.disambiguate_nterm status None [] [] subst
         (text,prefix_len,indty) in
       let indtyno,(_,leftno,tys,_,_) =
@@ -757,6 +763,7 @@ let rec eval_ncommand ~include_paths opts status (text,prefix_len,cmd) =
      in
       eval_interpretation status (dsc,(symbol, args),cic_appl_pattern)
   | GrafiteAst.Notation (loc, dir, l1, associativity, precedence, l2) ->
+      prerr_endline ("new notation: " ^ (NotationPp.pp_term status l1));
       let l1 = 
         CicNotationParser.check_l1_pattern
          l1 (dir = Some `RightToLeft) precedence associativity
@@ -773,11 +780,11 @@ let rec eval_ncommand ~include_paths opts status (text,prefix_len,cmd) =
              code in DisambiguatePp *)
       match spec with
       | GrafiteAst.Ident_alias (id,uri) -> 
-         [DisambiguateTypes.Id (id,Some uri),spec]
+         [DisambiguateTypes.Id id,spec]
       | GrafiteAst.Symbol_alias (symb, uri, desc) ->
-         [DisambiguateTypes.Symbol (symb, Some (uri,desc)),spec]
+         [DisambiguateTypes.Symbol symb,spec]
       | GrafiteAst.Number_alias (uri,desc) ->
-         [DisambiguateTypes.Num (Some (uri,desc)),spec]
+         [DisambiguateTypes.Num,spec]
      in
       let mode = GrafiteAst.WithPreferences in(*assert false in (* VEDI SOPRA *) MATITA 1.0*)
        eval_alias status (mode,diff)