X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Flambda-delta%2Fbasic_ag%2Fbag.ml;h=32a9b0c5b983b2361b5495776d6de7575935717e;hb=8a4c83c6341976f2bb70eb44a0c70f2aa95ad3ea;hp=b04fc5ab6aa84edc4be107a60cb8dca852f0e7ab;hpb=dcdee4ca839dac671924a95f0ada71faf06a8be4;p=helm.git diff --git a/helm/software/lambda-delta/basic_ag/bag.ml b/helm/software/lambda-delta/basic_ag/bag.ml index b04fc5ab6..32a9b0c5b 100644 --- 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 = Item.uri +type id = Item.id type bind = Void (* exclusion *) | Abst of term (* abstraction *) @@ -26,13 +26,13 @@ and term = Sort of int (* hierarchy index *) | 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 obj = bind Item.obj (* age, uri, binder *) -type item = obj option +type item = bind Item.item -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