require OCaml 4.08 (#2840)

* require OCaml 4.08

* ppxlib: upper bound

Author: anmonteiro

.github/workflows/opam-ci.yml

@@ -17,13 +17,11 @@ jobs:
       fail-fast: false
       matrix:
         setup:
-          - {ocaml-compiler: '4.06.x', os: ubuntu-latest}
           - {ocaml-compiler: '4.10.x', os: ubuntu-latest}
           - {ocaml-compiler: '4.12.x', os: ubuntu-latest}
           - {ocaml-compiler: '4.13.x', os: ubuntu-latest}
           - {ocaml-compiler: '4.14.x', os: ubuntu-latest}
           - {ocaml-compiler: 'ocaml-base-compiler.5.3.0~beta2', os: ubuntu-latest}
-          - {ocaml-compiler: '4.06.x', os: macos-13}
           - {ocaml-compiler: 'ocaml-base-compiler.5.3.0~beta2', os: macos-13}
           - {ocaml-compiler: 'ocaml-base-compiler.5.3.0~beta2', os: macos-14}
             # looks like setup-ocaml@v3 can only run actions on windows for

dune-project

@@ -33,7 +33,7 @@
  (depends
   (ocaml
    (and
-    (>= "4.06")
+    (>= "4.08")
     (< "5.4")))
   (ocamlfind :build)
   (dune-build-info
@@ -46,7 +46,9 @@
   ppx_derivers
   cppo
   (ppxlib
-   (>= "0.28.0"))))
+   (and
+    (>= "0.28.0")
+    (< "0.36.0")))))
 
 (package
  (name rtop)
@@ -56,7 +58,7 @@
  (depends
   (ocaml
    (and
-    (>= "4.06")
+    (>= "4.08")
     (< "5.4")))
   (reason
    (= :version))

flake.lock

@@ -16,15 +16,15 @@ homepage: "https://reasonml.github.io/"
 bug-reports: "https://github.com/reasonml/reason/issues"
 depends: [
   "dune" {>= "3.8"}
-  "ocaml" {>= "4.06" & < "5.4"}
+  "ocaml" {>= "4.08" & < "5.4"}
   "ocamlfind" {build}
   "dune-build-info" {>= "2.9.3"}
   "menhir" {>= "20180523"}
   "merlin-extend" {>= "0.6.2"}
   "fix"
   "ppx_derivers"
   "cppo"
-  "ppxlib" {>= "0.28.0"}
+  "ppxlib" {>= "0.28.0" & < "0.36.0"}
   "odoc" {with-doc}
 ]
 build: [

reason.opam

@@ -14,7 +14,7 @@ homepage: "https://reasonml.github.io/"
 bug-reports: "https://github.com/reasonml/reason/issues"
 depends: [
   "dune" {>= "3.8"}
-  "ocaml" {>= "4.06" & < "5.4"}
+  "ocaml" {>= "4.08" & < "5.4"}
   "reason" {= version}
   "utop" {>= "2.0"}
   "cppo"

rtop.opam

@@ -38,10 +38,7 @@ module Reason_reader = struct
     Reason_toolchain_conf.insert_completion_ident := Some pos;
     Misc.try_finally
       (fun () -> ({complete_labels = true}, parse t))
-#if OCAML_VERSION >= (4, 8, 0)
-      ~always:
-#endif
-      (fun () -> Reason_toolchain_conf.insert_completion_ident := pos')
+      ~always:(fun () -> Reason_toolchain_conf.insert_completion_ident := pos')
 
   let parse_line _ _ line =
     let buf = Lexing.from_string line in

src/reason-merlin/ocamlmerlin_reason.cppo.ml

@@ -43,18 +43,6 @@
    %{targets}
    (run ../menhir-recover/main.exe reason_parser.cmly))))
 
-(rule
- (targets reason_syntax_util.ml)
- (deps reason_syntax_util.cppo.ml)
- (action
-  (run %{bin:cppo} -V OCAML:%{ocaml_version} %{deps} -o %{targets})))
-
-(rule
- (targets reason_syntax_util.mli)
- (deps reason_syntax_util.cppo.mli)
- (action
-  (run %{bin:cppo} -V OCAML:%{ocaml_version} %{deps} -o %{targets})))
-
 (library
  (name reason)
  ; Uncomment to allow make coverage target to work

src/reason-parser/dune

@@ -443,7 +443,7 @@ let mk_record_expr ?loc (exten, fields) =
   | _ -> mkexp ?loc (Pexp_record (fields, exten))
 
 let array_function ?(loc=dummy_loc()) str name =
-  ghloc ~loc (Longident.Ldot(Lident str, (if !Clflags.fast then "unsafe_" ^ name else name)))
+  ghloc ~loc (Longident.Ldot(Lident str, (if !Clflags.unsafe then "unsafe_" ^ name else name)))
 
 let syntax_error loc s =
   raise_error (Other_syntax_error s) loc
@@ -665,7 +665,7 @@ let bigarray_function ?(loc=dummy_loc()) str name =
   ghloc ~loc (Longident.Ldot(Ldot(Lident "Bigarray", str), name))
 
 let bigarray_get ?(loc=dummy_loc()) arr arg =
-  let get = if !Clflags.fast then "unsafe_get" else "get" in
+  let get = if !Clflags.unsafe then "unsafe_get" else "get" in
   match arg with
     [c1] ->
       mkexp(Pexp_apply(mkexp ~ghost:true ~loc (Pexp_ident(bigarray_function ~loc "Array1" get)),
@@ -681,7 +681,7 @@ let bigarray_get ?(loc=dummy_loc()) arr arg =
                        [Nolabel, arr; Nolabel, mkexp ~ghost:true ~loc (Pexp_array coords)]))
 
 let bigarray_set ?(loc=dummy_loc()) arr arg newval =
-  let set = if !Clflags.fast then "unsafe_set" else "set" in
+  let set = if !Clflags.unsafe then "unsafe_set" else "set" in
   match arg with
     [c1] ->
       mkexp(Pexp_apply(mkexp ~ghost:true ~loc (Pexp_ident(bigarray_function ~loc "Array1" set)),