some renaming. final commit for version 0.8.0

[helm.git] / helm / software / lambda-delta / basic_rg / brgReduction.ml

diff --git a/helm/software/lambda-delta/basic_rg/brgReduction.ml b/helm/software/lambda-delta/basic_rg/brgReduction.ml
index 08630cde61865bb923944a09fd8f6d309def6fd2..e6ea501423b65792c82c084c3c3bc696cc01f521 100644 (file)
--- a/helm/software/lambda-delta/basic_rg/brgReduction.ml
+++ b/helm/software/lambda-delta/basic_rg/brgReduction.ml
@@ -18,25 +18,23 @@ module B = Brg
 module O = BrgOutput
 module E = BrgEnvironment
 
-type machine = {
-   c: B.context;
-   s: (B.context * B.term) list;
+type kam = {
+   c: B.lenv;
+   s: (B.lenv * B.term) list;
    i: int
 }
 
-type message = (machine, B.term) Log.item list
-
 (* Internal functions *******************************************************)
 
 let level = 5
 
 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 environment", "the term" in
+   L.log O.specs level (L.et_items1 sc c st t)
 
 let log2 s cu u ct t =
-   let s1, s2, s3 = s ^ " in the context", "the term", "and in the context" in
-   L.log O.specs level (L.ct_items2 s1 cu s2 u ~sc2:s3 ~c2:ct s2 t)
+   let s1, s2, s3 = s ^ " in the environment", "the term", "and in the environment" in
+   L.log O.specs level (L.et_items2 s1 cu s2 u ~sc2:s3 ~c2:ct s2 t)
 
 let are_alpha_convertible err f t1 t2 =
    let rec aux f = function
@@ -80,7 +78,7 @@ let rec step f ?(delta=false) ?(rt=false) m x =
         | e, _, b                        ->
            f m (Some (e, b)) x
       in
-      E.get_obj C.err f uri
+      E.get_entry C.err f uri
    | B.LRef (_, i)             ->
       let f c = function
         | B.Abbr (_, v)         ->
@@ -178,8 +176,8 @@ and ac_stacks err f m1 m2 =
 
 (* Interface functions ******************************************************)
 
-let empty_machine = { 
-   c = B.empty_context; s = []; i = 0
+let empty_kam = { 
+   c = B.empty_lenv; s = []; i = 0
 }
 
 let get err f m i =
@@ -202,8 +200,8 @@ let are_convertible err f ?(si=false) mu u mw w =
 
 let pp_term m frm t = O.specs.L.pp_term m.c frm t
 
-let pp_context frm m = O.specs.L.pp_context frm m.c
+let pp_lenv frm m = O.specs.L.pp_lenv frm m.c
 
 let specs = {
-   L.pp_term = pp_term; L.pp_context = pp_context
+   L.pp_term = pp_term; L.pp_lenv = pp_lenv
 }