Metasenv added as parameter to eta_fixing.

[helm.git] / helm / ocaml / cic_omdoc / eta_fixing.ml

diff --git a/helm/ocaml/cic_omdoc/eta_fixing.ml b/helm/ocaml/cic_omdoc/eta_fixing.ml
index d6293d2434ad61af36b7c94203a0cf7b6c8641c7..6d5ce9833e86a6b592b91b531c2fd1c9f2da3bef 100644 (file)
--- a/helm/ocaml/cic_omdoc/eta_fixing.ml
+++ b/helm/ocaml/cic_omdoc/eta_fixing.ml
@@ -23,9 +23,7 @@
  * http://cs.unibo.it/helm/.
  *)
 
-exception ReferenceToVariable;;
-exception RferenceToCurrentProof;;
-exception ReferenceToInductiveDefinition;;
+exception ReferenceToNonVariable;;
 
 let prerr_endline _ = ();;
 
@@ -132,7 +130,11 @@ let fix_according_to_type ty hd tl =
   let rec aux n ty tl res =
     if n = 0 then
       (match tl with 
-         [] -> C.Appl res
+         [] ->
+          (match res with
+              [] -> assert false
+            | [res] -> res
+            | _ -> C.Appl res)
        | _ -> 
           match res with
             [] -> assert false
@@ -163,7 +165,7 @@ let fix_according_to_type ty hd tl =
   aux expected_arity ty tl [hd]
 ;;
 
-let eta_fix metasenv t =
+let eta_fix metasenv context t =
  let rec eta_fix' context t = 
   (* prerr_endline ("entering aux with: term=" ^ CicPp.ppterm t); 
   flush stderr ; *)
@@ -172,11 +174,8 @@ let eta_fix metasenv t =
   match t with
      C.Rel n -> C.Rel n 
    | C.Var (uri,exp_named_subst) ->
-      let exp_named_subst' =
-       List.map
-        (function i,t -> i, (eta_fix' context t)) exp_named_subst
-      in
-      C.Var (uri,exp_named_subst')
+      let exp_named_subst' = fix_exp_named_subst context exp_named_subst in
+       C.Var (uri,exp_named_subst')
    | C.Meta (n,l) ->
       let (_,canonical_context,_) =
        List.find (function (m,_,_) -> n = m) metasenv
@@ -192,7 +191,7 @@ let eta_fix metasenv t =
        in
        C.Meta (n,l')
    | C.Sort s -> C.Sort s
-   | C.Implicit -> C.Implicit
+   | C.Implicit _ as t -> t
    | C.Cast (v,t) -> C.Cast (eta_fix' context v, eta_fix' context t)
    | C.Prod (n,s,t) -> 
        C.Prod 
@@ -207,6 +206,11 @@ let eta_fix metasenv t =
        let l' =  List.map (eta_fix' context) l 
        in 
        (match l' with
+           [] -> assert false
+         | he::tl ->
+            let ty = CicTypeChecker.type_of_aux' metasenv context he in
+             fix_according_to_type ty he tl
+(*
          C.Const(uri,exp_named_subst)::l'' ->
            let constant_type =
              (match CicEnvironment.get_obj uri with
@@ -214,27 +218,18 @@ let eta_fix metasenv t =
              | C.Variable _ -> raise ReferenceToVariable
              | C.CurrentProof (_,_,_,_,params) -> raise RferenceToCurrentProof
              | C.InductiveDefinition _ -> raise ReferenceToInductiveDefinition
-             )
-           in
-            fix_according_to_type constant_type (C.Const(uri,exp_named_subst)) l''
-        | _ -> C.Appl l' )
+             ) in 
+           fix_according_to_type 
+             constant_type (C.Const(uri,exp_named_subst)) l''
+        | _ -> C.Appl l' *))
    | C.Const (uri,exp_named_subst) ->
-       let exp_named_subst' =
-       List.map
-        (function i,t -> i, (eta_fix' context t)) exp_named_subst
-       in
-       C.Const (uri,exp_named_subst')
+       let exp_named_subst' = fix_exp_named_subst context exp_named_subst in
+        C.Const (uri,exp_named_subst')
    | C.MutInd (uri,tyno,exp_named_subst) ->
-       let exp_named_subst' =
-       List.map
-        (function i,t -> i, (eta_fix' context t)) exp_named_subst
-       in
+       let exp_named_subst' = fix_exp_named_subst context exp_named_subst in
         C.MutInd (uri, tyno, exp_named_subst')
    | C.MutConstruct (uri,tyno,consno,exp_named_subst) ->
-       let exp_named_subst' =
-       List.map
-        (function i,t -> i, (eta_fix' context t)) exp_named_subst
-       in
+       let exp_named_subst' = fix_exp_named_subst context exp_named_subst in
         C.MutConstruct (uri, tyno, consno, exp_named_subst')
    | C.MutCase (uri, tyno, outty, term, patterns) as prima ->
        let outty' =  eta_fix' context outty in
@@ -248,7 +243,6 @@ let eta_fix metasenv t =
              | Cic.InductiveDefinition (l,_,n) -> l,n 
            ) in
        let (_,_,_,constructors) = List.nth inductive_types tyno in
-        prerr_endline ("QUI"); 
        let constructor_types = 
          let rec clean_up t =
            function 
@@ -260,11 +254,20 @@ let eta_fix metasenv t =
           if noparams = 0 then 
             List.map (fun (_,t) -> t) constructors 
           else 
-           let term_type = 
-              CicTypeChecker.type_of_aux' metasenv context term in
+                let term_type = 
+            CicTypeChecker.type_of_aux' metasenv context term
+           in
             (match term_type with
                C.Appl (hd::params) -> 
-                 List.map (fun (_,t) -> clean_up t params) constructors
+                 let rec first_n n l =
+                   if n = 0 then []
+                   else 
+                     (match l with
+                        a::tl -> a::(first_n (n-1) tl)
+                     | _ -> assert false) in 
+                 List.map 
+                  (fun (_,t) -> 
+                     clean_up t (first_n noparams params)) constructors
              | _ -> prerr_endline ("QUA"); assert false) in 
        let patterns2 = 
          List.map2 fix_lambdas_wrt_type
@@ -285,11 +288,18 @@ let eta_fix metasenv t =
         List.map
          (fun (name, ty, bo) ->
            (name, eta_fix' context ty, eta_fix' (fun_types@context) bo)) funs)
-   in
-   eta_fix' [] t
+  and fix_exp_named_subst context exp_named_subst =
+   List.rev
+    (List.fold_left
+      (fun newsubst (uri,t) ->
+        let t' = eta_fix' context t in
+        let ty =
+         match CicEnvironment.get_obj uri with
+            Cic.Variable (_,_,ty,_) -> CicSubstitution.subst_vars newsubst ty
+          | _ ->  raise ReferenceToNonVariable in
+        let t'' = fix_according_to_type ty t' [] in
+         (uri,t'')::newsubst
+      ) [] exp_named_subst)
+  in
+   eta_fix' context t
 ;;
-
-
-
-
-