aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorMatej Kosik2016-08-26 12:37:59 +0200
committerMatej Kosik2016-08-26 12:37:59 +0200
commitf45bbcf79018da0f52098ae284af73a5d38249c3 (patch)
tree151361459c0c58d41e5367ed2d4aec56aeb6e600 /engine
parented749e4fe3a32ecae145241f2ed9c9dd435c27d9 (diff)
CLEANUP: renaming "Context.ListNamed" module to "Context.Compacted"
Diffstat (limited to 'engine')
-rw-r--r--engine/termops.ml22
-rw-r--r--engine/termops.mli4
2 files changed, 13 insertions, 13 deletions
diff --git a/engine/termops.ml b/engine/termops.ml
index 3f36059dd8..1c2d261e51 100644
--- a/engine/termops.ml
+++ b/engine/termops.ml
@@ -17,7 +17,7 @@ open Environ
module RelDecl = Context.Rel.Declaration
module NamedDecl = Context.Named.Declaration
-module NamedListDecl = Context.NamedList.Declaration
+module CompactedDecl = Context.Compacted.Declaration
(* Sorts and sort family *)
@@ -986,21 +986,21 @@ let compact_named_context_reverse sign =
let compact l decl =
match decl, l with
| NamedDecl.LocalAssum (i,t), [] ->
- [NamedListDecl.LocalAssum ([i],t)]
+ [CompactedDecl.LocalAssum ([i],t)]
| NamedDecl.LocalDef (i,c,t), [] ->
- [NamedListDecl.LocalDef ([i],c,t)]
- | NamedDecl.LocalAssum (i1,t1), NamedListDecl.LocalAssum (li,t2) :: q ->
+ [CompactedDecl.LocalDef ([i],c,t)]
+ | NamedDecl.LocalAssum (i1,t1), CompactedDecl.LocalAssum (li,t2) :: q ->
if Constr.equal t1 t2
- then NamedListDecl.LocalAssum (i1::li, t2) :: q
- else NamedListDecl.LocalAssum ([i1],t1) :: NamedListDecl.LocalAssum (li,t2) :: q
- | NamedDecl.LocalDef (i1,c1,t1), NamedListDecl.LocalDef (li,c2,t2) :: q ->
+ then CompactedDecl.LocalAssum (i1::li, t2) :: q
+ else CompactedDecl.LocalAssum ([i1],t1) :: CompactedDecl.LocalAssum (li,t2) :: q
+ | NamedDecl.LocalDef (i1,c1,t1), CompactedDecl.LocalDef (li,c2,t2) :: q ->
if Constr.equal c1 c2 && Constr.equal t1 t2
- then NamedListDecl.LocalDef (i1::li, c2, t2) :: q
- else NamedListDecl.LocalDef ([i1],c1,t1) :: NamedListDecl.LocalDef (li,c2,t2) :: q
+ then CompactedDecl.LocalDef (i1::li, c2, t2) :: q
+ else CompactedDecl.LocalDef ([i1],c1,t1) :: CompactedDecl.LocalDef (li,c2,t2) :: q
| NamedDecl.LocalAssum (i,t), q ->
- NamedListDecl.LocalAssum ([i],t) :: q
+ CompactedDecl.LocalAssum ([i],t) :: q
| NamedDecl.LocalDef (i,c,t), q ->
- NamedListDecl.LocalDef ([i],c,t) :: q
+ CompactedDecl.LocalDef ([i],c,t) :: q
in
Context.Named.fold_inside compact ~init:[] sign
diff --git a/engine/termops.mli b/engine/termops.mli
index 5d85088f8d..bfd902f44a 100644
--- a/engine/termops.mli
+++ b/engine/termops.mli
@@ -238,8 +238,8 @@ val fold_named_context_both_sides :
('a -> Context.Named.Declaration.t -> Context.Named.Declaration.t list -> 'a) ->
Context.Named.t -> init:'a -> 'a
val mem_named_context : Id.t -> Context.Named.t -> bool
-val compact_named_context : Context.Named.t -> Context.NamedList.t
-val compact_named_context_reverse : Context.Named.t -> Context.NamedList.t
+val compact_named_context : Context.Named.t -> Context.Compacted.t
+val compact_named_context_reverse : Context.Named.t -> Context.Compacted.t
val clear_named_body : Id.t -> env -> env