aboutsummaryrefslogtreecommitdiff
path: root/pretyping/evd.mli
diff options
context:
space:
mode:
authorppedrot2013-08-04 02:49:19 +0000
committerppedrot2013-08-04 02:49:19 +0000
commit9fd3b0c4f47fd83ce2ded3864fe2074463151aca (patch)
treee3d069d06f09fd563509d553717d73ff197171d2 /pretyping/evd.mli
parent368120a7e16f6088ff73865ca561ce3a798f8724 (diff)
Removing now useless merging primitives from Evd.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16658 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'pretyping/evd.mli')
-rw-r--r--pretyping/evd.mli5
1 files changed, 0 insertions, 5 deletions
diff --git a/pretyping/evd.mli b/pretyping/evd.mli
index d3155201de..f29a676c6b 100644
--- a/pretyping/evd.mli
+++ b/pretyping/evd.mli
@@ -144,7 +144,6 @@ val undefined_list : evar_map -> (evar * evar_info) list
val to_list : evar_map -> (evar * evar_info) list
val fold : (evar -> evar_info -> 'a -> 'a) -> evar_map -> 'a -> 'a
val fold_undefined : (evar -> evar_info -> 'a -> 'a) -> evar_map -> 'a -> 'a
-val merge : evar_map -> evar_map -> evar_map
val define : evar -> constr -> evar_map -> evar_map
val is_evar : evar_map -> evar -> bool
@@ -183,10 +182,6 @@ val evar_declare :
?filter:bool list -> ?candidates:constr list -> evar_map -> evar_map
val evar_source : existential_key -> evar_map -> Evar_kinds.t located
-(* spiwack: this function seems to somewhat break the abstraction.
- [evar_merge evd ev1] extends the evars of [evd] with [evd1] *)
-val evar_merge : evar_map -> evar_map -> evar_map
-
(** Unification constraints *)
type conv_pb = Reduction.conv_pb
type evar_constraint = conv_pb * env * constr * constr