X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Fbasic_rg%2FbrgUntrusted.ml;h=77098b84ef8df8b4f09b3c6c32a060ef8ec89531;hb=f00757144b2cd7e6457fed55dbc1309d11a542dc;hp=d08209f120e28ad62a24242ca5c885335af24a8e;hpb=8659e85d49be1ad72622d4d3a73d384b744c3c08;p=helm.git

diff --git a/helm/software/lambda-delta/basic_rg/brgUntrusted.ml b/helm/software/lambda-delta/basic_rg/brgUntrusted.ml
index d08209f12..77098b84e 100644
--- a/helm/software/lambda-delta/basic_rg/brgUntrusted.ml
+++ b/helm/software/lambda-delta/basic_rg/brgUntrusted.ml
@@ -9,6 +9,9 @@
      \ /   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
@@ -16,11 +19,11 @@ 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 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