aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMaxime Dénès2017-07-26 15:13:18 +0200
committerMaxime Dénès2017-07-26 15:13:18 +0200
commit16c32cf04d0c220445f4a0e26c3230937a36f428 (patch)
treedf60cbc534b4ec0000b59c3f8c62724c3a0d725e /lib
parent1cabc2981659f8f55b482b4392bcac9b9d200aa9 (diff)
parent6466868d858c4a9a80e444463009fae869eeb950 (diff)
Merge PR #882: Adding a V8.7 compatibility version number.
Diffstat (limited to 'lib')
-rw-r--r--lib/flags.ml6
-rw-r--r--lib/flags.mli2
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/flags.ml b/lib/flags.ml
index 5d9d9dcf50..0bce22f584 100644
--- a/lib/flags.ml
+++ b/lib/flags.ml
@@ -106,7 +106,7 @@ let we_are_parsing = ref false
(* Current means no particular compatibility consideration.
For correct comparisons, this constructor should remain the last one. *)
-type compat_version = VOld | V8_5 | V8_6 | Current
+type compat_version = VOld | V8_5 | V8_6 | V8_7 | Current
let compat_version = ref Current
@@ -120,6 +120,9 @@ let version_compare v1 v2 = match v1, v2 with
| V8_6, V8_6 -> 0
| V8_6, _ -> -1
| _, V8_6 -> 1
+ | V8_7, V8_7 -> 0
+ | V8_7, _ -> -1
+ | _, V8_7 -> 1
| Current, Current -> 0
let version_strictly_greater v = version_compare !compat_version v > 0
@@ -129,6 +132,7 @@ let pr_version = function
| VOld -> "old"
| V8_5 -> "8.5"
| V8_6 -> "8.6"
+ | V8_7 -> "8.7"
| Current -> "current"
(* Translate *)
diff --git a/lib/flags.mli b/lib/flags.mli
index e63f1ec26d..eb4c37a548 100644
--- a/lib/flags.mli
+++ b/lib/flags.mli
@@ -77,7 +77,7 @@ val raw_print : bool ref
(* Univ print flag, never set anywere. Maybe should belong to Univ? *)
val univ_print : bool ref
-type compat_version = VOld | V8_5 | V8_6 | Current
+type compat_version = VOld | V8_5 | V8_6 | V8_7 | Current
val compat_version : compat_version ref
val version_compare : compat_version -> compat_version -> int
val version_strictly_greater : compat_version -> bool