Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/trunk-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Install OCaml compiler
uses: ocaml/setup-ocaml@v3
with:
ocaml-compiler: 'ocaml-variants.5.4.0+trunk'
ocaml-compiler: 'ocaml-variants.5.5.0+trunk'
dune-cache: true
cache-prefix: ${{ steps.setup.outputs.cache_prefix }}

Expand Down
1 change: 1 addition & 0 deletions .ocamlformat-ignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ astlib/ast_501.ml
astlib/ast_502.ml
astlib/ast_503.ml
astlib/ast_504.ml
astlib/ast_505.ml

# Files that use cinaps to generate code blocks from other code blocks work well,
# but files that inject freely formatted code via cinaps must be excluded
Expand Down
1 change: 1 addition & 0 deletions ast/supported_version/supported_version.ml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ let all =
(5, 2);
(5, 3);
(5, 4);
(5, 5);
]

let to_string (a, b) =
Expand Down
10 changes: 10 additions & 0 deletions ast/versions.ml
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,13 @@ module OCaml_504 = struct
let string_version = "5.4"
end
let ocaml_504 : OCaml_504.types ocaml_version = (module OCaml_504)
module OCaml_505 = struct
module Ast = Astlib.Ast_505
include Make_witness(Astlib.Ast_505)
let version = 505
let string_version = "5.5"
end
let ocaml_505 : OCaml_505.types ocaml_version = (module OCaml_505)
(*$*)

let all_versions : (module OCaml_version) list = [
Expand All @@ -671,6 +678,7 @@ let all_versions : (module OCaml_version) list = [
(module OCaml_502 : OCaml_version);
(module OCaml_503 : OCaml_version);
(module OCaml_504 : OCaml_version);
(module OCaml_505 : OCaml_version);
(*$*)
]

Expand Down Expand Up @@ -701,6 +709,8 @@ include Register_migration(OCaml_502)(OCaml_503)
(Astlib.Migrate_502_503)(Astlib.Migrate_503_502)
include Register_migration(OCaml_503)(OCaml_504)
(Astlib.Migrate_503_504)(Astlib.Migrate_504_503)
include Register_migration(OCaml_504)(OCaml_505)
(Astlib.Migrate_504_505)(Astlib.Migrate_505_504)
(*$*)

module OCaml_current = OCaml_OCAML_VERSION
Expand Down
1 change: 1 addition & 0 deletions ast/versions.mli
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ module OCaml_501 : OCaml_version with module Ast = Astlib.Ast_501
module OCaml_502 : OCaml_version with module Ast = Astlib.Ast_502
module OCaml_503 : OCaml_version with module Ast = Astlib.Ast_503
module OCaml_504 : OCaml_version with module Ast = Astlib.Ast_504
module OCaml_505 : OCaml_version with module Ast = Astlib.Ast_505
(*$*)

(* An alias to the current compiler version *)
Expand Down
Loading
Loading