Code simplified.

[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 c9f425f88052975b2e1fd0eab1a76a4169d0944f..77098b84ef8df8b4f09b3c6c32a060ef8ec89531 100644 (file)
--- a/helm/software/lambda-delta/basic_rg/brgUntrusted.ml
+++ b/helm/software/lambda-delta/basic_rg/brgUntrusted.ml
@@ -9,15 +9,21 @@
      \ /   This software is distributed as is, NO WARRANTY.              
       V_______________________________________________________________ *)
 
+module U = NUri
+module L = Log
+module Y = Entity
+module B = Brg
 module E = BrgEnvironment
 module R = BrgReduction
 module T = BrgType
 
 (* Interface functions ******************************************************)
 
-let type_check f g = function
-   | None                       -> f None
-   | Some ((_, _, _, 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
+(* to share *)
+let type_check err f ?(si=false) g = function
+   | a, uri, Y.Abst t ->
+      let f xt tt = E.set_entity (f tt) (a, uri, Y.Abst xt) in
+      L.loc := U.string_of_uri uri; T.type_of err f ~si g R.empty_kam t
+   | a, uri, Y.Abbr t ->
+      let f xt tt = E.set_entity (f tt) (a, uri, Y.Abbr xt) in
+      L.loc := U.string_of_uri uri; T.type_of err f ~si g R.empty_kam t