diff options
| author |  Emilio Jesus Gallego Arias <e+git@x80.org> | 2017-11-04 18:14:38 +0100 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias <e+git@x80.org> | 2017-11-04 19:24:01 +0100 |
| commit | c71e69a9be2094061e041d60614b090c8381f0b7 (patch) | |
| tree | f2a0a62a3c53102b8c222da494ee168bd610dc8a /library | |
| parent | f281a8a88e8fc7c41cc5680db2443d9da33b47b7 (diff) | |
[api] Deprecate all legacy uses of Name.Id in core.
This is a first step towards some of the solutions proposed in #6008.
Diffstat (limited to 'library')
| -rw-r--r-- | library/global.ml | 4 | ||||
| -rw-r--r-- | library/global.mli | 2 | ||||
| -rw-r--r-- | library/globnames.ml | 2 | ||||
| -rw-r--r-- | library/lib.ml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/library/global.ml b/library/global.ml index 963c97741..28b9e66f8 100644 --- a/library/global.ml +++ b/library/global.ml @@ -233,11 +233,11 @@ let universes_of_global gr = (** Global universe names *) type universe_names = - (polymorphic * Univ.universe_level) Idmap.t * Id.t Univ.LMap.t + (polymorphic * Univ.universe_level) Id.Map.t * Id.t Univ.LMap.t let global_universes = Summary.ref ~name:"Global universe names" - ((Idmap.empty, Univ.LMap.empty) : universe_names) + ((Id.Map.empty, Univ.LMap.empty) : universe_names) let global_universe_names () = !global_universes let set_global_universe_names s = global_universes := s diff --git a/library/global.mli b/library/global.mli index c777691d1..15bf58f82 100644 --- a/library/global.mli +++ b/library/global.mli @@ -104,7 +104,7 @@ val body_of_constant_body : Declarations.constant_body -> (Term.constr * Univ.AU (** Global universe name <-> level mapping *) type universe_names = - (Decl_kinds.polymorphic * Univ.universe_level) Idmap.t * Id.t Univ.LMap.t + (Decl_kinds.polymorphic * Univ.universe_level) Id.Map.t * Id.t Univ.LMap.t val global_universe_names : unit -> universe_names val set_global_universe_names : universe_names -> unit diff --git a/library/globnames.ml b/library/globnames.ml index dc9541a0d..5c75994dd 100644 --- a/library/globnames.ml +++ b/library/globnames.ml @@ -84,7 +84,7 @@ let is_global c t = | ConstRef c, Const (c', _) -> eq_constant c c' | IndRef i, Ind (i', _) -> eq_ind i i' | ConstructRef i, Construct (i', _) -> eq_constructor i i' - | VarRef id, Var id' -> id_eq id id' + | VarRef id, Var id' -> Id.equal id id' | _ -> false let printable_constr_of_global = function diff --git a/library/lib.ml b/library/lib.ml index 5418003eb..e95bb47f2 100644 --- a/library/lib.ml +++ b/library/lib.ml @@ -505,7 +505,7 @@ let variable_section_segment_of_reference = function let section_instance = function | VarRef id -> let eq = function - | Variable (id',_,_,_) -> Names.id_eq id id' + | Variable (id',_,_,_) -> Names.Id.equal id id' | Context _ -> false in if List.exists eq (pi1 (List.hd !sectab)) |