- proper KAM with closures implemented for the brg kernel

[helm.git] / helm / software / lambda-delta / basic_rg / brgType.ml

diff --git a/helm/software/lambda-delta/basic_rg/brgType.ml b/helm/software/lambda-delta/basic_rg/brgType.ml
index cc9245f92f60b8558066d8399be456d11c5def44..bf067864714dea8c3127c2b4c07bdccd1b75b451 100644 (file)
--- a/helm/software/lambda-delta/basic_rg/brgType.ml
+++ b/helm/software/lambda-delta/basic_rg/brgType.ml
@@ -24,82 +24,79 @@ module R = BrgReduction
 
 let level = 4
 
-let log1 s c t =
-   let sc, st = s ^ " in the context", "the term" in
-   L.log O.specs level (L.ct_items1 sc c st t)
+let log1 s m t =
+   let s =  s ^ " the term" in
+   L.log O.specs level (R.message1 s m t) 
 
-let error1 st c t =
-   let sc = "In the context" in
-   raise (R.TypeError (L.ct_items1 sc c st t))
+let error1 s m t =
+   raise (R.TypeError (R.message1 s m t))
 
 (* Interface functions ******************************************************)
 
-let rec b_type_of f ~si g c x =
-   log1 "Now checking" c x;
+let rec b_type_of f ~si g m x =
+   log1 "Now checking" m x;
    match x with
    | B.Sort (a, h)           ->
       let f h = f x (B.Sort (a, h)) in H.apply f g h
    | B.LRef (_, i)           ->
       let f _ = function
-         | Some (_, B.Abst w)                  ->
+         | B.Abst w                  ->
            S.lift (f x) (succ i) (0) w
-        | Some (_, B.Abbr (B.Cast (_, w, _))) -> 
+        | B.Abbr (B.Cast (_, w, _)) -> 
            S.lift (f x) (succ i) (0) w
-        | Some (_, B.Abbr _)                  -> assert false
-        | Some (_, B.Void)                    -> 
-           error1 "reference to excluded variable" c x
-         | None                             ->
-           error1 "variable not found" c x      
+        | B.Abbr _                  -> assert false
+        | B.Void                    -> 
+           error1 "reference to excluded variable" m x
       in
-      B.get f c i
+      R.get f m i
    | B.GRef (_, uri)         ->
       let f = function
          | _, _, B.Abst w                  -> f x w
         | _, _, B.Abbr (B.Cast (_, w, _)) -> f x w
         | _, _, B.Abbr _                  -> assert false
         | _, _, B.Void                    ->
-           error1 "reference to excluded object" c x
+           error1 "reference to excluded object" m x
       in
       E.get_obj f uri   
    | B.Bind (a, B.Abbr v, t) ->
       let f xv xt tt =
          f (A.sh2 v xv t xt x (B.bind_abbr a)) (B.bind_abbr a xv tt)
       in
-      let f xv cc = b_type_of (f xv) ~si g cc t in
-      let f xv = B.push (f xv) c a (B.Abbr xv) in
+      let f xv m = b_type_of (f xv) ~si g m t in
+      let f xv = R.push (f xv) m a (B.Abbr xv) in
       let f xv vv = match xv with 
         | B.Cast _ -> f xv
-         | _        -> assert false (* f (B.Cast ([], vv, xv)) *)
+         | _        -> f (B.Cast ([], vv, xv))
       in
-      type_of f ~si g c v
+      type_of f ~si g m v
    | B.Bind (a, B.Abst u, t) ->
       let f xu xt tt =
         f (A.sh2 u xu t xt x (B.bind_abst a)) (B.bind_abst a xu tt)
       in
-      let f xu cc = b_type_of (f xu) ~si g cc t in
-      let f xu _ = B.push (f xu) c a (B.Abst xu) in
-      type_of f ~si g c u
+      let f xu m = b_type_of (f xu) ~si g m t in
+      let f xu _ = R.push (f xu) m a (B.Abst xu) in
+      type_of f ~si g m u
    | B.Bind (a, B.Void, t)   ->
       let f xt tt = 
          f (A.sh1 t xt x (B.bind a B.Void)) (B.bind a B.Void tt)
       in
-      let f cc = b_type_of f ~si g cc t in
-      B.push f c a B.Void   
+      let f m = b_type_of f ~si g m t in
+      R.push f m a B.Void   
    | B.Appl (a, v, t)        ->
       let f xv vv xt tt = 
          let f () = f (A.sh2 v xv t xt x (B.appl a)) (B.appl a xv tt) in
-         R.assert_conversion f ~si ~rt:true c tt vv xv
+         R.assert_conversion f ~si ~rt:true m tt vv xv
       in
-      let f xv vv = b_type_of (f xv vv) ~si g c t in
-      type_of f ~si g c v
+      let f xv vv = b_type_of (f xv vv) ~si g m t in
+      type_of f ~si g m v
    | B.Cast (a, u, t)        ->
       let f xu xt tt =  
         let f () = f (A.sh2 u xu t xt x (B.cast a)) xu in
-         R.assert_conversion f ~si c xu tt xt
+         R.assert_conversion f ~si m xu tt xt
       in
-      let f xu _ = b_type_of (f xu) ~si g c t in
-      type_of f ~si g c u
+      let f xu _ = b_type_of (f xu) ~si g m t in
+      type_of f ~si g m u
 
-and type_of f ?(si=false) g c x =
+and type_of f ?(si=false) g m x =
    let f t u = L.unbox level; f t u in
-   L.box level; b_type_of f ~si g c x
+   L.box level; b_type_of f ~si g m x