Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add OCaml 5.3 support #73

Merged
merged 4 commits into from
Nov 10, 2024
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
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: ci
on:
push:
branches:
- main
- master
pull_request:
branches:
- main
- master
workflow_dispatch:
schedule:
- cron: "0 5 * * *"
Expand All @@ -21,6 +21,7 @@ jobs:
- ubuntu-latest
- macos-latest
ocaml-compiler:
- ocaml-base-compiler.5.3.0~beta1
- 5.2.x
- 5.1.x
- 5.0.x
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 1.3.3 - 2024-11-10

### Added

* Add OCaml 5.3 support (#73).

## 1.3.2 - 2024-02-25

### Added
Expand Down
5 changes: 5 additions & 0 deletions src/debugger/inspect/ctype.ml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
include Ocaml_common.Ctype

[%%if ocaml_version < (5, 3, 0)]
let duplicate_type = correct_levels
[%%endif]
2 changes: 1 addition & 1 deletion src/debugger/inspect/value_scope.ml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class local_scope_value ~scene ~frame ~kind () =
match typenv |> Typenv.find_value (Path.Pident id) with
| exception Not_found -> None
| { val_type; val_kind; _ } ->
let ty = Ctype.correct_levels val_type in
let ty = Ctype.duplicate_type val_type in
Some (Ident.name id, val_kind, ty, pos))
|> Array.of_seq,
match (frame.index, event.ev_kind) with
Expand Down