X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_refiner%2FnCicRefiner.ml;h=8872cbc9b576f855a8f65334addc871864e3bc6c;hb=d35aca0e979a9c7edbc60c44040360d52be8ca82;hp=64911e198337ef472e010f2324dec30180fa7ab8;hpb=e78cf74f8976cf0ca554f64baa9979d0423ee927;p=helm.git

diff --git a/helm/software/components/ng_refiner/nCicRefiner.ml b/helm/software/components/ng_refiner/nCicRefiner.ml
index 64911e198..8872cbc9b 100644
--- a/helm/software/components/ng_refiner/nCicRefiner.ml
+++ b/helm/software/components/ng_refiner/nCicRefiner.ml
@@ -46,7 +46,7 @@ let exp_implicit metasenv context expty =
 ;;
 
 
-let check_allowed_sort_elimination hdb localise r orig =
+let check_allowed_sort_elimination rdb localise r orig =
    let mkapp he arg =
      match he with
      | C.Appl l -> C.Appl (l @ [arg])
@@ -64,7 +64,7 @@ let check_allowed_sort_elimination hdb localise r orig =
           NCicMetaSubst.mk_meta metasenv ((name,C.Decl so1)::context) `Type 
         in
         let metasenv, subst = 
-          try NCicUnification.unify hdb metasenv subst context 
+          try NCicUnification.unify rdb metasenv subst context 
                 arity2 (C.Prod (name, so1, meta)) 
           with exc -> raise (wrap_exc (lazy (localise orig, Printf.sprintf
             "expected %s, found %s" (* XXX localizzare meglio *)
@@ -76,7 +76,7 @@ let check_allowed_sort_elimination hdb localise r orig =
      | C.Sort _ (* , t ==?== C.Prod _ *) ->
         let metasenv, _, meta, _ = NCicMetaSubst.mk_meta metasenv [] `Type in
         let metasenv, subst = 
-          try NCicUnification.unify hdb metasenv subst context 
+          try NCicUnification.unify rdb metasenv subst context 
                 arity2 (C.Prod ("_", ind, meta)) 
           with exc -> raise (wrap_exc (lazy (localise orig, Printf.sprintf
             "expected %s, found %s" (* XXX localizzare meglio *)
@@ -94,9 +94,9 @@ let check_allowed_sort_elimination hdb localise r orig =
     aux
 ;;
 
-let rec typeof hdb 
+let rec typeof rdb 
   ?(localise=fun _ -> Stdpp.dummy_loc) 
-  ~look_for_coercion metasenv subst context term expty 
+  metasenv subst context term expty 
 =
   let force_ty skip_lambda metasenv subst context orig t infty expty =
     (*D*)inside 'F'; try let rc = 
@@ -111,11 +111,11 @@ let rec typeof hdb
           (NCicPp.ppterm ~metasenv ~subst:[] ~context expty)));
            try 
              let metasenv, subst =
-               NCicUnification.unify hdb metasenv subst context infty expty 
+               NCicUnification.unify rdb metasenv subst context infty expty 
              in
              metasenv, subst, t, expty
            with exc -> 
-             try_coercions hdb ~look_for_coercion ~localise 
+             try_coercions rdb ~localise 
                metasenv subst context t orig infty expty true exc)
     | None -> metasenv, subst, t, infty
     (*D*)in outside(); rc with exc -> outside (); raise exc
@@ -168,12 +168,12 @@ let rec typeof hdb
     | C.Prod (name,(s as orig_s),(t as orig_t)) ->
        let metasenv, subst, s, s1 = typeof_aux metasenv subst context None s in
        let metasenv, subst, s, s1 = 
-         force_to_sort hdb ~look_for_coercion
+         force_to_sort rdb 
            metasenv subst context s orig_s localise s1 in
        let context1 = (name,(C.Decl s))::context in
        let metasenv, subst, t, s2 = typeof_aux metasenv subst context1 None t in
        let metasenv, subst, t, s2 = 
-         force_to_sort hdb ~look_for_coercion
+         force_to_sort rdb 
            metasenv subst context1 t orig_t localise s2 in
        let metasenv, subst, s, t, ty = 
          sort_of_prod localise metasenv subst 
@@ -192,12 +192,12 @@ let rec typeof hdb
        let metasenv, subst, s, ty_s = 
          typeof_aux metasenv subst context None s in
        let metasenv, subst, s, _ = 
