Skip to content

Commit ae26aec

Browse files
committed
Switch to MetaOCaml N153 (5.3.0+BER)
1 parent 5180539 commit ae26aec

5 files changed

Lines changed: 12 additions & 8 deletions

File tree

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
ocaml-compiler: [ 'ocaml-variants.4.11.1+BER', 'ocaml-variants.4.14.1+BER' ]
16+
ocaml-compiler: [ 'ocaml-variants.5.3.0+BER']
1717
os: [ubuntu-latest]
1818
steps:
1919
- uses: actions/checkout@v2
20-
- uses: ocaml/setup-ocaml@v2
20+
- uses: ocaml/setup-ocaml@v3
2121
with:
2222
ocaml-compiler: ${{ matrix.ocaml-compiler }}
2323
- run: opam install . --with-test

Changes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
## frex 0.1.1
22

3+
Support only BER N153
4+
5+
## frex 0.1.1
6+
37
Add support for BER N111
48

59
## frex 0.1

lib/aux.ml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ let cd_of_var : 'a. 'a var -> 'a code =
5353
module Var (A: sig type t end) : Setoid with type t = A.t var =
5454
struct
5555
type t = A.t var
56-
let compare (Var (_, l)) (Var (_, r)) = Pervasives.compare l r
56+
let compare (Var (_, l)) (Var (_, r)) = Stdlib.compare l r
5757
end
5858

5959
(** Bags *)
@@ -88,13 +88,13 @@ struct
8888

8989
let (<*>) n xs = M.map (fun k -> n * k) xs
9090

91-
let compare = M.compare Pervasives.compare
91+
let compare = M.compare Stdlib.compare
9292
end
9393

9494
module Int =
9595
struct
9696
type t = int
97-
let compare = Pervasives.compare
97+
let compare = Stdlib.compare
9898

9999
let (<+>) = ( + )
100100
let (<*>) = ( * )

myocamlbuild.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ dispatch begin
77
begin match Sys.ocaml_version with
88
| "4.02.1+dev0-2014-08-29" | "4.04.0" ->
99
flag ["ocaml"; "compile"; "open_print_code"] & S[A"-open"; A"Print_code"]
10-
| "4.07.1" | "4.11.1" | "4.14.1" ->
10+
| "4.07.1" | "4.11.1" | "4.14.1" | "5.3.0" ->
1111
flag ["ocaml"; "compile"; "open_print_code"] & S[A"-open"; A"Codelib"]
1212
| version ->
13-
Printf.kprintf failwith "Unsupported OCaml version %s" version
13+
Printf.ksprintf failwith "Unsupported OCaml version %s" version
1414
end
1515
| _ -> ()
1616
end;;

opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ depends: [
1818
"ocamlfind" {build}
1919
"ocamlbuild" {build}
2020
"ocaml-variants"
21-
{= "4.02.1+modular-implicits-ber" | = "4.07.1+BER" | = "4.04.0+BER" | = "4.11.1+BER" | = "4.14.1+BER" }
21+
{= "5.3.0+BER"}
2222
]

0 commit comments

Comments
 (0)