X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_notation%2FgrafiteAstPp.ml;h=7d1f8c22e843e53a5c942851e897c35f2be6d083;hb=f981a524748846acc29b76b6e616af110b4ee13d;hp=db7a7253e30888f1a913d66a738ccc9b52806b39;hpb=e20f3963028a966fc93ba0d611c4aa8341d20e2c;p=helm.git

diff --git a/helm/ocaml/cic_notation/grafiteAstPp.ml b/helm/ocaml/cic_notation/grafiteAstPp.ml
index db7a7253e..7d1f8c22e 100644
--- a/helm/ocaml/cic_notation/grafiteAstPp.ml
+++ b/helm/ocaml/cic_notation/grafiteAstPp.ml
@@ -39,10 +39,12 @@ let pp_idents idents = "[" ^ String.concat "; " idents ^ "]"
 let pp_terms_ast terms = String.concat ", " (List.map pp_term_ast terms)
 
 let pp_reduction_kind = function
+  | `Normalize -> "normalize"
   | `Reduce -> "reduce"
   | `Simpl -> "simplify"
+  | `Unfold (Some t) -> "unfold " ^ pp_term_ast t
+  | `Unfold None -> "unfold"
   | `Whd -> "whd"
-  | `Normalize -> "normalize"
  
   
 let pp_pattern (t, hyp, goal) = 
@@ -78,8 +80,15 @@ let rec pp_tactic = function
      "cut " ^ pp_term_ast term ^
       (match ident with None -> "" | Some id -> " as " ^ id)
   | DecideEquality _ -> "decide equality"
-  | Decompose (_, term) ->
-      sprintf "decompose %s" (pp_term_ast term)
+  | Decompose (_, [], what, names) ->
+      sprintf "decompose %s%s" 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) what (pp_intros_specs (None, names)) 
   | Discriminate (_, term) -> "discriminate " ^ pp_term_ast term
   | Elim (_, term, using, num, idents) ->
       sprintf "elim " ^ pp_term_ast term ^
@@ -229,6 +238,36 @@ let pp_obj = function
     "record " ^ name ^ " " ^ pp_params params ^ " \\def {" ^
     pp_fields fields ^ "}"
 
+let pp_argument_pattern = function
+  | CicNotationPt.IdentArg (eta_depth, name) ->
+      let eta_buf = Buffer.create 5 in
+      for i = 1 to eta_depth do
+        Buffer.add_string eta_buf "\\eta."
+      done;
+      sprintf "%s%s" (Buffer.contents eta_buf) name
+
+let rec pp_cic_appl_pattern = function
+  | CicNotationPt.UriPattern uri -> UriManager.string_of_uri uri
+  | CicNotationPt.VarPattern name -> name
+  | CicNotationPt.ImplicitPattern -> "_"
+  | CicNotationPt.ApplPattern aps ->
+      sprintf "(%s)" (String.concat " " (List.map pp_cic_appl_pattern aps))
+
+let pp_l1_pattern = CicNotationPp.pp_term
+let pp_l2_pattern = CicNotationPp.pp_term
+
+let pp_associativity = function
+  | Gramext.LeftA -> "left associative"
+  | Gramext.RightA -> "right associative"
+  | Gramext.NonA -> "non associative"
+
+let pp_precedence i = sprintf "with precedence %d" i
+
+let pp_dir_opt = function
+  | None -> ""
+  | Some `LeftToRight -> "> "
+  | Some `RightToLeft -> "< "
+
 let pp_command = function
   | Include (_,path) -> "include " ^ path
   | Qed _ -> "qed"
@@ -240,6 +279,20 @@ let pp_command = function
   | Default (_,what,uris) ->
      sprintf "default \"%s\" %s" what
       (String.concat " " (List.map UriManager.string_of_uri uris))
+  | Interpretation (_, dsc, (symbol, arg_patterns), cic_appl_pattern) ->
+      sprintf "interpretation \"%s\" '%s %s = %s"
+        dsc symbol
+        (String.concat " " (List.map pp_argument_pattern arg_patterns))
+        (pp_cic_appl_pattern cic_appl_pattern)
+  | Notation (_, dir_opt, l1_pattern, assoc, prec, l2_pattern) ->
+      sprintf "notation %s\"%s\" %s %s for %s"
+        (pp_dir_opt dir_opt)
+        (pp_l1_pattern l1_pattern)
+        (pp_associativity assoc)
+        (pp_precedence prec)
+        (pp_l2_pattern l2_pattern)
+  | Render _
+  | Dump _ -> assert false  (* ZACK: debugging *)
 
 let rec pp_tactical = function
   | Tactic (_, tac) -> pp_tactic tac
@@ -277,7 +330,12 @@ let pp_cic_command = function
   | Qed _ -> "qed"
   | Drop _ -> "drop"
   | Coercion (_,term) -> sprintf "coercion %s" (CicPp.ppterm term)
-  | Set (_, _, _)
-  | Alias (_,_)
-  | Default (_,_,_)
-  | Obj (_,_) -> assert false (* not implemented *)
+  | Set _
+  | Alias _
+  | Default _
+  | Render _
+  | Dump _
+  | Interpretation _
+  | Notation _
+  | Obj _ -> assert false (* not implemented *)
+