X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Fgrafite%2FgrafiteAstPp.ml;h=efc0078862b6ad3bdc43a9a33699d6e3873d8a18;hb=06e2976ca4ef6bdfe14beba14ba538a2479c51a8;hp=98e57b5c4458e532334114deac4f1469f3e1fdc9;hpb=885b29af55a246589b6a8966d9d1438fbb8155d3;p=helm.git

diff --git a/components/grafite/grafiteAstPp.ml b/components/grafite/grafiteAstPp.ml
index 98e57b5c4..efc007886 100644
--- a/components/grafite/grafiteAstPp.ml
+++ b/components/grafite/grafiteAstPp.ml
@@ -169,7 +169,7 @@ let rec pp_tactic ~term_pp ~lazy_term_pp =
   | Thesisbecomes (_, term) -> "the thesis becomes " ^ term_pp term
   | ExistsElim (_, term0, ident, term, ident1, term1) -> "by " ^ term_pp term0 ^ "let " ^ ident ^ ":" ^ term_pp term ^ "such that " ^ term_pp term1 ^ "(" ^ ident1 ^ ")"
   | AndElim (_, term, ident1, term1, ident2, term2) -> "by " ^ term_pp term ^ "we have " ^ term_pp term1 ^ " (" ^ ident1 ^ ") " ^ "and " ^ term_pp term2 ^ " (" ^ ident2 ^ ")" 
-  | RewritingStep (_, term, term1, term2, cont) -> (match term with None -> " " | Some term -> "obtain " ^ term_pp term) ^ "=" ^ term_pp term1 ^ (match term2 with None -> "_" | Some term2 -> term_pp term2) ^ (match cont with None -> " done" | Some Cic.Anonymous -> "" | Some (Cic.Name id) -> " we proved " ^ id)
+  | RewritingStep (_, term, term1, term2, cont) -> (match term with None -> " " | Some (None,term) -> "conclude " ^ term_pp term | Some (Some name,term) -> "obtain (" ^ name ^ ") " ^ term_pp term) ^ "=" ^ term_pp term1 ^ (match term2 with `Auto params -> "_" ^ String.concat " " (List.map (fun (k,v) -> if v <> "" then k ^ "=" ^ v else k) params)  | `Term term2 -> term_pp term2) ^ (if cont then " done" else "")
   | Case (_, id, args) ->
      "case" ^ id ^
        String.concat " "
@@ -193,6 +193,13 @@ 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 "
+  in
+  let prefix_pp prefix = 
+     if prefix = "" then "" else sprintf " \"%s\"" prefix
+  in
   function 
   (* Whelp *)
   | WInstance (_, term) -> "whelp instance " ^ term_pp term
@@ -203,8 +210,8 @@ let pp_macro ~term_pp =
   (* real macros *)
   | Check (_, term) -> sprintf "check %s" (term_pp term)
   | Hint _ -> "hint"
-  | Inline (_, suri, "") -> sprintf "inline \"%s\"" suri 
-  | Inline (_, suri, prefix) -> sprintf "inline \"%s\" \"%s\"" suri prefix 
+  | Inline (_, style, suri, prefix) ->  
+      sprintf "inline %s\"%s\"%s" (style_pp style) suri (prefix_pp prefix) 
 
 let pp_associativity = function
   | Gramext.LeftA -> "left associative"