rewritten instantiate code

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

diff --git a/helm/software/lambda-delta/basic_ag/bag.ml b/helm/software/lambda-delta/basic_ag/bag.ml
index b04fc5ab6aa84edc4be107a60cb8dca852f0e7ab..79e7a042199597ff48f8d92a0806cff389f315a1 100644 (file)
--- a/helm/software/lambda-delta/basic_ag/bag.ml
+++ b/helm/software/lambda-delta/basic_ag/bag.ml
@@ -12,8 +12,8 @@
 (* kernel version: basic, absolute, global *)
 (* note          : experimental *) 
 
-type uri = NUri.uri
-type id = Aut.id
+type uri = Entity.uri
+type id = Entity.id
 
 type bind = Void         (* exclusion *)
           | Abst of term (* abstraction *)
@@ -22,17 +22,17 @@ type bind = Void         (* exclusion *)
 and term = Sort of int                    (* hierarchy index *)
          | LRef of int                    (* location *)
          | GRef of uri                    (* reference *)
-         | Cast of term * term            (* type, term *)
+         | Cast of term * term            (* domain, element *)
          | Appl of term * term            (* argument, function *)
          | Bind of int * id * bind * term (* location, name, binder, scope *)
 
-type obj = int * uri * bind (* age, uri, binder, contents *)
+type entry = bind Entity.entry (* age, uri, binder *)
 
-type item = obj option
+type entity = bind Entity.entity
 
-type context = (int * id * bind) list (* location, name, binder *) 
+type lenv = (int * id * bind) list (* location, name, binder *) 
 
-type message = (context, term) Log.item list
+type message = (lenv, term) Log.item list
 
 (* Currified constructors ***************************************************)
 
@@ -60,9 +60,9 @@ let new_location () = let loc = !location in incr location; loc
 
 let locations () = !location
 
-(* context handling functions ***********************************************)
+(* local environment handling functions *************************************)
 
-let empty_context = []
+let empty_lenv = []
 
 let push msg f es l id b =
    let rec does_not_occur loc = function