fix code to use stdcompat

aryx · Apr 19, 2024 · eb4a150 · eb4a150
1 parent fae014b
commit eb4a150
Show file tree

Hide file tree

Showing 27 changed files with 32 additions and 5 deletions.
diff --git a/.github/workflows/build-and-test.jsonnet b/.github/workflows/build-and-test.jsonnet
@@ -22,11 +22,14 @@ local job = {
 	//TODO: 'windows-latest'
 	],
       'ocaml-compiler': [
-	// Old version with |> builtin but ideally we would like even before
+	// Version that I ported ocamlrun to plan9 (need stdcompat
+	// so we can use |> and bytes type without issues)
+	'3.10.0',
+	// Old version with |> builtin
 	'4.02.1',
 	// first version with valid ocamlformat
 	'4.04.1',
-	//TODO: 3.10.0, but pb with |> 
+	//TODO: Ideally 4.14.1 and ocaml latest (5.2.0)
 	],
     }
   },

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -20,6 +20,7 @@ jobs:
     strategy:
       matrix:
         ocaml-compiler:
+          - 3.10.0
           - 4.02.1
           - 4.04.1
         os:

diff --git a/bootstrap-mk.sh b/bootstrap-mk.sh
@@ -28,7 +28,7 @@ EXTERNAL_LIB=`ocamlfind query stdcompat`
 OCAMLCFLAGS="-I $EXTERNAL_LIB"
 
 #TODO? for windows under cygwin might need -custom
-EXTRALINKFLAGS=
+EXTRALINKFLAGS="-I $EXTERNAL_LIB stdcompat.cma"
 
 TOP=`pwd`
 

diff --git a/lib_core/commons/IO.ml b/lib_core/commons/IO.ml
@@ -16,6 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *)
+open Stdcompat (* for bytes *)
 
 (*****************************************************************************)
 (* Prelude *)

diff --git a/lib_core/commons/IO.mli b/lib_core/commons/IO.mli
@@ -17,6 +17,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *)
+open Stdcompat (* for bytes type *)
 
 (** High-order abstract I/O.
 

diff --git a/lib_core/commons/common.ml b/lib_core/commons/common.ml
@@ -1,9 +1,10 @@
 (* Copyright 2015, 2016, 2017 Yoann Padioleau, see copyright.txt *)
+open Stdcompat (* for |> *)
 
 type byte = char
 
-type bytes = string
 (* builtin since OCaml 4.02 (bytes are mutable strings) *)
+(* type bytes = string *)
 
 type filename = string
 type dirname = string

diff --git a/lib_core/commons/common.mli b/lib_core/commons/common.mli
@@ -1,6 +1,6 @@
 
 type byte = char
-type bytes = string
+(* type bytes = string *)
 
 type filename = string
 type dirname = string

diff --git a/lib_core/commons/ocaml.ml b/lib_core/commons/ocaml.ml
@@ -20,6 +20,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *)
+open Stdcompat (* for |> *)
 open Common
 
 (*****************************************************************************)

diff --git a/mk/env.ml b/mk/env.ml
@@ -1,4 +1,5 @@
 (* Copyright 2016 Yoann Padioleau, see copyright.txt *)
+open Stdcompat (* for |> *)
 open Common
 
 (*****************************************************************************)

diff --git a/mk/eval.ml b/mk/eval.ml
@@ -1,4 +1,5 @@
 (* Copyright 2016 Yoann Padioleau, see copyright.txt *)
+open Stdcompat (* for |> *)
 open Common
 
 module A = Ast

diff --git a/mk/graph.ml b/mk/graph.ml
@@ -1,4 +1,5 @@
 (* Copyright 2016 Yoann Padioleau, see copyright.txt *)
+open Stdcompat (* for |> *)
 open Common
 
 module A = Ast

diff --git a/mk/main.ml b/mk/main.ml
@@ -1,4 +1,5 @@
 (* Copyright 2016, 2018 Yoann Padioleau, see copyright.txt *)
+open Stdcompat (* for |> *)
 open Common
 
 module G = Graph

diff --git a/mk/outofdate.ml b/mk/outofdate.ml
@@ -1,4 +1,5 @@
 (* Copyright 2016 Yoann Padioleau, see copyright.txt *)
+open Stdcompat (* for |> *)
 open Common
 
 module G = Graph

diff --git a/mk/parse.ml b/mk/parse.ml
@@ -1,4 +1,5 @@
 (* Copyright 2016 Yoann Padioleau, see copyright.txt *)
+open Stdcompat (* for |> *)
 open Common
 
 let parse file =

diff --git a/mk/parser.mly b/mk/parser.mly
@@ -1,5 +1,6 @@
 %{
 (* Copyright 2016 Yoann Padioleau, see copyright.txt *)
+open Stdcompat (* for |> *)
 open Common
 
 open Ast

diff --git a/mk/percent.ml b/mk/percent.ml
@@ -1,4 +1,5 @@
 (* Copyright 2016 Yoann Padioleau, see copyright.txt *)
+open Stdcompat (* for |> *)
 open Common
 
 (*****************************************************************************)

diff --git a/mk/scheduler.ml b/mk/scheduler.ml
@@ -1,4 +1,5 @@
 (* Copyright 2016 Yoann Padioleau, see copyright.txt *)
+open Stdcompat (* for |> *)
 open Common
 
 module J = Job

diff --git a/mk/shell.ml b/mk/shell.ml
@@ -1,4 +1,5 @@
 (* Copyright 2016, 2018 Yoann Padioleau, see copyright.txt *)
+open Stdcompat (* for |> *)
 open Common
 
 (*****************************************************************************)

diff --git a/mk/shellenv.ml b/mk/shellenv.ml
@@ -1,4 +1,5 @@
 (* Copyright 2016 Yoann Padioleau, see copyright.txt *)
+open Stdcompat (* for |> *)
 open Common
 
 type t = (string * string list) list

diff --git a/shell/compile.ml b/shell/compile.ml
@@ -1,3 +1,4 @@
+open Stdcompat (* for |> *)
 open Common
 
 module A = Ast

diff --git a/shell/interpreter.ml b/shell/interpreter.ml
@@ -1,3 +1,4 @@
+open Stdcompat (* for |> *)
 open Common
 
 module O = Opcode

diff --git a/shell/main.ml b/shell/main.ml
@@ -1,4 +1,5 @@
 (* Copyright 2016 Yoann Padioleau, see copyright.txt *)
+open Stdcompat (* for |> *)
 open Common
 
 module R = Runtime

diff --git a/shell/op_process.ml b/shell/op_process.ml
@@ -1,3 +1,4 @@
+open Stdcompat (* for |> *)
 open Common
 
 module R = Runtime

diff --git a/shell/parse.ml b/shell/parse.ml
@@ -1,4 +1,5 @@
 (* Copyright 2016 Yoann Padioleau, see copyright.txt *)
+open Stdcompat (* for |> *)
 open Common
 
 module R = Runtime

diff --git a/shell/parser.mly b/shell/parser.mly
@@ -1,5 +1,6 @@
 %{
 (* Copyright 2016 Yoann Padioleau, see copyright.txt *)
+open Stdcompat (* for |> *)
 open Common
 
 open Ast

diff --git a/shell/process.ml b/shell/process.ml
@@ -1,3 +1,4 @@
+open Stdcompat (* for |> *)
 open Common
 
 module R = Runtime

diff --git a/shell/runtime.ml b/shell/runtime.ml
@@ -1,3 +1,4 @@
+open Stdcompat (* for |> *)
 open Common
 
 (*****************************************************************************)