Swapped arguments in error message.

[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 7af5d17a6f6e1e7a950184575784601ca0a700c6..2c46fef6f18a75874ff5486c71f2e107a96528ec 100644 (file)
--- a/helm/software/components/ng_kernel/nCicPp.ml
+++ b/helm/software/components/ng_kernel/nCicPp.ml
@@ -4,7 +4,7 @@ let ppterm =
 
 let set_ppterm f = ppterm := f;;
 
-let ppterm ?(context=[]) ?(subst=[]) ?(metasenv=[]) t = 
+let ppterm ~context ~subst ~metasenv t = 
   !ppterm ~context ~subst ~metasenv t
 ;;
 
@@ -36,14 +36,20 @@ let trivial_pp_term ~context ~subst ~metasenv =
 ;;
 
 let ppobj = function
-  | (u,_,_,_,NCic.Fixpoint (b, fl, _)) -> 
-       "let rec "^NUri.string_of_uri u^"\n"^
+  | (u,_,metasenv,subst,NCic.Fixpoint (b, fl, _)) -> 
+       NUri.string_of_uri u^"\n"^
+       "let rec "^
        String.concat "\nand "
         (List.map (fun (_,name,n,ty,bo) ->
-          name ^ " on " ^ string_of_int n ^ " : " ^ ppterm ty ^ " :=\n"^
-          ppterm bo) fl)
-  | _ -> "todo"
+          name ^ " on " ^ string_of_int n ^ " : " ^ 
+          ppterm ~metasenv ~subst ~context:[] ty ^ " :=\n"^
+          ppterm ~metasenv ~subst ~context:[] bo) fl)
+  | (u,_,_,_,NCic.Inductive (b, _,tyl, _)) -> "inductive"
+  | (u,_,metasenv,subst,NCic.Constant (_,name,None,ty, _)) -> 
+        "axiom " ^ name ^ " : " ^ 
+          ppterm ~metasenv ~subst ~context:[] ty ^ "\n"
+  | (u,_,metasenv,subst,NCic.Constant (_,name,Some bo,ty, _)) ->
+        "definition " ^ name ^ " : " ^ 
+          ppterm ~metasenv ~subst ~context:[] ty ^ ":=\n"^
+          ppterm ~metasenv ~subst ~context:[] bo ^ "\n"
 ;;
-
-
-