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 20b9a5cf1c64f0c8aaa6a6f1d0b5bcc927bc7273..4c1ae61dbc47cfd6cd40220d5832c4e95201f15e 100644 (file)
--- a/helm/software/lambda-delta/basic_rg/brgUntrusted.ml
+++ b/helm/software/lambda-delta/basic_rg/brgUntrusted.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 = Brg
 module E = BrgEnvironment
 module R = BrgReduction
@@ -18,16 +20,19 @@ module T = BrgType
 (* Interface functions ******************************************************)
 
 (* to share *)
-let type_check err f ?(si=false) g = function
-   | None                           -> f None None
-   | Some (e, uri, B.Abst (a, t))   ->
-      let f tt entry = f (Some tt) (Some entry) in
-      let f xt tt = E.set_entry (f tt) (e, uri, B.abst a xt) in
-      L.loc := e; T.type_of err f ~si g R.empty_kam t
-   | Some (e, uri, B.Abbr (a, t))   ->
-      let f tt entry = f (Some tt) (Some entry) in
-      let f xt tt = E.set_entry (f tt) (e, uri, B.abbr a xt) in
-      L.loc := e; T.type_of err f ~si g R.empty_kam t
-   | Some (e, uri, (B.Void _ as b)) ->
-      let f entry = f None (Some entry) in
-      L.loc := e; E.set_entry f (e, uri, b)
+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