Code made more uniform.

[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 3fa4568d1d21574de62884f771703a5b8cb8ab20..8a07f55a819fd4696ccfabd61f683c2c68f67c47 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 = Unit.uri
-type id = Unit.id
+type uri = Entity.uri
+type id = Entity.id
 
 type bind = Void         (* exclusion *)
           | Abst of term (* abstraction *)
@@ -22,18 +22,21 @@ 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 entry = bind Unit.entry (* age, uri, binder *)
-
-type unit = bind Unit.unit
+type entity = term Entity.entity (* attrs, uri, binder *)
 
 type lenv = (int * id * bind) list (* location, name, binder *) 
 
 type message = (lenv, term) Log.item list
 
+(* helpers ******************************************************************)
+
+let mk_uri root s =
+   String.concat "/" ["ld:"; "bag"; root; s ^ ".ld"]
+
 (* Currified constructors ***************************************************)
 
 let abst w = Abst w