From cf275d479ecdc3756a6185ca93dfa62eb357f7b2 Mon Sep 17 00:00:00 2001 From: Simmo Saan Date: Sun, 10 Nov 2024 11:15:28 +0200 Subject: [PATCH 1/4] Add Ctype.duplicate_type support in OCaml 5.3 --- src/debugger/inspect/ctype.ml | 5 +++++ src/debugger/inspect/value_scope.ml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 src/debugger/inspect/ctype.ml diff --git a/src/debugger/inspect/ctype.ml b/src/debugger/inspect/ctype.ml new file mode 100644 index 0000000..6e32c38 --- /dev/null +++ b/src/debugger/inspect/ctype.ml @@ -0,0 +1,5 @@ +include Ocaml_common.Ctype + +[%%if ocaml_version < (5, 3, 0)] +let duplicate_type = correct_levels +[%%endif] diff --git a/src/debugger/inspect/value_scope.ml b/src/debugger/inspect/value_scope.ml index 34436aa..177905c 100644 --- a/src/debugger/inspect/value_scope.ml +++ b/src/debugger/inspect/value_scope.ml @@ -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 From 9a1cb78eb3be79c56f722e1b07b0873283a6ec67 Mon Sep 17 00:00:00 2001 From: Simmo Saan Date: Sun, 10 Nov 2024 11:15:42 +0200 Subject: [PATCH 2/4] Add OCaml 5.3.0~beta1 to CI --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ef381d..d4e4208 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 From 1d7042a30a1d3ac59119b841d17150a02ca3aacc Mon Sep 17 00:00:00 2001 From: Simmo Saan Date: Sun, 10 Nov 2024 11:40:06 +0200 Subject: [PATCH 3/4] Fix branch name in workflow --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4e4208..0cb84fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,10 +3,10 @@ name: ci on: push: branches: - - main + - master pull_request: branches: - - main + - master workflow_dispatch: schedule: - cron: "0 5 * * *" From 8987cb941a962f161bc48c450c86436cfd7de44a Mon Sep 17 00:00:00 2001 From: Simmo Saan Date: Sun, 10 Nov 2024 11:41:31 +0200 Subject: [PATCH 4/4] Add OCaml 5.3 support to CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebb05f5..cede5c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.3.3 - 2024-11-10 + +### Added + +* Add OCaml 5.3 support (#73). + ## 1.3.2 - 2024-02-25 ### Added