X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAstPp.ml;h=e335c1b63c559d16a93ee7bf047ff8ecdbb59ad2;hb=11b2157bacf59cfc561c2ef6f92ee41ee2c1a006;hp=0399e4ca3c9a00bac560a5c822b376a898d3496d;hpb=54e3c9f41b51d6e2a395252b45875532c40a0595;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAstPp.ml b/helm/software/components/grafite/grafiteAstPp.ml
index 0399e4ca3..e335c1b63 100644
--- a/helm/software/components/grafite/grafiteAstPp.ml
+++ b/helm/software/components/grafite/grafiteAstPp.ml
@@ -89,6 +89,21 @@ let pp_just ~term_pp =
   | `Auto params -> pp_auto_params ~term_pp params
 ;;
 
+let pp_ntactic ~map_unicode_to_tex = function
+  | NApply (_,t) -> "napply " ^ CicNotationPp.pp_term t
+  | NCases (_,what,where) -> "ncases " ^ CicNotationPp.pp_term what ^
+      assert false ^ " " ^ assert false
+  | NCase1 (_,n) -> "*" ^ n ^ ":"
+  | NChange (_,what,wwhat) -> "nchange " ^ assert false ^ 
+      " with " ^ CicNotationPp.pp_term wwhat
+  | NElim (_,what,where) -> "nelim " ^ CicNotationPp.pp_term what ^
+      assert false ^ " " ^ assert false
+  | NId _ -> "nid"
+  | NIntro (_,n) -> "#" ^ n
+  | NRewrite (_,dir,n,where) -> "nrewrite" ^ assert false
+  | NReduce _ | NGeneralize _ | NLetIn _ | NAssert _ -> assert false
+;;
+
 let rec pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp =
  let pp_terms = pp_terms ~term_pp in
  let pp_tactics = pp_tactics ~map_unicode_to_tex ~term_pp ~lazy_term_pp in
@@ -121,9 +136,11 @@ let rec pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp =
   | AutoBatch (_,params) -> "autobatch " ^ 
       pp_auto_params ~term_pp params
   | Assumption _ -> "assumption"
-  | Cases (_, term, pattern, specs) -> Printf.sprintf "cases " ^ term_pp term ^
-      pp_tactic_pattern pattern ^
-      pp_intros_specs "names " specs 
+  | Cases (_, term, pattern, specs) -> 
+      Printf.sprintf "cases %s %s%s" 
+      (term_pp term)
+      (pp_tactic_pattern pattern)
+      (pp_intros_specs "names " specs)
   | Change (_, where, with_what) ->
       Printf.sprintf "change %s with %s" (pp_tactic_pattern where) (lazy_term_pp with_what)
   | Clear (_,ids) -> Printf.sprintf "clear %s" (pp_hyps ids)
@@ -251,24 +268,27 @@ let pp_arg ~term_pp arg =
   
 let pp_macro ~term_pp ~lazy_term_pp = 
   let term_pp = pp_arg ~term_pp in
-  let style_pp = function
-     | Declarative         -> ""
-     | Procedural None     -> "procedural "
-     | Procedural (Some i) -> Printf.sprintf "procedural %u " i
-  in
-  let prefix_pp prefix = 
-     if prefix = "" then "" else Printf.sprintf " \"%s\"" prefix
-  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"
+     | `Definition       -> "definition"
+     | `Fact             -> "fact"
+     | `Lemma            -> "lemma"
+     | `Remark           -> "remark"
+     | `Theorem          -> "theorem"
+     | `Variant          -> "variant"
+     | `Axiom            -> "axiom"
+     | `MutualDefinition -> assert false
+  in
+  let pp_inline_params l =
+     let pp_param = function
+        | IPPrefix prefix -> "prefix = \"" ^ prefix ^ "\""
+	| IPAs flavour -> flavour_pp flavour
+	| IPProcedural -> "procedural"
+	| IPNoDefaults -> "nodefaults"
+	| IPDepth depth -> "depth = " ^ string_of_int depth
+	| IPLevel level -> "level = " ^ string_of_int level
+     in
+     let s = String.concat " " (List.map pp_param l) in
+     if s = "" then s else " " ^ s
   in
   let pp_reduction_kind = pp_reduction_kind ~term_pp:lazy_term_pp in
   function 
@@ -285,8 +305,8 @@ let pp_macro ~term_pp ~lazy_term_pp =
   | Hint (_, true) -> "hint rewrite"
   | Hint (_, false) -> "hint"
   | AutoInteractive (_,params) -> "auto " ^ pp_auto_params ~term_pp params
-  | Inline (_, style, suri, prefix, flavour) ->  
-      Printf.sprintf "inline %s\"%s\"%s%s" (style_pp style) suri (prefix_pp prefix) (flavour_pp flavour) 
+  | Inline (_, suri, params) ->  
+      Printf.sprintf "inline \"%s\"%s" suri (pp_inline_params params) 
 
 let pp_associativity = function
   | Gramext.LeftA -> "left associative"
@@ -311,13 +331,19 @@ let pp_coercion ~term_pp t do_composites arity saturations=
     
 let pp_command ~term_pp ~obj_pp = function
   | Index (_,_,uri) -> "Indexing " ^ UriManager.string_of_uri uri
+  | Select (_,uri) -> "Selecting " ^ UriManager.string_of_uri uri
   | Coercion (_, t, do_composites, i, j) ->
      pp_coercion ~term_pp t do_composites i j
-  | UnificationHint (_,t) -> 
-      "unification hint " ^ term_pp t
+  | PreferCoercion (_,t) -> 
+     "prefer coercion " ^ term_pp t
+  | Inverter (_,n,ty,params) ->
+     "inverter " ^ n ^ " for " ^ term_pp ty ^ " " ^ List.fold_left (fun acc x -> acc ^ (match x with true -> "%" | _ -> "?")) "" params
+  | UnificationHint (_,t, n) -> 
+      "unification hint " ^ string_of_int n ^ " " ^ term_pp t
   | Default (_,what,uris) -> pp_default what uris
   | Drop _ -> "drop"
-  | Include (_,path) -> "include \"" ^ path ^ "\""
+  | Include (_,false,path) -> "include \"" ^ path ^ "\""
+  | Include (_,true,path) -> "include source \"" ^ path ^ "\""
   | Obj (_,obj) -> obj_pp obj
   | Qed _ -> "qed"
   | Relation (_,id,a,aeq,refl,sym,trans) ->
@@ -333,8 +359,12 @@ let pp_command ~term_pp ~obj_pp = function
        | None -> "")
   | Print (_,s) -> "print " ^ s
   | Set (_, name, value) -> Printf.sprintf "set \"%s\" \"%s\"" name value
+  | NObj (_,o) -> "not supported"
+  | NUnivConstraint (_) -> "not supported"
+  | NQed (_) -> "not supported"
+  | Pump (_) -> "not supported"
 
-let pp_punctuation_tactical ~term_pp ~lazy_term_pp =
+let pp_punctuation_tactical =
   function
   | Dot _ -> "."
   | Semicolon _ -> ";"
@@ -344,7 +374,7 @@ let pp_punctuation_tactical ~term_pp ~lazy_term_pp =
   | Wildcard _ -> "*:"
   | Merge _ -> "]"
 
-let pp_non_punctuation_tactical ~term_pp ~lazy_term_pp =
+let pp_non_punctuation_tactical =
   function
   | Focus (_, goals) ->
       Printf.sprintf "focus %s" (String.concat " " (List.map string_of_int goals))
@@ -355,13 +385,19 @@ let pp_executable ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp =
   function
   | 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
+      pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp tac
+      ^ pp_punctuation_tactical punct
   | Tactic (_, None, punct) ->
-     pp_punctuation_tactical ~lazy_term_pp ~term_pp punct
+     pp_punctuation_tactical punct
+  | NTactic (_,tac, punct) ->
+     pp_ntactic ~map_unicode_to_tex tac
+     ^ pp_punctuation_tactical punct
   | NonPunctuationTactical (_, tac, punct) ->
-     pp_non_punctuation_tactical ~lazy_term_pp ~term_pp tac
-     ^ pp_punctuation_tactical ~lazy_term_pp ~term_pp punct
+     pp_non_punctuation_tactical tac
+     ^ pp_punctuation_tactical punct
+  | NNonPunctuationTactical (_, tac, punct) ->
+     pp_non_punctuation_tactical tac
+     ^ pp_punctuation_tactical punct
   | Command (_, cmd) -> pp_command ~term_pp ~obj_pp cmd ^ "."
                       
 let pp_comment ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp =