new macro screenshot

[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 96be162172c8a1b7ee7b1ae7d596c8d730f45d69..20b9a5cf1c64f0c8aaa6a6f1d0b5bcc927bc7273 100644 (file)
--- a/helm/software/lambda-delta/basic_rg/brgUntrusted.ml
+++ b/helm/software/lambda-delta/basic_rg/brgUntrusted.ml
@@ -9,23 +9,25 @@
      \ /   This software is distributed as is, NO WARRANTY.              
       V_______________________________________________________________ *)
 
+module L = Log
 module B = Brg
 module E = BrgEnvironment
+module R = BrgReduction
 module T = BrgType
 
 (* Interface functions ******************************************************)
 
 (* to share *)
-let type_check f g = function
-   | None                    -> f None None
-   | Some (a, uri, B.Abst t) ->
-      let f tt obj = f (Some tt) (Some obj) in
-      let f xt tt = E.set_obj (f tt) (a, uri, B.Abst xt) in
-      T.type_of f g B.empty_context t
-   | Some (a, uri, B.Abbr t) ->
-      let f tt obj = f (Some tt) (Some obj) in
-      let f xt tt = E.set_obj (f tt) (a, uri, B.Abbr xt) in
-      T.type_of f g B.empty_context t
-   | Some (a, uri, B.Void)   ->
-      let f obj = f None (Some obj) in
-      E.set_obj f (a, uri, B.Void)
+let type_check err f ?(si=false) g = function
+   | None                           -> f None None
+   | Some (e, uri, B.Abst (a, t))   ->
+      let f tt entry = f (Some tt) (Some entry) in
+      let f xt tt = E.set_entry (f tt) (e, uri, B.abst a xt) in
+      L.loc := e; T.type_of err f ~si g R.empty_kam t
+   | Some (e, uri, B.Abbr (a, t))   ->
+      let f tt entry = f (Some tt) (Some entry) in
+      let f xt tt = E.set_entry (f tt) (e, uri, B.abbr a xt) in
+      L.loc := e; T.type_of err f ~si g R.empty_kam t
+   | Some (e, uri, (B.Void _ as b)) ->
+      let f entry = f None (Some entry) in
+      L.loc := e; E.set_entry f (e, uri, b)