procedural : some improvements.

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

diff --git a/components/grafite/grafiteAstPp.ml b/components/grafite/grafiteAstPp.ml
index f38dbf8597dc3caa309f5fb60c45f30f5dc4d40d..423e68d4f93ce30e5d77e82cb761eeab9fbcaffe 100644 (file)
--- a/components/grafite/grafiteAstPp.ml
+++ b/components/grafite/grafiteAstPp.ml
@@ -75,7 +75,7 @@ let rec pp_tactic ~term_pp ~lazy_term_pp =
   let pp_tactic_pattern = pp_tactic_pattern ~lazy_term_pp ~term_pp in
   function
   | Absurd (_, term) -> "absurd" ^ term_pp term
-  | Apply (_, term) -> "apply (" ^ term_pp term ^ ")" (* FG: rm parentheses *)
+  | Apply (_, term) -> "apply " ^ term_pp term
   | ApplyS (_, term, params) ->
      "applyS " ^ term_pp term ^
       String.concat " " 
@@ -93,21 +93,14 @@ let rec pp_tactic ~term_pp ~lazy_term_pp =
   | Constructor (_,n) -> "constructor " ^ string_of_int n
   | Contradiction _ -> "contradiction"
   | Cut (_, ident, term) ->
-     "cut (" ^ term_pp term ^ ")" ^ (* FG: rm parentheses *)
+     "cut " ^ term_pp term ^
       (match ident with None -> "" | Some id -> " as " ^ id)
-  | Decompose (_, [], what, names) ->
-      sprintf "decompose %s%s" (opt_string_pp what) (pp_intros_specs (None, names)) 
-  | Decompose (_, types, what, names) ->
-      let to_ident = function
-         | Ident id -> id
-        | Type _   -> assert false 
-      in
-      let types = List.rev_map to_ident types in
-      sprintf "decompose %s %s%s" (pp_idents types) (opt_string_pp what) (pp_intros_specs (None, names)) 
+  | Decompose (_, names) ->
+      sprintf "decompose%s" (pp_intros_specs (None, names)) 
   | Demodulate _ -> "demodulate"
   | Destruct (_, term) -> "destruct " ^ term_pp term
   | Elim (_, term, using, num, idents) ->
-      sprintf "elim (" ^ term_pp term ^ ")" ^ (* FG: rm parentheses *)
+      sprintf "elim " ^ term_pp term ^
       (match using with None -> "" | Some term -> " using " ^ term_pp term)
       ^ pp_intros_specs (num, idents) 
   | ElimType (_, term, using, num, idents) ->
@@ -144,18 +137,16 @@ let rec pp_tactic ~term_pp ~lazy_term_pp =
         (match ident_opt with None -> "" | Some ident -> " as " ^ ident)
   | Left _ -> "left"
   | LetIn (_, term, ident) -> 
-     sprintf "letin %s \\def %s" ident ("(" ^ term_pp term ^ ")") (* FG: rm parentheses *)
+     sprintf "letin %s \\def %s" ident (term_pp term)
   | Reduce (_, kind, pat) ->
       sprintf "%s %s" (pp_reduction_kind kind) (pp_tactic_pattern pat)
   | Reflexivity _ -> "reflexivity"
-  | Rename (_, froms, tos) -> 
-     sprintf "rename %s as %s" (pp_idents froms) (pp_idents tos)
   | Replace (_, pattern, t) ->
       sprintf "replace %s with %s" (pp_tactic_pattern pattern) (lazy_term_pp t)
   | Rewrite (_, pos, t, pattern, names) -> 
       sprintf "rewrite %s %s %s%s" 
         (if pos = `LeftToRight then ">" else "<")
-        ("(" ^ term_pp t ^ ")") (* FG: rm parentheses *)
+        (term_pp t)
         (pp_tactic_pattern pattern)
        (if names = [] then "" else " as " ^ pp_idents names)
   | Right _ -> "right"
@@ -202,8 +193,9 @@ let pp_arg ~term_pp arg =
 let pp_macro ~term_pp = 
   let term_pp = pp_arg ~term_pp in
   let style_pp = function
-     | Declarative -> ""
-     | Procedural -> "procedural "
+     | Declarative         -> ""
+     | Procedural None     -> "procedural "
+     | Procedural (Some i) -> sprintf "procedural %u " i
   in
   let prefix_pp prefix = 
      if prefix = "" then "" else sprintf " \"%s\"" prefix
@@ -302,7 +294,7 @@ let pp_executable ~term_pp ~lazy_term_pp ~obj_pp =
       pp_tactical ~lazy_term_pp ~term_pp tac
       ^ pp_tactical ~lazy_term_pp ~term_pp punct
   | Tactical (_, tac, None) -> pp_tactical ~lazy_term_pp ~term_pp tac
-  | Command (_, cmd) -> pp_command ~term_pp ~obj_pp cmd ^ "."
+  | Command (_, cmd) -> pp_command ~term_pp ~obj_pp cmd ^ ".\n"
                       
 let pp_comment ~term_pp ~lazy_term_pp ~obj_pp =
   function