Misc: OCaml 4.04 as lower bound (#1124)

hhugo · web-flow · commit 11fd79a36cfd · 2021-08-30T10:57:00.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,8 +15,6 @@ jobs:
         os:
           - ubuntu-latest
         ocaml-compiler:
-          - 4.02.x
-          - 4.03.x
           - 4.04.x
           - 4.05.x
           - 4.06.x
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,7 @@
 ## Features/Changes
 * Compiler: add support for OCaml 4.13
 * Compiler: new tool to check for missing primitives
+* Compiler: drop support for OCaml 4.03 and bellow
 * Lib: add offsetX and offsetY to Dom_html.mouseEvent
 * Lib: add innerText property for Dom_html
 * Runtime: add dummy implementation for many dummy primitives
diff --git a/README.md b/README.md
@@ -96,8 +96,6 @@ comparison, and hashing functions can yield results different from usual:
 
 ## Toplevel
 
-- [OCaml 4.02.3](http://ocsigen.github.io/js_of_ocaml/toplevel.html#version=4.02.3)
-- [OCaml 4.03.0](http://ocsigen.github.io/js_of_ocaml/toplevel.html#version=4.03.0)
 - [OCaml 4.04.2](http://ocsigen.github.io/js_of_ocaml/toplevel.html#version=4.04.2)
   includes Base, Core_kernel, Async_kernel, Async_js
 - [OCaml 4.04.0+BER](http://ocsigen.github.io/js_of_ocaml/toplevel.html#version=4.04.0+BER)
diff --git a/compiler/lib/instr.ml b/compiler/lib/instr.ml
@@ -197,7 +197,7 @@ type desc =
 let ops =
   let if_v407 =
     match Ocaml_version.v with
-    | `V4_02 | `V4_03 | `V4_04 | `V4_06 -> fun _ -> K_will_not_happen
+    | `V4_04 | `V4_06 -> fun _ -> K_will_not_happen
     | `V4_07 | `V4_08 | `V4_09 | `V4_10 | `V4_11 | `V4_12 | `V4_13 -> fun k -> k
   in
   let instrs =
diff --git a/compiler/lib/magic_number.ml b/compiler/lib/magic_number.ml
@@ -66,7 +66,7 @@ let equal a b = compare a b = 0
 let current_exe =
   let v =
     match Ocaml_version.v with
-    | `V4_02 | `V4_03 | `V4_04 -> 11
+    | `V4_04 -> 11
     | `V4_06 -> 11
     | `V4_07 -> 23
     | `V4_08 -> 25
@@ -81,8 +81,7 @@ let current_exe =
 let current_cmo =
   let v =
     match Ocaml_version.v with
-    | `V4_02 -> 10
-    | `V4_03 | `V4_04 -> 11
+    | `V4_04 -> 11
     | `V4_06 -> 22
     | `V4_07 -> 23
     | `V4_08 -> 25
@@ -97,8 +96,7 @@ let current_cmo =
 let current_cma =
   let v =
     match Ocaml_version.v with
-    | `V4_02 -> 11
-    | `V4_03 | `V4_04 -> 12
+    | `V4_04 -> 12
     | `V4_06 -> 22
     | `V4_07 -> 23
     | `V4_08 -> 25
diff --git a/compiler/lib/ocaml_version.ml b/compiler/lib/ocaml_version.ml
@@ -65,10 +65,8 @@ let rec compare v v' =
       | n -> n)
 
 let v =
-  if compare current [ 4; 3 ] < 0
-  then `V4_02
-  else if compare current [ 4; 4 ] < 0
-  then `V4_03
+  if compare current [ 4; 4 ] < 0
+  then failwith "OCaml version unsupported"
   else if compare current [ 4; 6 ] < 0
   then `V4_04
   else if compare current [ 4; 7 ] < 0
diff --git a/compiler/lib/ocaml_version.mli b/compiler/lib/ocaml_version.mli
@@ -25,9 +25,7 @@ val compare : t -> t -> int
 val split : string -> t
 
 val v :
-  [ `V4_02 (* OCaml 4.02 *)
-  | `V4_03 (* OCaml 4.03 *)
-  | `V4_04 (* OCaml 4.04 / OCaml 4.05 *)
+  [ `V4_04 (* OCaml 4.04 / OCaml 4.05 *)
   | `V4_06 (* OCaml 4.06 *)
   | `V4_07 (* OCaml 4.07 *)
   | `V4_08 (* OCaml 4.08 *)
diff --git a/compiler/lib/parse_bytecode.ml b/compiler/lib/parse_bytecode.ml
@@ -750,8 +750,7 @@ let method_cache_id = ref 1
 
 let new_closure_repr =
   match Ocaml_version.v with
-  | `V4_02 | `V4_03 | `V4_04 | `V4_06 | `V4_07 | `V4_08 | `V4_09 | `V4_10 | `V4_11 ->
-      false
+  | `V4_04 | `V4_06 | `V4_07 | `V4_08 | `V4_09 | `V4_10 | `V4_11 -> false
   | `V4_12 | `V4_13 -> true
 
 let clo_offset_3 = if new_closure_repr then 3 else 2
@@ -2123,8 +2122,7 @@ let parse_bytecode code globals debug_data =
 let override_global =
   match Ocaml_version.v with
   | `V4_13 -> []
-  | `V4_02 | `V4_03 | `V4_04 | `V4_06 | `V4_07 | `V4_08 | `V4_09 | `V4_10 | `V4_11
-  | `V4_12 ->
+  | `V4_04 | `V4_06 | `V4_07 | `V4_08 | `V4_09 | `V4_10 | `V4_11 | `V4_12 ->
       let jsmodule name func =
         Prim (Extern "%overrideMod", [ Pc (String name); Pc (String func) ])
       in
diff --git a/compiler/tests-re/test_str.ml b/compiler/tests-re/test_str.ml
@@ -29,18 +29,7 @@ module Fmt = struct
 
   type 'a t = Format.formatter -> 'a -> unit
 
-  (* Only in the stdlib since 4.02, so we copy. *)
-  let rec list ?(pp_sep = pp_print_cut) pp ppf = function
-    | [] -> ()
-    | [v] -> pp ppf v
-    | v :: vs ->
-      pp ppf v;
-      pp_sep ppf ();
-      list ~pp_sep pp ppf vs
-
-  (* want this name to make sure we don't use pp_print_list from stdlib
-     accidentally *)
-  let pp_print_list = list
+  let list = pp_print_list
 
   let str = pp_print_string
   let sexp fmt s pp x = fprintf fmt "@[<3>(%s@ %a)@]" s pp x
diff --git a/dune-project b/dune-project
@@ -18,7 +18,7 @@
  (description
   "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. It makes it possible to run pure OCaml programs in JavaScript environment like browsers and Node.js")
  (depends
-  (ocaml (and (>= 4.02) (< 4.14)))
+  (ocaml (and (>= 4.04) (< 4.14)))
   (num :with-test)
   (ppx_expect (and (>= v0.12.0) :with-test))
   (ppxlib (>= 0.15.0))
@@ -41,7 +41,7 @@
  (description
   "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. It makes it possible to run pure OCaml programs in JavaScript environment like browsers and Node.js")
  (depends
-  (ocaml (>= 4.03))
+  (ocaml (>= 4.04))
   (js_of_ocaml (= :version))
   (js_of_ocaml-ppx (= :version))
   (lwt (>= 2.4.4))
@@ -60,7 +60,7 @@
  (description
   "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. It makes it possible to run pure OCaml programs in JavaScript environment like browsers and Node.js")
  (depends
-  (ocaml (>= 4.03))
+  (ocaml (>= 4.04))
   ocamlbuild
   (num :with-test)
   (ppx_expect :with-test)
@@ -88,7 +88,7 @@
  (description
   "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. It makes it possible to run pure OCaml programs in JavaScript environment like browsers and Node.js")
  (depends
-  (ocaml (>= 4.02))
+  (ocaml (>= 4.04))
   (js_of_ocaml (= :version))
   (ppxlib (>= 0.15.0))
   (num :with-test)
@@ -102,7 +102,7 @@
  (description
   "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. It makes it possible to run pure OCaml programs in JavaScript environment like browsers and Node.js")
  (depends
-  (ocaml (>= 4.02))
+  (ocaml (>= 4.04))
   (js_of_ocaml (= :version))
   (js_of_ocaml-compiler (= :version))
   (js_of_ocaml-ppx (= :version))
@@ -121,7 +121,7 @@
  (description
   "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. It makes it possible to run pure OCaml programs in JavaScript environment like browsers and Node.js")
  (depends
-  (ocaml (>= 4.02))
+  (ocaml (>= 4.04))
   (js_of_ocaml (= :version))
   (js_of_ocaml-ppx (= :version))
   (react (>= 1.2.1))
@@ -139,7 +139,7 @@
  (description
   "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. It makes it possible to run pure OCaml programs in JavaScript environment like browsers and Node.js")
  (depends
-  (ocaml (>= 4.02))
+  (ocaml (>= 4.04))
   (js_of_ocaml-compiler (= :version))
   (ppxlib (>= 0.15))
   uchar
diff --git a/dune-workspace.dev b/dune-workspace.dev
@@ -1,14 +1,16 @@
 (lang dune 1.11)
 ;; Install the following opam switches, copy this file as
-;; jbuild-workspace and run:
+;; dune-workspace and run:
 ;;
 ;; $ dune build @install
 ;;
 ;; This will build js_of_ocaml against all these version of OCaml
 
-(context (opam (switch 4.02.3)))
-(context (opam (switch 4.03.0)))
 (context (opam (switch 4.04.2)))
 (context (opam (switch 4.05.0)))
 (context (opam (switch 4.06.1)))
 (context (opam (switch 4.07.1)))
+(context (opam (switch 4.08.1)))
+(context (opam (switch 4.09.1)))
+(context (opam (switch 4.10.2)))
+(context (opam (switch 4.11.2)))
diff --git a/js_of_ocaml-compiler.opam b/js_of_ocaml-compiler.opam
@@ -10,7 +10,7 @@ doc: "https://ocsigen.github.io/js_of_ocaml"
 bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
 depends: [
   "dune" {>= "2.8"}
-  "ocaml" {>= "4.02" & < "4.14"}
+  "ocaml" {>= "4.04" & < "4.14"}
   "num" {with-test}
   "ppx_expect" {>= "v0.12.0" & with-test}
   "ppxlib" {>= "0.15.0"}
diff --git a/js_of_ocaml-lwt.opam b/js_of_ocaml-lwt.opam
@@ -10,7 +10,7 @@ doc: "https://ocsigen.github.io/js_of_ocaml"
 bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
 depends: [
   "dune" {>= "2.8"}
-  "ocaml" {>= "4.03"}
+  "ocaml" {>= "4.04"}
   "js_of_ocaml" {= version}
   "js_of_ocaml-ppx" {= version}
   "lwt" {>= "2.4.4"}
diff --git a/js_of_ocaml-ocamlbuild.opam b/js_of_ocaml-ocamlbuild.opam
@@ -10,7 +10,7 @@ doc: "https://ocsigen.github.io/js_of_ocaml"
 bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
 depends: [
   "dune" {>= "2.8"}
-  "ocaml" {>= "4.03"}
+  "ocaml" {>= "4.04"}
   "ocamlbuild"
   "num" {with-test}
   "ppx_expect" {with-test}
diff --git a/js_of_ocaml-ppx.opam b/js_of_ocaml-ppx.opam
@@ -10,7 +10,7 @@ doc: "https://ocsigen.github.io/js_of_ocaml"
 bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
 depends: [
   "dune" {>= "2.8"}
-  "ocaml" {>= "4.02"}
+  "ocaml" {>= "4.04"}
   "js_of_ocaml" {= version}
   "ppxlib" {>= "0.15.0"}
   "num" {with-test}
diff --git a/js_of_ocaml-toplevel.opam b/js_of_ocaml-toplevel.opam
@@ -10,7 +10,7 @@ doc: "https://ocsigen.github.io/js_of_ocaml"
 bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
 depends: [
   "dune" {>= "2.8"}
-  "ocaml" {>= "4.02"}
+  "ocaml" {>= "4.04"}
   "js_of_ocaml" {= version}
   "js_of_ocaml-compiler" {= version}
   "js_of_ocaml-ppx" {= version}
diff --git a/js_of_ocaml-tyxml.opam b/js_of_ocaml-tyxml.opam
@@ -10,7 +10,7 @@ doc: "https://ocsigen.github.io/js_of_ocaml"
 bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
 depends: [
   "dune" {>= "2.8"}
-  "ocaml" {>= "4.02"}
+  "ocaml" {>= "4.04"}
   "js_of_ocaml" {= version}
   "js_of_ocaml-ppx" {= version}
   "react" {>= "1.2.1"}
diff --git a/js_of_ocaml.opam b/js_of_ocaml.opam
@@ -10,7 +10,7 @@ doc: "https://ocsigen.github.io/js_of_ocaml"
 bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
 depends: [
   "dune" {>= "2.8"}
-  "ocaml" {>= "4.02"}
+  "ocaml" {>= "4.04"}
   "js_of_ocaml-compiler" {= version}
   "ppxlib" {>= "0.15"}
   "uchar"
diff --git a/manual/linker.wiki b/manual/linker.wiki
@@ -42,6 +42,6 @@ function primitive_name(..){
    the returned value of the primitive; when no annotation is provided,
    the linker assumes that the primitive may have side-effects.
  * **{{{//Requires}}}** is used if other primitives need to be loaded first
- * **version_constraint** looks like "{{{< 4.02.1}}}"
+ * **version_constraint** looks like "{{{< 4.07.0}}}"
  * **{{{//Version}}}** is optional and is rarely used
 All JavaScript code following a **{{{//Provides}}}** annotation is associated to this annotation, until the next **{{{//Provides}}}** annotation.
diff --git a/runtime/weak.js b/runtime/weak.js
@@ -20,15 +20,9 @@
 // Weak API, but without the weak semantics
 
 //Provides: caml_ephe_key_offset
-//Version: < 4.03
-var caml_ephe_key_offset = 2
-
-//Provides: caml_ephe_key_offset
-//Version: >= 4.03
 var caml_ephe_key_offset = 3
 
 //Provides: caml_ephe_data_offset
-//Version: >= 4.03
 var caml_ephe_data_offset = 2
 
 //Provides: caml_weak_create
@@ -122,15 +116,13 @@ function caml_ephe_unset_key(x, i) {
 
 //Provides: caml_ephe_blit_data
 //Requires: caml_ephe_data_offset
-//Version: >= 4.03
 function caml_ephe_blit_data(src, dst){
   dst[caml_ephe_data_offset] = src[caml_ephe_data_offset];
   return 0;
 }
 
 //Provides: caml_ephe_get_data
 //Requires: caml_ephe_data_offset
-//Version: >= 4.03
 function caml_ephe_get_data(x){
   if(x[caml_ephe_data_offset] === undefined)
     return 0;
@@ -141,7 +133,6 @@ function caml_ephe_get_data(x){
 //Provides: caml_ephe_get_data_copy
 //Requires: caml_ephe_data_offset
 //Requires: caml_obj_dup
-//Version: >= 4.03
 function caml_ephe_get_data_copy(x){
   if(x[caml_ephe_data_offset] === undefined)
     return 0;
@@ -151,23 +142,20 @@ function caml_ephe_get_data_copy(x){
 
 //Provides: caml_ephe_set_data
 //Requires: caml_ephe_data_offset
-//Version: >= 4.03
 function caml_ephe_set_data(x, data){
   x[caml_ephe_data_offset] = data;
   return 0;
 }
 
 //Provides: caml_ephe_unset_data
 //Requires: caml_ephe_data_offset
-//Version: >= 4.03
 function caml_ephe_unset_data(x, data){
   x[caml_ephe_data_offset] = undefined;
   return 0;
 }
 
 //Provides: caml_ephe_check_data
 //Requires: caml_ephe_data_offset
-//Version: >= 4.03
 function caml_ephe_check_data(x){
   if(x[caml_ephe_data_offset] === undefined)
     return 0;
