New code (unbranched) to compute all keys by all possible ways of reducing the term.

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

diff --git a/helm/software/components/grafite/grafiteAstPp.ml b/helm/software/components/grafite/grafiteAstPp.ml
index 89c4e369901fa464e2c15070e93ff04340ededaf..f489b15b5e399667c655ea336a39fba0d5a9b7b0 100644 (file)
--- 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,43 @@ 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
+  | NAuto (_,(None,flgs)) ->
+      "nauto" ^
+        String.concat " " (List.map (fun a,b -> a ^ "=" ^ b) flgs)
+  | NAuto (_,(Some l,flgs)) ->
+      "nauto" ^ " 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 _ -> "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) -> 
@@ -297,6 +311,7 @@ let pp_arg ~term_pp arg =
   
 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 = 
@@ -364,6 +379,8 @@ let pp_coercion ~term_pp t do_composites arity saturations=
 let pp_ncommand = function
   | UnificationHint (_,t, n) -> 
       "unification hint " ^ string_of_int n ^ " " ^ CicNotationPp.pp_term t
+  | NDiscriminator (_,_)
+  | NInverter (_,_,_,_,_)
   | NObj (_,_)
   | NUnivConstraint (_) -> "not supported"
   | NCoercion (_) -> "not supported"