Matitaweb: large commit porting to the new Matita 0.95 syntax.

[helm.git] / matitaB / components / grafite / grafiteAstPp.ml

diff --git a/matitaB/components/grafite/grafiteAstPp.ml b/matitaB/components/grafite/grafiteAstPp.ml
index 48fc8691c08c37b66a6425d1cd944760c0b24564..62ffc2762949057082502d3fd1cbe1b9300078f6 100644 (file)
--- a/matitaB/components/grafite/grafiteAstPp.ml
+++ b/matitaB/components/grafite/grafiteAstPp.ml
@@ -54,12 +54,12 @@ let pp_tactic_pattern status ~map_unicode_to_tex (what, hyp, goal) =
 let rec pp_ntactic status ~map_unicode_to_tex =
  let pp_tactic_pattern = pp_tactic_pattern ~map_unicode_to_tex in
  function
-  | NApply (_,t) -> "napply " ^ NotationPp.pp_term status t
+  | NApply (_,t) -> "@" ^ NotationPp.pp_term status t
   | NSmartApply (_,t) -> "fixme"
   | NAuto (_,(None,flgs)) ->
       "nautobatch" ^
         String.concat " " (List.map (fun a,b -> a ^ "=" ^ b) flgs)
-  | NAuto (_,(Some l,flgs)) ->
+  | NAuto (_,(Some (_,l),flgs)) ->
       "nautobatch" ^ " by " ^
          (String.concat "," (List.map (NotationPp.pp_term status) l)) ^
         String.concat " " (List.map (fun a,b -> a ^ "=" ^ b) flgs)
@@ -119,13 +119,11 @@ let pp_l2_pattern = NotationPp.pp_term
 
 let pp_alias = function
   | Ident_alias (id, uri) -> sprintf "alias id \"%s\" = \"%s\"." id uri
-  | Symbol_alias (symb, instance, desc) ->
-      sprintf "alias symbol \"%s\" %s= \"%s\"."
-        symb
-        (if instance=0 then "" else "(instance "^ string_of_int instance ^ ") ")
-        desc
-  | Number_alias (instance,desc) ->
-      sprintf "alias num (instance %d) = \"%s\"." instance desc
+  | Symbol_alias (symb, (* uri *) _, desc) ->
+      sprintf "alias symbol \"%s\" = \"%s\"."
+        symb desc
+  | Number_alias ((* uri *) _,desc) ->
+      sprintf "alias num = \"%s\"." desc
   
 let pp_associativity = function
   | Gramext.LeftA -> "left associative"
@@ -168,8 +166,11 @@ let pp_ncommand status = function
   | NInverter (_,_,_,_,_)
   | NUnivConstraint (_) -> "not supported"
   | NCoercion (_) -> "not supported"
-  | NObj (_,obj) -> NotationPp.pp_obj (NotationPp.pp_term status) obj
-  | NQed (_) -> "nqed"
+  | NObj (_,obj,index) -> 
+      (if not index then "-" else "") ^ 
+        NotationPp.pp_obj (NotationPp.pp_term status) obj
+  | NQed (_,true) -> "qed"
+  | NQed (_,false) -> "qed-"
   | NCopy (_,name,uri,map) -> 
       "copy " ^ name ^ " from " ^ NUri.string_of_uri uri ^ " with " ^ 
         String.concat " and " 
@@ -178,9 +179,9 @@ let pp_ncommand status = function
             map)
   | Include (_,mode,path) -> (* not precise, since path is absolute *)
       if mode = WithPreferences then
-        "include \"" ^ path ^ "\"."
+        "include \"" ^ path ^ "\""
       else
-        "include' \"" ^ path ^ "\"."
+        "include' \"" ^ path ^ "\""
   | Alias (_,s) -> pp_alias s
   | Interpretation (_, dsc, (symbol, arg_patterns), cic_appl_pattern) ->
       pp_interpretation dsc symbol arg_patterns cic_appl_pattern