basic_rg: reduction was not tail recursive by mistake

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

diff --git a/helm/software/lambda-delta/basic_ag/bagType.ml b/helm/software/lambda-delta/basic_ag/bagType.ml
index 02c831994775cf9bb43cbc7376098906eeeb1557..30d8ac48b17823b8929efbb85f062b26c6f5a6bf 100644 (file)
--- a/helm/software/lambda-delta/basic_ag/bagType.ml
+++ b/helm/software/lambda-delta/basic_ag/bagType.ml
@@ -13,6 +13,7 @@ module U = NUri
 module C = Cps
 module S = Share
 module L = Log
+module Y = Entity
 module H = Hierarchy
 module B = Bag
 module O = BagOutput
@@ -26,18 +27,18 @@ exception TypeError of B.message
 let level = 4
 
 let log1 s c t =
-   let sc, st = s ^ " in the context", "the term" in
-   L.log O.specs level (L.ct_items1 sc c st t)
+   let sc, st = s ^ " in the envireonment", "the term" in
+   L.log O.specs level (L.et_items1 sc c st t)
 
 let error1 st c t =
-   let sc = "In the context" in
-   raise (TypeError (L.ct_items1 sc c st t))
+   let sc = "In the envireonment" in
+   raise (TypeError (L.et_items1 sc c st t))
 
 let error3 c t1 t2 t3 =
    let sc, st1, st2, st3 = 
-      "In the context", "the term", "is of type", "but must be of type"
+      "In the envireonment", "the term", "is of type", "but must be of type"
    in
-   raise (TypeError (L.ct_items3 sc c st1 t1 st2 t2 st3 t3))
+   raise (TypeError (L.et_items3 sc c st1 t1 st2 t2 st3 t3))
 
 let mk_gref u l =
    let map t v = B.Appl (v, t) in
@@ -64,13 +65,12 @@ let rec b_type_of f ~si g c x =
       B.get f c i
    | B.GRef uri                  ->
       let f = function
-         | _, _, B.Abst w               -> f x w
-        | _, _, B.Abbr (B.Cast (w, v)) -> f x w
-        | _, _, B.Abbr _               -> assert false
-        | _, _, B.Void                 ->
-           error1 "reference to excluded object" c x
+         | _, _, Y.Abst w               -> f x w
+        | _, _, Y.Abbr (B.Cast (w, v)) -> f x w
+        | _, _, Y.Abbr _               -> assert false
+        | _, _, Y.Void                 -> assert false
       in
-      E.get_obj f uri   
+      E.get_entity f uri   
    | B.Bind (l, id, B.Abbr v, t) ->
       let f xv xt tt =
          f (S.sh2 v xv t xt x (B.bind_abbr l id)) (B.bind_abbr l id xv tt)