X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Fbasic_rg%2FbrgUntrusted.ml;h=4c1ae61dbc47cfd6cd40220d5832c4e95201f15e;hb=2b1375e4b44e2ef351a6341a5bb0a4823e8daae5;hp=65735066ab9852025762acfff0da2eec8dd8f8ff;hpb=94c6cfe7e6b833190904c6b546668d716978a812;p=helm.git

diff --git a/helm/software/lambda-delta/basic_rg/brgUntrusted.ml b/helm/software/lambda-delta/basic_rg/brgUntrusted.ml
index 65735066a..4c1ae61db 100644
--- a/helm/software/lambda-delta/basic_rg/brgUntrusted.ml
+++ b/helm/software/lambda-delta/basic_rg/brgUntrusted.ml
@@ -9,24 +9,30 @@
      \ /   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 ******************************************************)
 
 (* to share *)
-let type_check f ?(si=false) g = function
-   | None                    -> f None None
-   | Some (e, uri, B.Abst t) ->
-      let f tt obj = f (Some tt) (Some obj) in
-      let f xt tt = E.set_obj (f tt) (e, uri, B.Abst xt) in
-      L.loc := e; T.type_of f ~si g B.empty_context t
-   | Some (e, uri, B.Abbr t) ->
-      let f tt obj = f (Some tt) (Some obj) in
-      let f xt tt = E.set_obj (f tt) (e, uri, B.Abbr xt) in
-      L.loc := e; T.type_of f ~si g B.empty_context t
-   | Some (e, uri, B.Void)   ->
-      let f obj = f None (Some obj) in
-      L.loc := e; E.set_obj f (e, uri, B.Void)
+let type_check err f st = function
+   | a, uri, Y.Abst t ->
+      let f xt tt = 
+         let e = E.set_entity (a, uri, Y.Abst xt) in f tt e
+      in
+      L.loc := U.string_of_uri uri; T.type_of err f st R.empty_kam t
+   | a, uri, Y.Abbr t ->
+      let f xt tt = 
+         let xt = match xt with
+	    | B.Cast _ -> xt
+	    | _        -> B.Cast ([], tt, xt)
+	 in
+         let e = E.set_entity (a, uri, Y.Abbr xt) in f tt e
+      in
+      L.loc := U.string_of_uri uri; T.type_of err f st R.empty_kam t
+   | _, _, Y.Void     -> assert false