Use of standard OCaml syntax

[helm.git] / matita / components / ng_tactics / nCicElim.ml

diff --git a/matita/components/ng_tactics/nCicElim.ml b/matita/components/ng_tactics/nCicElim.ml
index bd6add07cd6d4a95914f668c828e0ebd7548e06c..5ed986a10e54a4c9eaef39130bb8fc73ba8e5f12 100644 (file)
--- a/matita/components/ng_tactics/nCicElim.ml
+++ b/matita/components/ng_tactics/nCicElim.ml
@@ -50,7 +50,7 @@ let mk_elim status uri leftno it (outsort,suffix) pragma =
  let p_name = mk_id "Q_" in
  let params,ty = NCicReduction.split_prods status ~subst:[] [] leftno ty in
  let params = List.rev_map (function name,_ -> mk_id name) params in
- let args,sort = NCicReduction.split_prods status ~subst:[] [] (-1) ty in
+ let args,_sort = NCicReduction.split_prods status ~subst:[] [] (-1) ty in
  let args = List.rev_map (function name,_ -> mk_id name) args in
  let rec_arg = mk_id (fresh_name ()) in
  let mk_prods = 
@@ -77,7 +77,7 @@ let mk_elim status uri leftno it (outsort,suffix) pragma =
   List.map
    (function (_,name,ty) ->
      let _,ty = NCicReduction.split_prods status ~subst:[] [] leftno ty in
-     let cargs,ty= my_split_prods status ~subst:[] [] (-1) ty in
+     let cargs,_ty= my_split_prods status ~subst:[] [] (-1) ty in
      let cargs_recargs_nih =
       List.fold_left
        (fun (acc,nih) -> function
@@ -91,7 +91,7 @@ let mk_elim status uri leftno it (outsort,suffix) pragma =
                   let NReference.Ref (uri',_) = nref in
                    NUri.eq uri uri'
                  ->
-                  let abs = List.rev_map (fun id,_ -> mk_id id) context in
+                  let abs = List.rev_map (fun (id,_) -> mk_id id) context in
                   let name = mk_id name in
                    (name, Some (
                    List.fold_right
@@ -130,9 +130,10 @@ let mk_elim status uri leftno it (outsort,suffix) pragma =
                List.map (function name -> name, None) args in
  let recno = List.length final_params in
  let where = recno - 1 in
+ let attrs = `Generated, `Definition, pragma in
  let res =
   NotationPt.LetRec (`Inductive,
-   [final_params, (rec_name,ty), bo, where], rec_name)
+   [final_params, (rec_name,ty), bo, where], attrs)
  in
 (*
   prerr_endline
@@ -166,9 +167,7 @@ let mk_elim status uri leftno it (outsort,suffix) pragma =
      (function x::_ -> x | _ -> assert false) 80 
      (NotationPres.mpres_of_box boxml)));
 *)
-  NotationPt.Theorem
-   (`Definition,srec_name,
-      NotationPt.Implicit `JustOne,Some res,pragma)
+  res
 ;;
 
 let ast_of_sort s =
@@ -219,6 +218,57 @@ let rec nth_prod projs n ty =
   | _ -> assert false
 ;;
 
+(* this code should be unified with NTermCicContent.nast_of_cic0,
+   but the two contexts have different types *)
+let pp (status: #NCic.status) =
+ let rec pp rels =
+  function
+    NCic.Rel i -> List.nth rels (i - 1)
+  | NCic.Const _ as t -> NotationPt.NCic t
+  | NCic.Sort s -> NotationPt.Sort (fst (ast_of_sort s))
+  | NCic.Meta _
+  | NCic.Implicit _ -> assert false
+  | NCic.Appl l -> NotationPt.Appl (List.map (pp rels) l)
+  | NCic.Prod (n,s,t) ->
+     let n = mk_id n in
+      NotationPt.Binder (`Pi, (n,Some (pp rels s)), pp (n::rels) t)
+  | NCic.Lambda (n,s,t) ->
+     let n = mk_id n in
+      NotationPt.Binder (`Lambda, (n,Some (pp rels s)), pp (n::rels) t)
+  | NCic.LetIn (n,ty,s,t) ->
+     let n = mk_id n in
+      NotationPt.LetIn ((n, Some (pp rels ty)), pp rels s, pp (n::rels) t)
+  | NCic.Match (NReference.Ref (uri,_) as r,outty,te,patterns) ->
+    let name = NUri.name_of_uri uri in
+    let case_indty = Some (name, None) in
+    let constructors, leftno =
+     let _,leftno,tys,_,n = NCicEnvironment.get_checked_indtys status r in
+     let _,_,_,cl  = List.nth tys n in
+      cl,leftno
+    in
+    let rec eat_branch n rels ty pat =
+      match (ty, pat) with
+      | NCic.Prod (_name, _s, t), _ when n > 0 ->
+         eat_branch (pred n) rels t pat
+      | NCic.Prod (_, _, t), NCic.Lambda (name, s, t') ->
+          let cv, rhs = eat_branch 0 ((mk_id name)::rels) t t' in
+           (mk_id name, Some (pp rels s)) :: cv, rhs
+      | _, _ -> [], pp rels pat
+    in
+    let patterns =
+      try
+        List.map2
+          (fun (_, name, ty) pat ->
+            let capture_variables,rhs = eat_branch leftno rels ty pat in
+             NotationPt.Pattern (name, None, capture_variables), rhs
+          ) constructors patterns
+      with Invalid_argument _ -> assert false
+    in
+     NotationPt.Case (pp rels te, case_indty, Some (pp rels outty), patterns)
+ in
+  pp
+;;
+
 let mk_projection status leftno tyname consname consty (projname,_,_) i =
  let argsno = count_prods consty - leftno in
  let rec aux names ty leftno =
@@ -232,9 +282,13 @@ let mk_projection status leftno tyname consname consty (projname,_,_) i =
       HExtlib.mk_list underscore i @ [bvar,None] @
        HExtlib.mk_list underscore (argsno - i -1) in
      let branch = NotationPt.Pattern (consname,None,bvars), bvar in
-     let _,outtype = nth_prod [] i ty in
-     let outtype= 
-       NotationPt.Binder (`Lambda, (arg, Some arg_ty), NotationPt.NCic outtype) in
+     let projs,outtype = nth_prod [] i ty in
+     let rels =
+      List.map
+       (fun name -> mk_appl (mk_id name :: List.rev names @ [arg])) projs
+      @ names in
+     let outtype = pp status rels outtype in
+     let outtype= NotationPt.Binder (`Lambda, (arg, Some arg_ty), outtype) in
       [arg, Some arg_ty], NotationPt.Case (arg,None,Some outtype,[branch])
    | _,NCic.Prod (name,_,t) ->
       let name = mk_id name in
@@ -244,17 +298,17 @@ let mk_projection status leftno tyname consname consty (projname,_,_) i =
  in
  let params,bo = aux [] consty leftno in
  let pprojname = mk_id projname in
+ let attrs = `Generated, `Definition, `Projection in
  let res =
   NotationPt.LetRec (`Inductive,
-   [params, (pprojname,None), bo, leftno], pprojname) in
+   [params, (pprojname,None), bo, leftno], attrs) in
 (* prerr_endline
    (BoxPp.render_to_string
      ~map_unicode_to_tex:false
      (function x::_ -> x | _ -> assert false)
      80 (NotationPres.render (fun _ -> None)
      (TermContentPres.pp_ast res)));*)
-  NotationPt.Theorem
-   (`Definition,projname,NotationPt.Implicit `JustOne,Some res,`Projection)
+   res
 ;;
 
 let mk_projections status (_,_,_,_,obj) =