txtLexer: bug fix in parsing the string tokens

[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 d08209f120e28ad62a24242ca5c885335af24a8e..4c1ae61dbc47cfd6cd40220d5832c4e95201f15e 100644 (file)
--- 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,20 @@ 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 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