X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Facic_content%2FcicNotationPp.ml;h=47bfe2748693c07975996bd6f7662fb91ddc44d4;hb=afa14a92f2a1fbc1c3b40298ddc77a0c7413857d;hp=8a2d1de709013b6aa771580d806679c33a80a3a9;hpb=96d82149c75cb82a8f4ceea9f1686cec36cebf76;p=helm.git

diff --git a/components/acic_content/cicNotationPp.ml b/components/acic_content/cicNotationPp.ml
index 8a2d1de70..47bfe2748 100644
--- a/components/acic_content/cicNotationPp.ml
+++ b/components/acic_content/cicNotationPp.ml
@@ -99,7 +99,6 @@ let rec pp_term ?(pp_parens = true) t =
     | Ast.Case (term, indtype, typ, patterns) ->
         sprintf "match %s%s%s with %s"
           (pp_term term)
-	  (match typ with None -> "" | Some t -> sprintf " return %s" (pp_term t))          
           (match indtype with
           | None -> ""
           | Some (ty, href_opt) ->
@@ -107,31 +106,29 @@ let rec pp_term ?(pp_parens = true) t =
               (match debug_printing, href_opt with
               | true, Some uri ->
                   sprintf "(i.e.%s)" (UriManager.string_of_uri uri)
-              | _ -> ""))
+              | _ -> ""))	  
+	  (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 var) (pp_term ~pp_parens:true t1)
           (pp_term ~pp_parens:true t2)
     | Ast.LetRec (kind, definitions, term) ->
-        let strip i t =
-	   let rec aux i l = function
-	      | Ast.Binder (_, var, body) when i > 0 -> aux (pred i) (var :: l) body
-	      | body                                 -> List.rev l, body
-	   in 
-	   aux i [] t
-	in	
-	let map (var, body, i) =
-           let id, vars, typ, body = match var with
-	      | term, Some typ ->
-	         let pvars, pbody = strip i typ in
-		 let _, bbody = strip i body in
-		 term, pvars, pbody, bbody
-	      | _              -> assert false
-	   in
-	   sprintf "%s %s: %s \\def %s" 
+	let rec get_guard i = function
+	   | []                   -> (*assert false*) Ast.Implicit
+	   | [term, _] when i = 1 -> term
+	   | _ :: tl              -> get_guard (pred i) tl
+	in
+	let map (params, (id,typ), body, i) =
+         let typ =
+          match typ with
+             None -> Ast.Implicit
+           | Some typ -> typ
+         in
+	   sprintf "%s %s on %s: %s \\def %s" 
 	      (pp_term ~pp_parens:false term)
-	      (String.concat " " (List.map pp_capture_variable vars))
+	      (String.concat " " (List.map pp_capture_variable params))
+	      (pp_term ~pp_parens:false (get_guard i params))
 	      (pp_term typ) (pp_term body)
 	in
 	sprintf "let %s %s in %s"
@@ -165,6 +162,7 @@ let rec pp_term ?(pp_parens = true) t =
   in
   match pp_parens, t with
     | false, _ 
+    | true, Ast.Implicit
     | true, Ast.Sort _
     | true, Ast.Ident (_, Some []) 
     | true, Ast.Ident (_, None)    -> t_pp
@@ -261,12 +259,7 @@ let set_pp_term f = _pp_term := f
 
 let pp_params = function
   | [] -> ""
-  | params ->
-      " " ^
-      String.concat " "
-        (List.map
-          (fun (name, typ) -> sprintf "(%s:%s)" name (pp_term typ))
-          params)
+  | params -> " " ^ String.concat " " (List.map pp_capture_variable params)
       
 let pp_flavour = function
   | `Definition -> "definition"
@@ -282,8 +275,11 @@ let pp_fields fields =
   (if fields <> [] then "\n" else "") ^ 
   String.concat ";\n" 
     (List.map 
-      (fun (name,ty,coercion) -> 
-        " " ^ name ^ if coercion then ":>" else ": " ^ pp_term ty) fields)
+      (fun (name,ty,coercion,arity) -> 
+        " " ^ name ^ 
+        if coercion then (":" ^ 
+          if arity > 0 then string_of_int arity else "" ^ ">") else ": " ^
+        pp_term ty) fields)
         
 let pp_obj = function
  | Ast.Inductive (params, types) ->
@@ -306,13 +302,13 @@ let pp_obj = function
         in
         fst_typ_pp ^ String.concat "" (List.map pp_type tl))
  | Ast.Theorem (flavour, name, typ, body) ->
-    sprintf "%s %s: %s %s"
+    sprintf "%s %s:\n %s\n%s"
       (pp_flavour flavour)
       name
       (pp_term typ)
       (match body with
       | None -> ""
-      | Some body -> "\\def " ^ pp_term body)
+      | Some body -> "\\def\n " ^ pp_term body)
  | Ast.Record (params,name,ty,fields) ->
     "record " ^ name ^ " " ^ pp_params params ^ ": " ^ pp_term ty ^ 
     " \\def {" ^ pp_fields fields ^ "\n}"