X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_notation%2FcicNotationPp.ml;h=fcb42fd1853a869264b9599faf80aa45d98d240e;hb=619a3a478a4f6b0a50782b620009f6a141c30a53;hp=696580cdc5442c97555cb9bea3cf64e5b0eb131b;hpb=ea7808d83a7d6e03c0e163f0691e268dcd7c2ea4;p=helm.git

diff --git a/helm/ocaml/cic_notation/cicNotationPp.ml b/helm/ocaml/cic_notation/cicNotationPp.ml
index 696580cdc..fcb42fd18 100644
--- a/helm/ocaml/cic_notation/cicNotationPp.ml
+++ b/helm/ocaml/cic_notation/cicNotationPp.ml
@@ -36,12 +36,10 @@ let pp_binder = function
   | `Exists -> "exists"
   | `Forall -> "forall"
 
-let pp_literal l =
-  sprintf "literal(%s)"
-    (match l with
-    | `Symbol s
-    | `Keyword s
-    | `Number s -> s)
+let pp_literal = function
+  | `Symbol s -> sprintf "symbol(%s)" s
+  | `Keyword s -> sprintf "keyword(%s)" s
+  | `Number s -> sprintf "number(%s)" s
 
 let rec pp_term = function
   | AttributedTerm (`Href _, term) when print_attributes ->
@@ -138,11 +136,13 @@ and pp_layout = function
   | Sqrt t -> sprintf "\\SQRT %s" (pp_term t)
   | Root (arg, index) ->
       sprintf "\\ROOT %s \\OF %s" (pp_term index) (pp_term arg)
-(*   | Break -> "\\BREAK" *)
+  | Break -> "\\BREAK"
 (*   | Space -> "\\SPACE" *)
   | Box (box_spec, terms) ->
       sprintf "\\%s [%s]" (pp_box_spec box_spec)
         (String.concat " " (List.map pp_term terms))
+  | Group terms ->
+      sprintf "\\GROUP [%s]" (String.concat " " (List.map pp_term terms))
 
 and pp_magic = function
   | List0 (t, sep_opt) ->
@@ -156,8 +156,10 @@ and pp_magic = function
         (pp_fold_kind k) (pp_term p_base) acc (pp_term p_rec)
   | Default (p_some, p_none) ->
       sprintf "\\DEFAULT \\[%s\\] \\[%s\\]" (pp_term p_some) (pp_term p_none)
-  | If (p_guard, p) ->
-      sprintf "\\IF \\[%s\\] \\[%s\\]" (pp_term p_guard) (pp_term p)
+  | If (p_test, p_true, p_false) ->
+      sprintf "\\IF \\[%s\\] \\[%s\\] \\[%s\\]"
+	(pp_term p_test) (pp_term p_true) (pp_term p_false)
+  | Fail -> "\\FAIL"
 
 and pp_fold_kind = function
   | `Left -> "left"