diff options
| author | William Lawvere | 2017-06-13 22:22:36 -0700 |
|---|---|---|
| committer | William Lawvere | 2017-06-13 22:22:36 -0700 |
| commit | af39f62ad21f71a860e287e4d217b24dc9e2106b (patch) | |
| tree | 43c14ae184f24fffaf495dade6d27a1c2fac3e1a /kernel | |
| parent | 3b0830ce0233db5b612e0b5bb92e89fa644eb0e4 (diff) | |
| parent | 7e63c300a3aa1e3befb29bab9094e8b1939824bb (diff) | |
Merge remote-tracking branch 'upstream/trunk' into trunk
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cClosure.mli | 2 | ||||
| -rw-r--r-- | kernel/retroknowledge.ml | 2 | ||||
| -rw-r--r-- | kernel/term.ml | 3 | ||||
| -rw-r--r-- | kernel/term.mli | 5 |
4 files changed, 8 insertions, 4 deletions
diff --git a/kernel/cClosure.mli b/kernel/cClosure.mli index 077756ac74..69a5e79b45 100644 --- a/kernel/cClosure.mli +++ b/kernel/cClosure.mli @@ -187,7 +187,7 @@ val create_clos_infos : ?evars:(existential->constr option) -> reds -> env -> clos_infos val oracle_of_infos : clos_infos -> Conv_oracle.oracle -val env_of_infos : clos_infos -> env +val env_of_infos : 'a infos -> env val infos_with_reds : clos_infos -> reds -> clos_infos diff --git a/kernel/retroknowledge.ml b/kernel/retroknowledge.ml index 970bc0fcc5..ea53d00d7b 100644 --- a/kernel/retroknowledge.ml +++ b/kernel/retroknowledge.ml @@ -83,7 +83,7 @@ type flags = {fastcomputation : bool} (* The [proactive] knowledge contains the mapping [field->entry]. *) module Proactive = - Map.Make (struct type t = field let compare = compare end) + Map.Make (struct type t = field let compare = Pervasives.compare end) type proactive = entry Proactive.t diff --git a/kernel/term.ml b/kernel/term.ml index 07a85329ef..b90718358e 100644 --- a/kernel/term.ml +++ b/kernel/term.ml @@ -143,7 +143,8 @@ let leq_constr_univs = Constr.leq_constr_univs let eq_constr_nounivs = Constr.eq_constr_nounivs let kind_of_term = Constr.kind -let constr_ord = Constr.compare +let compare = Constr.compare +let constr_ord = compare let fold_constr = Constr.fold let map_puniverses = Constr.map_puniverses let map_constr = Constr.map diff --git a/kernel/term.mli b/kernel/term.mli index 241ef322fa..e729439f01 100644 --- a/kernel/term.mli +++ b/kernel/term.mli @@ -447,9 +447,12 @@ val eq_constr_nounivs : constr -> constr -> bool val kind_of_term : constr -> (constr, types, Sorts.t, Univ.Instance.t) kind_of_term (** Alias for [Constr.kind] *) -val constr_ord : constr -> constr -> int +val compare : constr -> constr -> int (** Alias for [Constr.compare] *) +val constr_ord : constr -> constr -> int +(** Alias for [Term.compare] *) + val fold_constr : ('a -> constr -> 'a) -> 'a -> constr -> 'a (** Alias for [Constr.fold] *) |