X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Facic_content%2FcicNotationPp.ml;h=4f94fa742464fa6bd3787c3cd693de347c231587;hb=813f73e76fb7374987ea1e826bcd6f15e22377d9;hp=4bd2f93ed2c633a8e0bb902d83e9bf50189301d6;hpb=87bdd061d096c836a02c77aa26e80d9c36180fad;p=helm.git

diff --git a/helm/software/components/acic_content/cicNotationPp.ml b/helm/software/components/acic_content/cicNotationPp.ml
index 4bd2f93ed..4f94fa742 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 -> "NonA"
-  | Gramext.LeftA -> "LeftA"
-  | Gramext.RightA -> "RightA"
-
 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)
@@ -115,9 +109,12 @@ let rec pp_term ?(pp_parens = true) t =
 	  (match typ with None -> "" | Some t -> sprintf " return %s" (pp_term t))          
           (pp_patterns patterns)
     | Ast.Cast (t1, t2) -> sprintf "(%s: %s)" (pp_term ~pp_parens:true t1) (pp_term ~pp_parens:true t2)
-    | Ast.LetIn (var, t1, t2) ->
-        sprintf "let %s \\def %s in %s" (pp_capture_variable pp_term var) (pp_term ~pp_parens:true t1)
-          (pp_term ~pp_parens:true t2)
+    | Ast.LetIn ((var,t2), t1, t3) ->
+(*       let t2 = match t2 with None -> Ast.Implicit | Some t -> t in *)
+        sprintf "let %s \\def %s in %s" (pp_term var)
+(*           (pp_term ~pp_parens:true t2) *)
+          (pp_term ~pp_parens:true t1)
+          (pp_term ~pp_parens:true t3)
     | Ast.LetRec (kind, definitions, term) ->
 	let rec get_guard i = function
 	   | []                   -> (*assert false*) Ast.Implicit
@@ -155,7 +152,7 @@ let rec pp_term ?(pp_parens = true) t =
     | Ast.Sort `Set -> "Set"
     | Ast.Sort `Prop -> "Prop"
     | Ast.Sort (`Type _) -> "Type"
-    | Ast.Sort `CProp -> "CProp"
+    | Ast.Sort (`CProp _)-> "CProp"
     | Ast.Symbol (name, _) -> "'" ^ name
 
     | Ast.UserInput -> ""
@@ -253,7 +250,8 @@ and pp_sep_opt = function
 and pp_variable = function
   | Ast.NumVar s -> "number " ^ s
   | Ast.IdentVar s -> "ident " ^ s
-  | Ast.TermVar s -> "term " ^ s
+  | Ast.TermVar (s,None) -> s
+  | Ast.TermVar (s,Some l) -> "term " ^string_of_int l 
   | Ast.Ascription (t, n) -> assert false
   | Ast.FreshVar n -> "fresh " ^ n
 
@@ -330,7 +328,8 @@ let rec pp_value = function
 
 let rec pp_value_type =
   function
-  | Env.TermType -> "Term"
+  | Env.TermType None -> "Term"
+  | Env.TermType (Some l) -> "Term "^string_of_int l
   | Env.StringType -> "String"
   | Env.NumType -> "Number"
   | Env.OptType t -> "Maybe " ^ pp_value_type t