txtLexer: bug fix in parsing the string tokens

[helm.git] / helm / software / lambda-delta / basic_ag / bagUntrusted.ml

diff --git a/helm/software/lambda-delta/basic_ag/bagUntrusted.ml b/helm/software/lambda-delta/basic_ag/bagUntrusted.ml
index e588caa496d3bf669bb8241b0ed1bef9fe8f150f..33d6a5fbd21985d776425272fd2848e0c8a209ed 100644 (file)
--- 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
@@ -17,16 +19,11 @@ module T = BagType
 (* Interface functions ******************************************************)
 
 (* to share *)
-let type_check f ?(si=false) 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
-      L.loc := a; T.type_of f ~si 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
-      L.loc := a; T.type_of f ~si g B.empty_context t
-   | Some (a, uri, B.Void)   ->
-      let f obj = f None (Some obj) in
-      L.loc := a; E.set_obj f (a, uri, B.Void)
+let type_check f st = 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 f st 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 st B.empty_lenv t
+   | _, _, Y.Void     -> assert false