X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAstPp.ml;h=8e23e56b5357b6e2664e5548e95d5f3660d022d6;hb=80430f28a23d8d643126917e14896482198c24d1;hp=df436e7097cefe67fb842f59414a9f3258ad6b12;hpb=6a5e51c1cf9a56c74a8b53a9b8bc5aa686c9780e;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAstPp.ml b/helm/software/components/grafite/grafiteAstPp.ml
index df436e709..8e23e56b5 100644
--- a/helm/software/components/grafite/grafiteAstPp.ml
+++ b/helm/software/components/grafite/grafiteAstPp.ml
@@ -248,7 +248,7 @@ let pp_arg ~term_pp arg =
    else
      "(" ^ s ^ ")"
   
-let pp_macro ~term_pp = 
+let pp_macro ~term_pp ~lazy_term_pp = 
   let term_pp = pp_arg ~term_pp in
   let style_pp = function
      | Declarative         -> ""
@@ -260,15 +260,16 @@ let pp_macro ~term_pp =
   in
   let flavour_pp = function
      | None                   -> ""
-     | Some `Definition       -> "as definition"
-     | Some `MutualDefinition -> "as mutual"
-     | Some `Fact             -> "as fact"
-     | Some `Lemma            -> "as lemma"
-     | Some `Remark           -> "as remark"
-     | Some `Theorem          -> "as theorem"
-     | Some `Variant          -> "as variant"
-     | Some `Axiom            -> "as axiom"
+     | Some `Definition       -> " as definition"
+     | Some `MutualDefinition -> " as mutual"
+     | Some `Fact             -> " as fact"
+     | Some `Lemma            -> " as lemma"
+     | Some `Remark           -> " as remark"
+     | Some `Theorem          -> " as theorem"
+     | Some `Variant          -> " as variant"
+     | Some `Axiom            -> " as axiom"
   in
+  let pp_reduction_kind = pp_reduction_kind ~term_pp:lazy_term_pp in
   function 
   (* Whelp *)
   | WInstance (_, term) -> "whelp instance " ^ term_pp term
@@ -277,6 +278,8 @@ let pp_macro ~term_pp =
   | WElim (_, t) -> "whelp elim " ^ term_pp t
   | WMatch (_, term) -> "whelp match " ^ term_pp term
   (* real macros *)
+  | Eval (_, kind, term) -> 
+      Printf.sprintf "eval %s on %s" (pp_reduction_kind kind) (term_pp term) 
   | Check (_, term) -> Printf.sprintf "check %s" (term_pp term)
   | Hint (_, true) -> "hint rewrite"
   | Hint (_, false) -> "hint"
@@ -347,7 +350,7 @@ let pp_non_punctuation_tactical ~term_pp ~lazy_term_pp =
 
 let pp_executable ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp =
   function
-  | Macro (_, macro) -> pp_macro ~term_pp macro ^ "."
+  | Macro (_, macro) -> pp_macro ~term_pp ~lazy_term_pp macro ^ "."
   | Tactic (_, Some tac, punct) ->
       pp_tactic ~map_unicode_to_tex ~lazy_term_pp ~term_pp tac
       ^ pp_punctuation_tactical ~lazy_term_pp ~term_pp punct