diff options
| author |  Matej Kosik <matej.kosik@inria.fr> | 2016-08-14 18:36:30 +0200 |
|---|---|---|
| committer | Matej Kosik <matej.kosik@inria.fr> | 2016-08-25 07:53:02 +0200 |
| commit | 4688a3b9750827eb0f5f61066ca617efcd97bc8c (patch) | |
| tree | 33289dff2847f51ef99f7711bee7624ca80a9341 /kernel | |
| parent | 16ecabd99d66b3068e17fae486ba4ed77954e813 (diff) | |
CLEANUP: functions "Context.{Rel,Named}.Context.fold" were renamed to "Context.{Rel,Named}.fold_constr"
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/context.ml | 4 | ||||
| -rw-r--r-- | kernel/context.mli | 4 | ||||
| -rw-r--r-- | kernel/environ.ml | 2 | ||||
| -rw-r--r-- | kernel/term_typing.ml | 3 |
4 files changed, 7 insertions, 6 deletions
diff --git a/kernel/context.ml b/kernel/context.ml index 43be9fc4f..4c88283ca 100644 --- a/kernel/context.ml +++ b/kernel/context.ml @@ -138,7 +138,7 @@ struct | LocalDef (_,v,ty) -> f v; f ty (** Reduce all terms in a given declaration to a single value. *) - let fold f decl acc = + let fold_constr f decl acc = match decl with | LocalAssum (n,ty) -> f ty acc | LocalDef (n,v,ty) -> f ty (f v acc) @@ -333,7 +333,7 @@ struct | LocalDef (_, v, ty) -> f v; f ty (** Reduce all terms in a given declaration to a single value. *) - let fold f decl a = + let fold_constr f decl a = match decl with | LocalAssum (_, ty) -> f ty a | LocalDef (_, v, ty) -> a |> f v |> f ty diff --git a/kernel/context.mli b/kernel/context.mli index 7c652ac5c..8ed09794b 100644 --- a/kernel/context.mli +++ b/kernel/context.mli @@ -79,7 +79,7 @@ sig val iter_constr : (Constr.t -> unit) -> t -> unit (** Reduce all terms in a given declaration to a single value. *) - val fold : (Constr.t -> 'a -> 'a) -> t -> 'a -> 'a + val fold_constr : (Constr.t -> 'a -> 'a) -> t -> 'a -> 'a val to_tuple : t -> Name.t * Constr.t option * Constr.t end @@ -192,7 +192,7 @@ sig val iter_constr : (Constr.t -> unit) -> t -> unit (** Reduce all terms in a given declaration to a single value. *) - val fold : (Constr.t -> 'a -> 'a) -> t -> 'a -> 'a + val fold_constr : (Constr.t -> 'a -> 'a) -> t -> 'a -> 'a val to_tuple : t -> Id.t * Constr.t option * Constr.t val of_tuple : Id.t * Constr.t option * Constr.t -> t diff --git a/kernel/environ.ml b/kernel/environ.ml index 7351a87d4..8a147a659 100644 --- a/kernel/environ.ml +++ b/kernel/environ.ml @@ -416,7 +416,7 @@ let global_vars_set env constr = Id.Set.union (vars_of_global env c) acc | _ -> acc in - fold_constr filtrec acc c + Term.fold_constr filtrec acc c in filtrec Id.Set.empty constr diff --git a/kernel/term_typing.ml b/kernel/term_typing.ml index e59a17d12..8db65e33c 100644 --- a/kernel/term_typing.ml +++ b/kernel/term_typing.ml @@ -22,6 +22,7 @@ open Entries open Typeops open Fast_typeops +module RelDecl = Context.Rel.Declaration module NamedDecl = Context.Named.Declaration let constrain_type env j poly subst = function @@ -251,7 +252,7 @@ let global_vars_set_constant_type env = function | RegularArity t -> global_vars_set env t | TemplateArity (ctx,_) -> Context.Rel.fold_outside - (Context.Rel.Declaration.fold + (RelDecl.fold_constr (fun t c -> Id.Set.union (global_vars_set env t) c)) ctx ~init:Id.Set.empty |