basic_rg: improved interface, unwind removed from applicability check

[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 4bf5882a4885a48cf53e1fc4af257e875820bc9e..cc9245f92f60b8558066d8399be456d11c5def44 100644 (file)
--- a/helm/software/lambda-delta/basic_rg/brgType.ml
+++ b/helm/software/lambda-delta/basic_rg/brgType.ml
@@ -20,8 +20,6 @@ module E = BrgEnvironment
 module S = BrgSubstitution
 module R = BrgReduction
 
-exception TypeError of B.message
-
 (* Internal functions *******************************************************)
 
 let level = 4
@@ -32,20 +30,11 @@ let log1 s c t =
 
 let error1 st c t =
    let sc = "In the context" in
-   raise (TypeError (L.ct_items1 sc c st t))
-
-let error3 c t1 t2 t3 =
-   let sc, st1, st2, st3 = 
-      "In the context", "the term", "is of type", "but must be of type"
-   in
-   raise (TypeError (L.ct_items3 sc c st1 t1 st2 t2 st3 t3))
+   raise (R.TypeError (L.ct_items1 sc c st t))
 
 (* Interface functions ******************************************************)
 
-let si = ref false
-
-let rec b_type_of f g c x = 
-(*   L.warn "Entering T.b_type_of"; *)
+let rec b_type_of f ~si g c x =
    log1 "Now checking" c x;
    match x with
    | B.Sort (a, h)           ->
@@ -76,53 +65,41 @@ let rec b_type_of f g c x =
       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) g cc t 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 vv = match xv with 
         | B.Cast _ -> f xv
-         | _        -> f (B.Cast ([], vv, xv))
+         | _        -> assert false (* f (B.Cast ([], vv, xv)) *)
       in
-      type_of f g c v
+      type_of f ~si g c 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) g cc t 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 g c u
+      type_of f ~si g c 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 g cc t in
+      let f cc = b_type_of f ~si g cc t in
       B.push f c a B.Void   
    | B.Appl (a, v, t)        ->
-      let f xv vv xt tt = function
-        | Some w -> 
-            L.box (succ level);
-           L.log O.specs (succ level) (L.t_items1 "Just scanned" c w);
-           L.unbox (succ level);
-           let f r =
-(*            L.warn (Printf.sprintf "Convertible: %b" a); *)
-              if r then f (A.sh2 v xv t xt x (B.appl a)) (B.appl a xv tt)
-              else error3 c xv vv w
-           in
-           R.are_convertible f ~si:!si c w vv
-        | None   -> 
-           error1 "not a function" c xt
+      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
       in
-      let f xv vv xt tt = R.domain (f xv vv xt tt) c tt in
-      let f xv vv = b_type_of (f xv vv) g c t in
-      type_of f g c v
+      let f xv vv = b_type_of (f xv vv) ~si g c t in
+      type_of f ~si g c v
    | B.Cast (a, u, t)        ->
-      let f xu xt tt r =  
-         (* L.warn (Printf.sprintf "Convertible: %b" a); *)
-        if r then f (A.sh2 u xu t xt x (B.cast a)) xu else error3 c xt tt xu
+      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
       in
-      let f xu xt tt = R.are_convertible ~si:!si (f xu xt tt) c xu tt in
-      let f xu _ = b_type_of (f xu) g c t in
-      type_of f g c u
+      let f xu _ = b_type_of (f xu) ~si g c t in
+      type_of f ~si g c u
 
-and type_of f g c x =
+and type_of f ?(si=false) g c x =
    let f t u = L.unbox level; f t u in
-   L.box level; b_type_of f g c x
+   L.box level; b_type_of f ~si g c x