-         force_to_sort hdb ~look_for_coercion
+         force_to_sort rdb 
            metasenv subst context s orig_s localise ty_s in
        let (metasenv,subst), exp_ty_t = 
          match exp_s with 
          | Some exp_s -> 
-             (try NCicUnification.unify hdb metasenv subst context s exp_s,exp_ty_t
+             (try NCicUnification.unify rdb metasenv subst context s exp_s,exp_ty_t
              with exc -> raise (wrap_exc (lazy (localise orig_s, Printf.sprintf
                "Source type %s was expected to be %s" (NCicPp.ppterm ~metasenv
                ~subst ~context s) (NCicPp.ppterm ~metasenv ~subst ~context
@@ -217,7 +217,7 @@ let rec typeof hdb
        let metasenv, subst, ty, ty_ty = 
          typeof_aux metasenv subst context None ty in
        let metasenv, subst, ty, _ = 
-         force_to_sort hdb ~look_for_coercion
+         force_to_sort rdb
            metasenv subst context ty orig_ty localise ty_ty in
        let metasenv, subst, t, _ = 
          typeof_aux metasenv subst context (Some ty) t in
@@ -234,7 +234,7 @@ let rec typeof hdb
        let metasenv, subst, he, ty_he = 
          typeof_aux metasenv subst context None he in
        let metasenv, subst, t, ty = 
-         eat_prods hdb ~localise ~look_for_coercion 
+         eat_prods rdb ~localise
            metasenv subst context orig_he he ty_he args
        in
        let t = if upto > 0 then NCicReduction.head_beta_reduce ~upto t else t in
@@ -272,7 +272,7 @@ let rec typeof hdb
       let metasenv,metanoouttype,newouttype,metaoutsort =
        NCicMetaSubst.mk_meta metasenv context `Term in
       let metasenv,subst =
-       NCicUnification.unify hdb metasenv subst context outsort metaoutsort in
+       NCicUnification.unify rdb metasenv subst context outsort metaoutsort in
       let metasenv =
        List.filter (function (j,_) -> j <> metanoouttype) metasenv in
       let subst =
@@ -286,7 +286,7 @@ let rec typeof hdb
       let metasenv, subst, ind, ind_ty = 
         typeof_aux metasenv subst context None ind in
       let metasenv, subst = 
-         check_allowed_sort_elimination hdb localise r orig_term metasenv subst 
+         check_allowed_sort_elimination rdb localise r orig_term metasenv subst 
            context ind ind_ty outsort 
       in
       (* let's check if the type of branches are right *)
@@ -298,7 +298,7 @@ let rec typeof hdb
         match expty with
         | None -> metasenv, subst
         | Some expty -> 
-           NCicUnification.unify hdb metasenv subst context resty expty 
+           NCicUnification.unify rdb metasenv subst context resty expty 
       in
 *)
       let _, metasenv, subst, pl =
@@ -334,8 +334,8 @@ let rec typeof hdb
   in
     typeof_aux metasenv subst context expty term
 
-and try_coercions hdb 
-  ~localise ~look_for_coercion 
+and try_coercions rdb 
+  ~localise 
   metasenv subst context t orig_t infty expty perform_unification exc 
 =
   (* we try with a coercion *)
@@ -356,7 +356,7 @@ and try_coercions hdb
             NCicPp.ppterm ~metasenv ~subst ~context meta ^  " === " ^
             NCicPp.ppterm ~metasenv ~subst ~context t ^ "\n"));
         let metasenv, subst = 
-          NCicUnification.unify hdb metasenv subst context meta t
+          NCicUnification.unify rdb metasenv subst context meta t
         in
           pp (lazy ( "UNIFICATION in CTX:\n"^ 
             NCicPp.ppcontext ~metasenv ~subst context
@@ -367,7 +367,7 @@ and try_coercions hdb
             NCicPp.ppterm ~metasenv ~subst ~context expty ^ "\n"));
         let metasenv, subst = 
           if perform_unification then
-            NCicUnification.unify hdb metasenv subst context newtype expty
+            NCicUnification.unify rdb metasenv subst context newtype expty
           else metasenv, subst
         in
         metasenv, subst, newterm, newtype
@@ -376,11 +376,9 @@ and try_coercions hdb
       | NCicUnification.Uncertain _ as exc -> first exc tl
   in 
     first exc
-      (look_for_coercion metasenv subst context infty expty)
+      (NCicCoercion.look_for_coercion rdb metasenv subst context infty expty)
 
-and force_to_sort hdb 
-  ~look_for_coercion metasenv subst context t orig_t localise ty 
-=
+and force_to_sort rdb metasenv subst context t orig_t localise ty =
   match NCicReduction.whd ~subst context ty with
   | C.Meta (_,(0,(C.Irl 0 | C.Ctx []))) as ty -> 
      metasenv, subst, t, ty
@@ -396,7 +394,7 @@ and force_to_sort hdb
      metasenv, subst, t, C.Meta (newmeta,(0,C.Irl 0))
   | C.Sort _ as ty -> metasenv, subst, t, ty 
   | ty -> 
-      try_coercions hdb ~localise ~look_for_coercion metasenv subst context
+      try_coercions rdb ~localise metasenv subst context
         t orig_t ty (NCic.Sort (NCic.Type NCicEnvironment.type0)) false 
          (Uncertain (lazy (localise orig_t, 
          "The type of " ^ NCicPp.ppterm ~metasenv ~subst ~context t
@@ -438,8 +436,8 @@ and guess_name subst ctx ty =
       with NCicUtils.Subst_not_found _ -> aux 'M')
   | _ -> aux 'H' 
 
-and eat_prods hdb
-  ~localise ~look_for_coercion metasenv subst context orig_he he ty_he args 
+and eat_prods rdb
+  ~localise metasenv subst context orig_he he ty_he args 
 =
   (*D*)inside 'E'; try let rc = 
   let rec aux metasenv subst args_so_far he ty_he = function 
@@ -448,14 +446,14 @@ and eat_prods hdb
       match NCicReduction.whd ~subst context ty_he with 
       | C.Prod (_,s,t) ->
           let metasenv, subst, arg, _ = 
-            typeof hdb ~look_for_coercion ~localise 
+            typeof rdb ~localise 
               metasenv subst context arg (Some s) in
           let t = NCicSubstitution.subst ~avoid_beta_redexes:true arg t in
           aux metasenv subst (arg :: args_so_far) he t tl
       | C.Meta _
       | C.Appl (C.Meta _ :: _) as t ->
           let metasenv, subst, arg, ty_arg = 
-            typeof hdb ~look_for_coercion ~localise 
+            typeof rdb ~localise 
               metasenv subst context arg None in
           let name = guess_name subst context ty_arg in
           let metasenv, _, meta, _ = 
@@ -465,7 +463,7 @@ and eat_prods hdb
           let flex_prod = C.Prod (name, ty_arg, meta) in
           (* next line grants that ty_args is a type *)
           let metasenv,subst, flex_prod, _ =
-           typeof hdb ~look_for_coercion ~localise metasenv subst
+           typeof rdb ~localise metasenv subst
             context flex_prod None in
           pp (lazy ( "UNIFICATION in CTX:\n"^ 
             NCicPp.ppcontext ~metasenv ~subst context
@@ -473,7 +471,7 @@ and eat_prods hdb
             NCicPp.ppterm ~metasenv ~subst ~context t ^  " === " ^
             NCicPp.ppterm ~metasenv ~subst ~context flex_prod ^ "\n"));
           let metasenv, subst = 
-             try NCicUnification.unify hdb metasenv subst context t flex_prod 
+             try NCicUnification.unify rdb metasenv subst context t flex_prod 
              with exc -> raise (wrap_exc (lazy (localise orig_he, Printf.sprintf
               ("The term %s has an inferred type %s, but is applied to the" ^^
                " argument %s of type %s")
@@ -494,7 +492,7 @@ and eat_prods hdb
             (List.length args) (List.length args_so_far))))
       | ty ->
           let metasenv, subst, newhead, newheadty = 
-            try_coercions hdb ~localise ~look_for_coercion metasenv subst context
+            try_coercions rdb ~localise metasenv subst context
               (NCicUntrusted.mk_appl he (List.rev args_so_far)) orig_he ty
               (NCic.Prod ("_",NCic.Implicit `Term,NCic.Implicit `Term))
               false
@@ -557,18 +555,15 @@ let undebruijnate inductive ref t rev_fl =
 ;; 
 
 
-let typeof_obj hdb 
-  ?(localise=fun _ -> Stdpp.dummy_loc) 
-  ~look_for_coercion (uri,height,metasenv,subst,obj)
+let typeof_obj 
+  rdb ?(localise=fun _ -> Stdpp.dummy_loc) (uri,height,metasenv,subst,obj)
 = 
-prerr_endline ("===============\n" ^ NCicPp.ppobj (uri,height,metasenv,subst,obj));
   let check_type metasenv subst context (ty as orig_ty) =  (* XXX fattorizza *)
     let metasenv, subst, ty, sort = 
-      typeof hdb ~localise ~look_for_coercion metasenv subst context ty None
+      typeof rdb ~localise metasenv subst context ty None
     in
     let metasenv, subst, ty, sort = 
-      force_to_sort hdb ~look_for_coercion 
-        metasenv subst context ty orig_ty localise sort
+      force_to_sort rdb metasenv subst context ty orig_ty localise sort
     in
       metasenv, subst, ty, sort
   in
@@ -579,9 +574,7 @@ prerr_endline ("===============\n" ^ NCicPp.ppobj (uri,height,metasenv,subst,obj
          match bo with
          | Some bo ->
              let metasenv, subst, bo, ty = 
-               typeof hdb ~localise ~look_for_coercion 
-                 metasenv subst [] bo (Some ty)
-             in
+               typeof rdb ~localise metasenv subst [] bo (Some ty) in
              let height = (* XXX recalculate *) height in
                metasenv, subst, Some bo, ty, height
          | None -> metasenv, subst, None, ty, 0
@@ -594,7 +587,7 @@ prerr_endline ("===============\n" ^ NCicPp.ppobj (uri,height,metasenv,subst,obj
         List.fold_left
          (fun (types, metasenv, subst, fl) (relevance,name,k,ty,bo) ->
            let metasenv, subst, ty, _ = check_type metasenv subst [] ty in
-           let dbo = NCicTypeChecker.debruijn uri len [] bo in
+           let dbo = NCicTypeChecker.debruijn uri len [] ~subst bo in
            let localise = relocalise localise dbo bo in
             (name,C.Decl ty)::types,
               metasenv, subst, (relevance,name,k,ty,dbo,localise)::fl
@@ -604,8 +597,7 @@ prerr_endline ("===============\n" ^ NCicPp.ppobj (uri,height,metasenv,subst,obj
         List.fold_left 
           (fun (metasenv,subst,fl) (relevance,name,k,ty,dbo,localise) ->
             let metasenv, subst, dbo, ty = 
-              typeof hdb ~localise ~look_for_coercion 
-                metasenv subst types dbo (Some ty)
+              typeof rdb ~localise metasenv subst types dbo (Some ty)
             in
             metasenv, subst, (relevance,name,k,ty,dbo)::fl)
           (metasenv, subst, []) rev_fl
@@ -644,7 +636,7 @@ prerr_endline ("===============\n" ^ NCicPp.ppobj (uri,height,metasenv,subst,obj
 	     let k_relev =
               try snd (HExtlib.split_nth leftno k_relev)
               with Failure _ -> k_relev in
-             let te = NCicTypeChecker.debruijn uri len [] te in
+             let te = NCicTypeChecker.debruijn uri len [] ~subst te in
              let metasenv, subst, te, _ = check_type metasenv subst tys te in
              let context,te = NCicReduction.split_prods ~subst tys leftno te in
              let _,chopped_context_rev =
@@ -660,17 +652,17 @@ prerr_endline ("===============\n" ^ NCicPp.ppobj (uri,height,metasenv,subst,obj
                     match item1,item2 with
                       (n1,C.Decl ty1),(n2,C.Decl ty2) ->
                         if n1 = n2 then
-                         NCicUnification.unify hdb ~test_eq_only:true metasenv
+                         NCicUnification.unify rdb ~test_eq_only:true metasenv
                           subst context ty1 ty2,true
                         else
                          (metasenv,subst),false
                     | (n1,C.Def (bo1,ty1)),(n2,C.Def (bo2,ty2)) ->
                         if n1 = n2 then
                          let metasenv,subst =
-                          NCicUnification.unify hdb ~test_eq_only:true metasenv
+                          NCicUnification.unify rdb ~test_eq_only:true metasenv
                            subst context ty1 ty2
                          in
-                          NCicUnification.unify hdb ~test_eq_only:true metasenv
+                          NCicUnification.unify rdb ~test_eq_only:true metasenv
                            subst context bo1 bo2,true
                         else
                          (metasenv,subst),false
@@ -722,7 +714,8 @@ prerr_endline ("===============\n" ^ NCicPp.ppobj (uri,height,metasenv,subst,obj
                 raise
                   (RefineFailure
                     (lazy (localise te,
-                      "Non positive occurence in " ^ NUri.string_of_uri uri)))
+                      "Non positive occurence in " ^
+                        NCicPp.ppterm ~metasenv ~subst ~context te)))
               else
                let relsno = List.length itl + leftno in
                let te =