fix_left_in_constr still broken, ask enrico

[helm.git] / helm / software / components / ng_kernel / nCicPp.ml

diff --git a/helm/software/components/ng_kernel/nCicPp.ml b/helm/software/components/ng_kernel/nCicPp.ml
index a0f0a8afb906c6f6991f47f3a5a6f8c23a9eed6d..72088e48b1c4bd9b1544ce228c0590ded9056464 100644 (file)
--- a/helm/software/components/ng_kernel/nCicPp.ml
+++ b/helm/software/components/ng_kernel/nCicPp.ml
@@ -57,9 +57,11 @@ let trivial_pp_term ~context ~subst ~metasenv ?(inside_fix=false) t =
    | C.Prod ("_",s,t) -> 
        if not toplevel then F.fprintf f "(";
        F.fprintf f "@[<hov 1>";
-       aux ~toplevel:true ctx s; 
+       (match s with 
+       | C.Prod ("_",_,_) -> aux ~toplevel:false ctx s 
+       | _ -> aux ~toplevel:true ctx s);
        F.fprintf f "@;→ ";
-       aux ~toplevel ("_"::ctx) t;
+       aux ~toplevel:true ("_"::ctx) t;
        F.fprintf f "@]";
        if not toplevel then F.fprintf f ")";
    | C.Prod (name,s,t) -> 
@@ -68,7 +70,7 @@ let trivial_pp_term ~context ~subst ~metasenv ?(inside_fix=false) t =
        F.fprintf f "@[<hov 2>∀%s:@;" name;
        aux ~toplevel:true ctx s; 
        F.fprintf f "@].@;";
-       aux ~toplevel (name::ctx) t;
+       aux ~toplevel:true (name::ctx) t;
        F.fprintf f "@]";
        if not toplevel then F.fprintf f ")";
    | C.Lambda (name,s,t) -> 
@@ -77,7 +79,7 @@ let trivial_pp_term ~context ~subst ~metasenv ?(inside_fix=false) t =
        F.fprintf f "λ%s:" name;
        aux ~toplevel:true ctx s; 
        F.fprintf f ".@;";
-       aux ~toplevel (name::ctx) t;
+       aux ~toplevel:true (name::ctx) t;
        F.fprintf f "@]";
        if not toplevel then F.fprintf f ")";
    | C.LetIn (name,ty,t,b) -> 
@@ -88,7 +90,7 @@ let trivial_pp_term ~context ~subst ~metasenv ?(inside_fix=false) t =
        F.fprintf f "@;≝ ";
        aux ~toplevel:true ctx t;
        F.fprintf f "@;in@;";
-       (aux ~toplevel (name::ctx) b);
+       (aux ~toplevel:true (name::ctx) b);
        F.fprintf f "@]";
        if not toplevel then F.fprintf f ")";
    | C.Match (r,oty,t,pl) ->
@@ -133,19 +135,39 @@ let ppobj = function
   | (u,_,metasenv,subst,NCic.Fixpoint (b, fl, _)) -> 
       "{"^NUri.string_of_uri u^"}\n"^
       "let rec "^
-       String.concat "\nand " (fst
-        (List.fold_right (fun (_,name,n,ty,bo) (l,i) ->
-          ((name^
-          " on " ^ string_of_int n ^ " : " ^ 
+       String.concat "\nand " 
+        (List.map (fun (_,name,n,ty,bo) ->
+          name^ " on " ^ string_of_int n ^ " : " ^ 
           ppterm ~metasenv ~subst ~context:[] ty ^ " :=\n"^
-          ppterm ~metasenv ~subst ~context:[] ~inside_fix:true bo) :: l),i-1) fl 
-           ([],List.length fl)))
-  | (u,_,_,_,NCic.Inductive (b, _,tyl, _)) -> "inductive"
+          ppterm ~metasenv ~subst ~context:[] ~inside_fix:true bo) fl)
+  | (u,_,metasenv,subst,NCic.Inductive (b, leftno,tyl, _)) -> 
+      "{"^NUri.string_of_uri u^"} with "^string_of_int leftno^" fixed params\n"^
+      "inductive "^
+      String.concat "\nand "
+        (List.map (fun (_,name,ty,cl) ->
+          name^": "^ppterm ~metasenv ~subst ~context:[] ty^ " :=\n"^
+          String.concat "\n"
+          (List.map (fun (_,name,ty) ->
+           "  | "^name^": "^ppterm ~metasenv ~subst ~context:[] ty)
+           cl)) tyl) ^ "."
   | (u,_,metasenv,subst,NCic.Constant (_,name,None,ty, _)) -> 
+      "{"^NUri.string_of_uri u^"}\n"^
         "axiom " ^ name ^ " : " ^ 
           ppterm ~metasenv ~subst ~context:[] ty ^ "\n"
   | (u,_,metasenv,subst,NCic.Constant (_,name,Some bo,ty, _)) ->
+      "{"^NUri.string_of_uri u^"}\n"^
         "definition " ^ name ^ " : " ^ 
           ppterm ~metasenv ~subst ~context:[] ty ^ " := \n"^
           ppterm ~metasenv ~subst ~context:[] bo ^ "\n"
 ;;
+
+let rec ppcontext ~subst ~metasenv = function
+  | [] -> ""
+  | (name, NCic.Decl t) :: tl -> 
+      ppcontext ~subst ~metasenv tl ^
+      name ^ ": " ^ ppterm ~subst ~metasenv ~context:tl t ^ "\n"
+  | (name, NCic.Def (bo,ty)) :: tl->
+      ppcontext ~subst ~metasenv tl ^
+      name ^ ": " ^ ppterm ~subst ~metasenv ~context:tl ty ^ 
+      " := " ^ ppterm ~subst ~metasenv ~context:tl bo ^ "\n"
+;;