X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Facic_content%2FcicNotationPp.ml;h=29898eb13ace83196d7340d8f10ff653dc170cc6;hb=002d456397be2f0046bb50356e80816f7296647d;hp=7fbc9f492225c1db508e1241c73eddcf81e6f07c;hpb=bcf9a65332d321c25761207e2fb17110dbdc8241;p=helm.git

diff --git a/helm/software/components/acic_content/cicNotationPp.ml b/helm/software/components/acic_content/cicNotationPp.ml
index 7fbc9f492..29898eb13 100644
--- a/helm/software/components/acic_content/cicNotationPp.ml
+++ b/helm/software/components/acic_content/cicNotationPp.ml
@@ -54,12 +54,6 @@ let pp_literal =
       | `Keyword s
       | `Number s -> s)
 
-let pp_assoc =
-  function
-  | Gramext.NonA -> "N"
-  | Gramext.LeftA -> "L"
-  | Gramext.RightA -> "R"
-
 let pp_pos =
   function
 (*      `None -> "`None" *)
@@ -74,7 +68,7 @@ let pp_attribute =
       sprintf "X(%s)"
         (String.concat ";"
           (List.map (fun (_, n, v) -> sprintf "%s=%s" n v) attrs))
-  | `Level (prec, assoc) -> sprintf "L(%d%s)" prec (pp_assoc assoc)
+  | `Level (prec) -> sprintf "L(%d)" prec 
   | `Raw _ -> "R"
   | `Loc _ -> "@"
   | `ChildPos p -> sprintf "P(%s)" (pp_pos p)
@@ -217,6 +211,7 @@ and pp_layout = function
   | Ast.Over (t1, t2) -> sprintf "[%s \\OVER %s]" (pp_term t1) (pp_term t2)
   | Ast.Atop (t1, t2) -> sprintf "[%s \\ATOP %s]" (pp_term t1) (pp_term t2)
   | Ast.Frac (t1, t2) -> sprintf "\\FRAC %s %s" (pp_term t1) (pp_term t2)
+  | Ast.InfRule (t1, t2, t3) -> sprintf "\\INFRULE %s %s %s" (pp_term t1) (pp_term t2) (pp_term t3)
   | Ast.Sqrt t -> sprintf "\\SQRT %s" (pp_term t)
   | Ast.Root (arg, index) ->
       sprintf "\\ROOT %s \\OF %s" (pp_term index) (pp_term arg)
@@ -227,6 +222,10 @@ and pp_layout = function
         (String.concat " " (List.map pp_term terms))
   | Ast.Group terms ->
       sprintf "\\GROUP [%s]" (String.concat " " (List.map pp_term terms))
+  | Ast.Mstyle (l,terms) -> 
+      sprintf "\\MSTYLE %s [%s]" 
+        (String.concat " " (List.map (fun (k,v) -> k^"="^v) l))
+        (String.concat " " (List.map pp_term terms))
 
 and pp_magic = function
   | Ast.List0 (t, sep_opt) ->
@@ -256,8 +255,8 @@ and pp_sep_opt = function
 and pp_variable = function
   | Ast.NumVar s -> "number " ^ s
   | Ast.IdentVar s -> "ident " ^ s
-  | Ast.TermVar (s,None) -> s
-  | Ast.TermVar (s,Some (l,a)) -> "term " ^string_of_int l ^ " " ^ pp_assoc a ^ " " ^ s
+  | Ast.TermVar (s,Ast.Self _) -> s
+  | Ast.TermVar (s,Ast.Level l) -> "term " ^string_of_int l 
   | Ast.Ascription (t, n) -> assert false
   | Ast.FreshVar n -> "fresh " ^ n
 
@@ -334,8 +333,7 @@ let rec pp_value = function
 
 let rec pp_value_type =
   function
-  | Env.TermType None -> "Term"
-  | Env.TermType (Some (l,a)) -> "Term "^string_of_int l ^ " " ^ pp_assoc a 
+  | Env.TermType l -> "Term "^string_of_int l
   | Env.StringType -> "String"
   | Env.NumType -> "Number"
   | Env.OptType t -> "Maybe " ^ pp_value_type t