j off by one in error message

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

diff --git a/helm/software/components/ng_kernel/oCic2NCic.ml b/helm/software/components/ng_kernel/oCic2NCic.ml
index cd90fbdf5c0e8327959f3f9bcfacc23f6fb72816..54e12be14ae6fe3bcdda32c5fa6e393770ee09b2 100644 (file)
--- a/helm/software/components/ng_kernel/oCic2NCic.ml
+++ b/helm/software/components/ng_kernel/oCic2NCic.ml
@@ -61,6 +61,66 @@ let splat_args ctx t n_fix =
    NCic.Appl (t:: aux (List.length ctx))
 ;;
 
+exception Nothing_to_do;;
+
+let fix_outty curi tyno t context outty =
+ let leftno,rightno =
+  match fst (CicEnvironment.get_obj CicUniv.oblivion_ugraph curi) with
+     Cic.InductiveDefinition (tyl,_,leftno,_) ->
+      let _,_,arity,_ = List.nth tyl tyno in
+      let rec count_prods leftno context arity =
+       match leftno, CicReduction.whd context arity with
+          0, Cic.Sort _ -> 0
+        | 0, Cic.Prod (name,so,ty) ->
+           1 + count_prods 0 (Some (name, Cic.Decl so)::context) ty
+        | n, Cic.Prod (name,so,ty) ->
+           count_prods (leftno - 1) (Some (name, Cic.Decl so)::context) ty
+        | _,_ -> assert false
+      in
+(*prerr_endline (UriManager.string_of_uri curi);
+prerr_endline ("LEFTNO: " ^ string_of_int leftno ^ "  " ^ CicPp.ppterm arity);*)
+       leftno, count_prods leftno [] arity
+   | _ -> assert false in
+ let ens,args =
+  let tty,_= CicTypeChecker.type_of_aux' [] context t CicUniv.oblivion_ugraph in
+  match CicReduction.whd context tty with
+     Cic.MutInd (_,_,ens) -> ens,[]
+   | Cic.Appl (Cic.MutInd (_,_,ens)::args) ->
+      ens,fst (HExtlib.split_nth leftno args)
+   | _ -> assert false
+ in
+  let rec aux n irl context outsort =
+   match n, CicReduction.whd context outsort with
+      0, Cic.Prod _ -> raise Nothing_to_do
+    | 0, _ ->
+       let irl = List.rev irl in
+       let ty = CicSubstitution.lift rightno (Cic.MutInd (curi,tyno,ens)) in
+       let ty =
+        if args = [] && irl = [] then ty
+        else
+         Cic.Appl (ty::(List.map (CicSubstitution.lift rightno) args)@irl) in
+       let he = CicSubstitution.lift (rightno + 1) outty in
+       let t =
+        if irl = [] then he
+        else Cic.Appl (he::List.map (CicSubstitution.lift 1) irl)
+       in
+        Cic.Lambda (Cic.Anonymous, ty, t)
+    | n, Cic.Prod (name,so,ty) ->
+       let ty' =
+        aux (n - 1) (Cic.Rel n::irl) (Some (name, Cic.Decl so)::context) ty
+       in
+        Cic.Lambda (name,so,ty')
+    | _,_ -> assert false
+  in
+(*prerr_endline ("RIGHTNO = " ^ string_of_int rightno ^ " OUTTY = " ^ CicPp.ppterm outty);*)
+   let outsort =
+    fst (CicTypeChecker.type_of_aux' [] context outty CicUniv.oblivion_ugraph)
+   in
+    try aux rightno [] context outsort
+    with Nothing_to_do -> outty
+(*prerr_endline (CicPp.ppterm outty ^ " <==> " ^ CicPp.ppterm outty');*)
+;;
+
 (* we are lambda-lifting also variables that do not occur *)
 (* ctx does not distinguish successive blocks of cofix, since there may be no
  *   lambda separating them *)
@@ -216,9 +276,10 @@ let convert_term uri t =
     | Cic.MutConstruct (curi, tyno, consno, ens) -> 
        aux_ens octx ctx n_fix uri ens
         (NCic.Const (Ref.reference_of_ouri curi (Ref.Con (tyno,consno))))
-    | Cic.MutCase (curi, tyno, oty, t, branches) ->
+    | Cic.MutCase (curi, tyno, outty, t, branches) ->
+        let outty = fix_outty curi tyno t octx outty in
         let r = Ref.reference_of_ouri curi (Ref.Ind tyno) in
-        let oty, fixpoints_oty = aux octx ctx n_fix uri oty in
+        let outty, fixpoints_outty = aux octx ctx n_fix uri outty in
         let t, fixpoints_t = aux octx ctx n_fix uri t in
         let branches, fixpoints =
           List.fold_right 
@@ -227,7 +288,7 @@ let convert_term uri t =
                (t::l,fixpoints@acc))
              branches ([],[])
         in
-        NCic.Match (r,oty,t,branches), fixpoints_oty @ fixpoints_t @ fixpoints
+        NCic.Match (r,outty,t,branches), fixpoints_outty@fixpoints_t@fixpoints
     | Cic.Implicit _ | Cic.Meta _ | Cic.Var _ -> assert false
   and aux_ens octx ctx n_fix uri ens he =
    match ens with
@@ -245,7 +306,7 @@ let convert_term uri t =
    aux [] [] 0 uri t
 ;;
 
-let cook vars t =
+let cook mode vars t =
  let t = CicSubstitution.lift (List.length vars) t in
  snd (List.fold_right
   (fun uri (n,t) ->
@@ -256,9 +317,10 @@ let cook vars t =
       | _ -> assert false in
     let id = Cic.Name (UriManager.name_of_uri uri) in
     let t =
-     match bo,ty with
-        None,ty -> Cic.Lambda (id,ty,t)
-      | Some bo,ty -> Cic.LetIn (id,bo,ty,t)
+     match bo,ty,mode with
+        None,ty,`Lambda -> Cic.Lambda (id,ty,t)
+      | None,ty,`Pi -> Cic.Prod (id,ty,t)
+      | Some bo,ty,_ -> Cic.LetIn (id,bo,ty,t)
     in
      n+1,t
   ) vars (1,t))
@@ -266,14 +328,14 @@ let cook vars t =
 
 let convert_obj_aux uri = function
  | Cic.Constant (name, None, ty, vars, _) ->
-     let ty = cook vars ty in
+     let ty = cook `Pi vars ty in
      let nty, fixpoints = convert_term uri ty in
      assert(fixpoints = []);
      NCic.Constant ([], name, None, nty, (`Provided,`Theorem,`Regular)),
      fixpoints
  | Cic.Constant (name, Some bo, ty, vars, _) ->
-     let bo = cook vars bo in
-     let ty = cook vars ty in
+     let bo = cook `Lambda vars bo in
+     let ty = cook `Pi vars ty in
      let nbo, fixpoints_bo = convert_term uri bo in
      let nty, fixpoints_ty = convert_term uri ty in
      assert(fixpoints_ty = []);
@@ -284,12 +346,12 @@ let convert_obj_aux uri = function
      let itl, fix_itl = 
        List.fold_right
          (fun (name, _, ty, cl) (itl,acc) ->
-            let ty = cook vars ty in
+            let ty = cook `Pi vars ty in
             let ty, fix_ty = convert_term uri ty in
             let cl, fix_cl = 
               List.fold_right
                (fun (name, ty) (cl,acc) -> 
-                 let ty = cook vars ty in
+                 let ty = cook `Pi vars ty in
                  let ty, fix_ty = convert_term uri ty in
                  ([], name, ty)::cl, acc @ fix_ty)
                cl ([],[])