X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAstPp.ml;h=5f89df9d6ebca083064425ca71598719650905b0;hb=bc389dd4724959688aafc1ede450794f47b8d0b5;hp=6c7a6638a9cf9e01f3a2a9455ebff8ce5c107cce;hpb=651c5c55cba9ddbe592badc86b18502b83ecf580;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAstPp.ml b/helm/software/components/grafite/grafiteAstPp.ml
index 6c7a6638a..5f89df9d6 100644
--- a/helm/software/components/grafite/grafiteAstPp.ml
+++ b/helm/software/components/grafite/grafiteAstPp.ml
@@ -77,10 +77,10 @@ let opt_string_pp = function
 let pp_auto_params ~term_pp (univ, params) = 
    String.concat " " 
      (List.map (fun (k,v) -> if v <> "" then k ^ "=" ^ v else k) params) ^
-   if univ <> [] then 
-     (if params <> [] then " " else "") ^ "by " ^ 
-     String.concat " " (List.map term_pp univ)
-   else ""
+     match univ with
+       | None -> ""
+       | Some l -> (if params <> [] then " " else "") ^ "by " ^ 
+	   String.concat " " (List.map term_pp l)
 ;;
 
 let pp_just ~term_pp =
@@ -96,29 +96,44 @@ let rec pp_ntactic ~map_unicode_to_tex =
   pp_tactic_pattern ~map_unicode_to_tex ~lazy_term_pp ~term_pp in
  function
   | NApply (_,t) -> "napply " ^ CicNotationPp.pp_term t
+  | NSmartApply (_,t) -> "fixme"
+  | NAuto (_,(None,flgs)) ->
+      "nautobatch" ^
+        String.concat " " (List.map (fun a,b -> a ^ "=" ^ b) flgs)
+  | NAuto (_,(Some l,flgs)) ->
+      "nautobatch" ^ " by " ^
+         (String.concat "," (List.map CicNotationPp.pp_term l)) ^
+        String.concat " " (List.map (fun a,b -> a ^ "=" ^ b) flgs)
   | NCases (_,what,where) -> "ncases " ^ CicNotationPp.pp_term what ^
       assert false ^ " " ^ assert false
+  | NConstructor (_,None,l) -> "@ " ^
+      String.concat " " (List.map CicNotationPp.pp_term l)
+  | NConstructor (_,Some x,l) -> "@" ^ string_of_int x ^ " " ^
+      String.concat " " (List.map CicNotationPp.pp_term l)
   | NCase1 (_,n) -> "*" ^ n ^ ":"
   | NChange (_,what,wwhat) -> "nchange " ^ assert false ^ 
       " with " ^ CicNotationPp.pp_term wwhat
+  | NCut (_,t) -> "ncut " ^ CicNotationPp.pp_term t
+(*| NDiscriminate (_,t) -> "ndiscriminate " ^ CicNotationPp.pp_term t
+  | NSubst (_,t) -> "nsubst " ^ CicNotationPp.pp_term t *)
+  | NDestruct (_,dom,skip) -> "ndestruct ..." 
   | NElim (_,what,where) -> "nelim " ^ CicNotationPp.pp_term what ^
       assert false ^ " " ^ assert false
   | NId _ -> "nid"
   | NIntro (_,n) -> "#" ^ n
+  | NInversion (_,what,where) -> "ninversion " ^ CicNotationPp.pp_term what ^
+      assert false ^ " " ^ assert false
+  | NLApply (_,t) -> "lapply " ^ CicNotationPp.pp_term t
   | NRewrite (_,dir,n,where) -> "nrewrite " ^
      (match dir with `LeftToRight -> ">" | `RightToLeft -> "<") ^
      " " ^ CicNotationPp.pp_term n ^ " " ^ pp_tactic_pattern where
-  | NAuto (_,(l,flgs)) ->
-      "nauto" ^ 
-        (if l <> [] then (" by " ^
-         (String.concat "," (List.map CicNotationPp.pp_term l))) else "") ^
-        String.concat " " (List.map (fun a,b -> a ^ "=" ^ b) flgs)
   | NReduce _ | NGeneralize _ | NLetIn _ | NAssert _ -> "TO BE IMPLEMENTED"
   | NDot _ -> "##."
   | NSemicolon _ -> "##;"
   | NBranch _ -> "##["
   | NShift _ -> "##|"
   | NPos (_, l) -> "##" ^String.concat "," (List.map string_of_int l)^ ":"
+  | NPosbyname (_, s) -> "##" ^ s ^ ":"
   | NWildcard _ -> "##*:"
   | NMerge _ -> "##]"
   | NFocus (_,l) -> 
@@ -295,6 +310,11 @@ let pp_arg ~term_pp arg =
    else
      "(" ^ s ^ ")"
   
+let pp_nmacro = function
+  | NCheck (_, term) -> Printf.sprintf "ncheck %s" (CicNotationPp.pp_term term)
+  | Screenshot (_, name) -> Printf.sprintf "screenshot \"%s\"" name
+;;
+
 let pp_macro ~term_pp ~lazy_term_pp = 
   let term_pp = pp_arg ~term_pp in
   let flavour_pp = function
@@ -357,12 +377,14 @@ let pp_coercion ~term_pp t do_composites arity saturations=
     (term_pp t) arity saturations
     (if do_composites then "" else "nocomposites")
 
-let pp_ncommand = function
+let pp_ncommand ~obj_pp = function
   | UnificationHint (_,t, n) -> 
       "unification hint " ^ string_of_int n ^ " " ^ CicNotationPp.pp_term t
-  | NObj (_,_)
+  | NDiscriminator (_,_)
+  | NInverter (_,_,_,_,_)
   | NUnivConstraint (_) -> "not supported"
   | NCoercion (_) -> "not supported"
+  | NObj (_,obj) -> obj_pp obj
   | NQed (_) -> "nqed"
   | NCopy (_,name,uri,map) -> 
       "copy " ^ name ^ " from " ^ NUri.string_of_uri uri ^ " with " ^ 
@@ -422,6 +444,7 @@ let pp_non_punctuation_tactical =
 
 let pp_executable ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp =
   function
+  | NMacro (_, macro) -> pp_nmacro macro ^ "."
   | Macro (_, macro) -> pp_macro ~term_pp ~lazy_term_pp macro ^ "."
   | Tactic (_, Some tac, punct) ->
       pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp tac
@@ -434,7 +457,9 @@ let pp_executable ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp =
      pp_non_punctuation_tactical tac
      ^ pp_punctuation_tactical punct
   | Command (_, cmd) -> pp_command ~term_pp ~obj_pp cmd ^ "."
-  | NCommand (_, cmd) -> pp_ncommand cmd ^ "."
+  | NCommand (_, cmd) -> 
+      let obj_pp = Obj.magic obj_pp in
+      pp_ncommand ~obj_pp cmd ^ "."
                       
 let pp_comment ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp =
   function