X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAstPp.ml;h=6c7a6638a9cf9e01f3a2a9455ebff8ce5c107cce;hb=5366f90df289f2ab2bd97c68643198f54ad2d2ac;hp=8fbe6b8d1c709b84dc995fd6bb020e3603346927;hpb=4dc87cc7384ba61136bc82a23effe6a52160e720;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAstPp.ml b/helm/software/components/grafite/grafiteAstPp.ml
index 8fbe6b8d1..6c7a6638a 100644
--- a/helm/software/components/grafite/grafiteAstPp.ml
+++ b/helm/software/components/grafite/grafiteAstPp.ml
@@ -89,7 +89,12 @@ let pp_just ~term_pp =
   | `Auto params -> pp_auto_params ~term_pp params
 ;;
 
-let rec pp_ntactic ~map_unicode_to_tex = function
+let rec pp_ntactic ~map_unicode_to_tex =
+ let term_pp = CicNotationPp.pp_term in
+ let lazy_term_pp = fun _ -> assert false in
+ let pp_tactic_pattern =
+  pp_tactic_pattern ~map_unicode_to_tex ~lazy_term_pp ~term_pp in
+ function
   | NApply (_,t) -> "napply " ^ CicNotationPp.pp_term t
   | NCases (_,what,where) -> "ncases " ^ CicNotationPp.pp_term what ^
       assert false ^ " " ^ assert false
@@ -100,13 +105,15 @@ let rec pp_ntactic ~map_unicode_to_tex = function
       assert false ^ " " ^ assert false
   | NId _ -> "nid"
   | NIntro (_,n) -> "#" ^ n
-  | NRewrite (_,dir,n,where) -> "nrewrite" ^ assert false
+  | 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 _ -> assert false
+  | NReduce _ | NGeneralize _ | NLetIn _ | NAssert _ -> "TO BE IMPLEMENTED"
   | NDot _ -> "##."
   | NSemicolon _ -> "##;"
   | NBranch _ -> "##["
@@ -341,11 +348,6 @@ let pp_associativity = function
 
 let pp_precedence i = Printf.sprintf "with precedence %d" i
 
-let pp_dir_opt = function
-  | None -> ""
-  | Some `LeftToRight -> "> "
-  | Some `RightToLeft -> "< "
-
 let pp_default what uris = 
   Printf.sprintf "default \"%s\" %s" what
     (String.concat " " (List.map UriManager.string_of_uri uris))
@@ -360,7 +362,15 @@ let pp_ncommand = function
       "unification hint " ^ string_of_int n ^ " " ^ CicNotationPp.pp_term t
   | NObj (_,_)
   | NUnivConstraint (_) -> "not supported"
+  | NCoercion (_) -> "not supported"
   | NQed (_) -> "nqed"
+  | NCopy (_,name,uri,map) -> 
+      "copy " ^ name ^ " from " ^ NUri.string_of_uri uri ^ " with " ^ 
+        String.concat " and " 
+          (List.map 
+            (fun (a,b) -> NUri.string_of_uri a ^ " ↦ " ^ NUri.string_of_uri b) 
+            map)
+;;
     
 let pp_command ~term_pp ~obj_pp = function
   | Index (_,_,uri) -> "Indexing " ^ UriManager.string_of_uri uri