Merge pull request #457 from anmonteiro/anmonteiro/5.3-support

support OCaml 5.3

lib/top/compat_top.ml

@@ -96,7 +96,9 @@ let extension_constructor
   ; ext_private
   ; ext_loc
   ; ext_attributes
-#if OCAML_VERSION >= (4, 11, 0)
+#if OCAML_VERSION >= (5, 3, 0)
+  ; ext_uid = Uid.mk ~current_unit:None
+#elif OCAML_VERSION >= (4, 11, 0)
   ; ext_uid = Uid.mk ~current_unit:"mdx"
 #endif
   }

mdx.opam

@@ -28,7 +28,7 @@ depends: [
   "logs" {>= "0.7.0"}
   "cmdliner" {>= "1.1.0"}
   "re" {>= "1.7.2"}
-  "ocaml-version" {>= "3.6.5"}
+  "ocaml-version" {>= "2.3.0"}
   "lwt" {with-test}
   "camlp-streams"
   "result"

test/bin/mdx-test/expect/errors/test-case.md

@@ -64,10 +64,18 @@ first
 Exception: Failure "second".
 ```
 
-```ocaml version>=4.08
+```ocaml version>=4.08,version<5.3
 # let x =
   1 + "42";;
 Line 2, characters 7-11:
 Error: This expression has type string but an expression was expected of type
          int
 ```
+
+```ocaml version>=5.3
+# let x =
+  1 + "42";;
+Line 2, characters 7-11:
+Error: This constant has type string but an expression was expected of type
+         int
+```

test/bin/mdx-test/expect/lines/test-case.md

@@ -56,7 +56,7 @@ Error: This expression has type string but an expression was expected of type
          int
 ```
 
-```ocaml version>=4.08
+```ocaml version>=4.08,version<5.3
 # let f x = function
   | 0 -> 1
   | n ->
@@ -66,6 +66,16 @@ Error: This expression has type string but an expression was expected of type
          int
 ```
 
+```ocaml version>=5.3
+# let f x = function
+  | 0 -> 1
+  | n ->
+  n + "foo";;
+Line 4, characters 7-12:
+Error: This constant has type string but an expression was expected of type
+         int
+```
+
 Line directives work for `sh` blocks as well:
 
 ```sh version=4.08.1

test/bin/mdx-test/expect/mlt/test-case.md

@@ -30,7 +30,7 @@ Error: This expression has type string but an expression was expected of type
          int
 ```
 
-```ocaml version>=4.08
+```ocaml version>=4.08,version<5.3
 # #require "fmt";;
 # let x = 3;;
 val x : int = 3
@@ -39,3 +39,13 @@ Line 1, characters 5-10:
 Error: This expression has type string but an expression was expected of type
          int
 ```
+
+```ocaml version>=5.3
+# #require "fmt";;
+# let x = 3;;
+val x : int = 3
+# x + "foo";;
+Line 1, characters 5-10:
+Error: This constant has type string but an expression was expected of type
+         int
+```

test/bin/mdx-test/expect/simple-mld/test-case.mld

@@ -59,11 +59,20 @@ Indentation test:
   val x : int = 1
 ]}
 
-{delim@ocaml[
+{delim@ocaml version<5.3[
   let f = 1 + "2"
 ]delim[
 {err@mdx-error[
 Line 1, characters 15-18:
 Error: This expression has type string but an expression was expected of type
          int
 ]err}]}
+
+{delim@ocaml version>=5.3[
+  let f = 1 + "2"
+]delim[
+{err@mdx-error[
+Line 1, characters 15-18:
+Error: This constant has type string but an expression was expected of type
+         int
+]err}]}

test/bin/mdx-test/expect/simple-mli/test-case.mli

@@ -51,7 +51,7 @@ val bar : string
 val baz : string
 
 (**
-{[
+{@ocaml version<5.3[
   let f = 1 + "2"
 ][
 {err@mdx-error[
@@ -61,6 +61,17 @@ Error: This expression has type string but an expression was expected of type
 ]err}]}
 *)
 
+(**
+{@ocaml version>=5.3[
+  let f = 1 + "2"
+][
+{err@mdx-error[
+Line 1, characters 15-18:
+Error: This constant has type string but an expression was expected of type
+         int
+]err}]}
+*)
+
 (**
 {@ocaml skip[
   let f = 1 + "2"