basic_rg: we improved the error reporting interface

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

diff --git a/helm/software/lambda-delta/basic_rg/brgUntrusted.ml b/helm/software/lambda-delta/basic_rg/brgUntrusted.ml
index d08209f120e28ad62a24242ca5c885335af24a8e..67c756b46b512fd8bc69bd84cdd06147416fb9dd 100644 (file)
--- a/helm/software/lambda-delta/basic_rg/brgUntrusted.ml
+++ b/helm/software/lambda-delta/basic_rg/brgUntrusted.ml
@@ -9,6 +9,7 @@
      \ /   This software is distributed as is, NO WARRANTY.              
       V_______________________________________________________________ *)
 
+module L = Log
 module B = Brg
 module E = BrgEnvironment
 module R = BrgReduction
@@ -16,11 +17,17 @@ module T = BrgType
 
 (* Interface functions ******************************************************)
 
-let type_check f g = function
-   | None                           -> f None
-   | Some ((_, _, B.Abst t) as obj)
-   | Some ((_, _, B.Abbr t) as obj) ->
-       let f tt obj = f (Some (tt, obj)) in
-       let f tt = E.set_obj (f tt) obj in
-       T.type_of f g R.empty_context t
-   | Some (_, _, B.Void)            -> assert false
+(* to share *)
+let type_check f ?(si=false) g = function
+   | None                           -> f None None
+   | Some (e, uri, B.Abst (a, t))   ->
+      let f tt obj = f (Some tt) (Some obj) in
+      let f xt tt = E.set_obj (f tt) (e, uri, B.abst a xt) in
+      L.loc := e; T.type_of f ~si g R.empty_machine t
+   | Some (e, uri, B.Abbr (a, t))   ->
+      let f tt obj = f (Some tt) (Some obj) in
+      let f xt tt = E.set_obj (f tt) (e, uri, B.abbr a xt) in
+      L.loc := e; T.type_of f ~si g R.empty_machine t
+   | Some (e, uri, (B.Void _ as b)) ->
+      let f obj = f None (Some obj) in
+      L.loc := e; E.set_obj f (e, uri, b)