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 a41e2fb349f0cb31b39ceda6f463116c64324e7b..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
@@ -116,7 +116,7 @@ let mk_elim status uri leftno it (outsort,suffix) pragma =
    ) cl
  in
  let branches, branch_args = List.split branches_with_args in
- let bo = NotationPt.Case (rec_arg,Some (ind_name,None),None,branches) in
+ let bo = NotationPt.Case (rec_arg,Some (ind_name,None),Some p_name,branches) in
  let final_params =
   List.map (function name -> name, None) params @
   [p_name,Some p_ty] @
@@ -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 =
@@ -225,9 +224,7 @@ let pp (status: #NCic.status) =
  let rec pp rels =
   function
     NCic.Rel i -> List.nth rels (i - 1)
-  | NCic.Const _ as t ->
-     NotationPt.Ident
-      (status#ppterm ~metasenv:[] ~subst:[] ~context:[] t,None)
+  | NCic.Const _ as t -> NotationPt.NCic t
   | NCic.Sort s -> NotationPt.Sort (fst (ast_of_sort s))
   | NCic.Meta _
   | NCic.Implicit _ -> assert false
@@ -238,7 +235,7 @@ let pp (status: #NCic.status) =
   | 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,s,ty,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) ->
@@ -251,7 +248,7 @@ let pp (status: #NCic.status) =
     in
     let rec eat_branch n rels ty pat =
       match (ty, pat) with
-      | NCic.Prod (name, s, t), _ when n > 0 ->
+      | 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
@@ -301,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) =