Merge pull request #26 from ManuelLerchner/ocaml-5.3.0

Update to Ocaml 5.3.0

Author: ManuelLerchner

.github/workflows/odoc.yml

@@ -15,10 +15,10 @@ jobs:
       - name: Checkout tree
         uses: actions/checkout@v4
 
-      - name: Set-up OCaml 5.1.1
+      - name: Set-up OCaml 5.3.0
         uses: ocaml/setup-ocaml@v2
         with:
-          ocaml-compiler: "5.1.1"
+          ocaml-compiler: "5.3.0"
           # disable cache, otherwise generated documentation is missing files
           dune-cache: false
 

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
         os:
           - ubuntu-latest
         ocaml-compiler:
-          - "5.1.1"
+          - "5.3.0"
 
     runs-on: ${{ matrix.os }}
 

README.md

@@ -6,7 +6,7 @@ The LP framework was presented at the OCaml Users and Developers Workshop 2023.
 
 ## Install
 
-The framework is currently fixed to OCaml 5.1.1. Hence, from an OCaml 5.1.1. switch, LP can be installed using opam:
+The framework is currently fixed to OCaml 5.3.0. Hence, from an OCaml 5.3.0. switch, LP can be installed using opam:
 
 ```sh
 opam pin add less-power https://github.com/just-max/less-power.git#main

dune-project

@@ -14,16 +14,16 @@
    "\| and at scale.
  )
  (depends
-  (ocaml (= 5.1.1))
+  (ocaml (= 5.3.0))
   (xmlm (and (>= 1.4) (< 1.5)))
   (fileutils (and (>= 0.6) (< 0.7)))
   (qcheck-core (and (>= 0.21) (< 0.22)))
   (ounit2 (and (>= 2.2) (< 2.3)))
   (junit (and (>= 2.0) (< 2.1)))
   (mtime (and (>= 2.0) (< 2.1)))
   (fmt (and (>= 0.9) (< 0.10)))
-  (ppxlib (and (>= 0.30) (< 0.31)))
-  (ocaml-compiler-libs (and (>= v0.12) (< v0.13)))
+  (ppxlib (and (>= 0.36) (< 0.37)))
+  (ocaml-compiler-libs (and (>= v0.17) (< v0.18)))
   (cmdliner (and (>= 1.2) (< 1.3)))
  )
 )

less-power.opam

@@ -13,16 +13,16 @@ homepage: "https://github.com/just-max/less-power"
 bug-reports: "https://github.com/just-max/less-power/issues"
 depends: [
   "dune" {>= "3.0"}
-  "ocaml" {= "5.1.1"}
+  "ocaml" {= "5.3.0"}
   "xmlm" {>= "1.4" & < "1.5"}
   "fileutils" {>= "0.6" & < "0.7"}
   "qcheck-core" {>= "0.21" & < "0.22"}
   "ounit2" {>= "2.2" & < "2.3"}
   "junit" {>= "2.0" & < "2.1"}
   "mtime" {>= "2.0" & < "2.1"}
   "fmt" {>= "0.9" & < "0.10"}
-  "ppxlib" {>= "0.30" & < "0.31"}
-  "ocaml-compiler-libs" {>= "v0.12" & < "v0.13"}
+  "ppxlib" {>= "0.36" & < "0.37"}
+  "ocaml-compiler-libs" {>= "v0.17" & < "v0.18"}
   "cmdliner" {>= "1.2" & < "1.3"}
   "odoc" {with-doc}
 ]

src/ast-check/ast_check.ml

@@ -73,6 +73,15 @@ let pp_violation_message : violation Fmt.t = fun fmt vio ->
     (pp_of pp_flow Feature.to_message) vio.feature
     Fmt.(option (cut ++ pp_flow)) vio.message
 
+(* Create a duplicate of pp_violation_message that uses a Format_doc.formatter instead of a Format.formatter. 
+I'm not sure if this is the best way to do this, but it seems to work. *)
+let pp_violation_message_doc = fun fmt vio ->
+  let buffer = Buffer.create 256 in
+  let formatter = Format.formatter_of_buffer buffer in
+  pp_violation_message formatter vio;
+  Format.pp_print_flush formatter ();
+  Ocaml_common.Format_doc.pp_print_text fmt (Buffer.contents buffer)
+    
 let violation location ?message feature = { location ; message; feature }
 let violation1 location ?message feature = [violation location ?message feature]
 
@@ -281,7 +290,7 @@ let pp_violation ppf vio =
     loc_ghost = vio.location.Ppxlib.Location.loc_ghost;
   }
   in
-  let report = errorf ~loc "%a" pp_violation_message vio in
+  let report = errorf ~loc "%a" pp_violation_message_doc vio in
   print_report ppf report
 
 (* TODO: drop file_violations, path_violations, and pp_violation,

src/stdlib-variants/dune

@@ -1 +1,5 @@
-(documentation)
+(library
+ (name stdlib_variants)
+ (public_name less-power.stdlib-variants)
+
+ (libraries common stdlib_components stdlib_alerts std_overrides))

src/stdlib-variants/stdlib-alerts/stdlib_alerts.ml

@@ -105,6 +105,8 @@ module type Printexc_alerting = sig
     line_number : int;
     start_char : int;
     end_char : int;
+    end_line : int;
+    end_col : int;
   }
 
   (* only to_string_default can be expected to be pure, not to_string *)

src/stdlib-variants/stdlib-components/signatures/sig_seq.ml

@@ -8,9 +8,9 @@ module type SafeSeq = sig
   val uncons : 'a t -> ('a * 'a t) option
   val length : 'a t -> int
   val iter : ('a -> unit) -> 'a t -> unit
-  val fold_left : ('a -> 'b -> 'a) -> 'a -> 'b t -> 'a
+  val fold_left : ('acc -> 'a -> 'acc) -> 'acc -> 'a t -> 'acc
   val iteri : (int -> 'a -> unit) -> 'a t -> unit
-  val fold_lefti : ('b -> int -> 'a -> 'b) -> 'b -> 'a t -> 'b
+  val fold_lefti : ('acc -> int -> 'a -> 'acc) -> 'acc -> 'a t -> 'acc
   val for_all : ('a -> bool) -> 'a t -> bool
   val exists : ('a -> bool) -> 'a t -> bool
   val find : ('a -> bool) -> 'a t -> 'a option

src/stdlib-variants/stdlib-components/stdlib_aliases.ml

@@ -25,6 +25,7 @@ module SafeAliases = struct
   (* module Digest         = Digest *)
   (* module Domain         = Domain *)
   (* module Effect         = Effect *)
+  (* module Dynarray       = Dynarray *)
   module Either         = Either
   (* module Ephemeron      = Ephemeron *)
   (* module Filename       = Filename *)