X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Fbasic_ag%2FbagUntrusted.ml;h=8c6cbb47e1a1cddf55435b4fca9283c4080463b5;hb=ea41b1f6e212334924a8de4b2ff53b2586de9c4b;hp=ff5478d9f6e0c2499b96f67361fb8a8b5f6d7452;hpb=79684e8bd0f54b5c88fff981366bd8c78dd0fbe9;p=helm.git

diff --git a/helm/software/lambda-delta/basic_ag/bagUntrusted.ml b/helm/software/lambda-delta/basic_ag/bagUntrusted.ml
index ff5478d9f..8c6cbb47e 100644
--- a/helm/software/lambda-delta/basic_ag/bagUntrusted.ml
+++ b/helm/software/lambda-delta/basic_ag/bagUntrusted.ml
@@ -9,7 +9,9 @@
      \ /   This software is distributed as is, NO WARRANTY.              
       V_______________________________________________________________ *)
 
+module U = NUri
 module L = Log
+module Y = Entity
 module B = Bag
 module E = BagEnvironment
 module T = BagType
@@ -18,15 +20,10 @@ module T = BagType
 
 (* to share *)
 let type_check f ?(si=false) g = function
-   | None                    -> f None None
-   | Some (a, uri, B.Abst t) ->
-      let f tt entry = f (Some tt) (Some entry) in
-      let f xt tt = E.set_entry (f tt) (a, uri, B.Abst xt) in
-      L.loc := a; T.type_of f ~si g B.empty_lenv t
-   | Some (a, uri, B.Abbr t) ->
-      let f tt entry = f (Some tt) (Some entry) in
-      let f xt tt = E.set_entry (f tt) (a, uri, B.Abbr xt) in
-      L.loc := a; T.type_of f ~si g B.empty_lenv t
-   | Some (a, uri, B.Void)   ->
-      let f entry = f None (Some entry) in
-      L.loc := a; E.set_entry f (a, uri, B.Void)
+   | 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 f ~si g B.empty_lenv 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 f ~si g B.empty_lenv t
+   | _, _, Y.Void     -> assert false