Merge pull request #50 from hackwaly/ocaml-5.1

Add OCaml 5.1 support

.github/workflows/ci.yml

@@ -15,6 +15,7 @@ jobs:
           - ubuntu-latest
           # - macos-latest
         ocaml-compiler:
+          - ocaml-base-compiler.5.1.0~rc1
           - 5.0.x
           - 4.14.x
           - 4.13.x

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Unreleased
 
+### Added
+
+* Add OCaml 5.1 support.
+
 ## 1.2.0 - 2023-07-11
 
 ### Added

dune-project

@@ -14,7 +14,7 @@
  (name earlybird)
  (synopsis "OCaml debug adapter")
  (depends
-  (ocaml (and (>= 4.12.0) (< 5.1)))
+  (ocaml (and (>= 4.12.0)))
   (ppx_deriving (>= 5.1))
   (ppx_deriving_yojson (>= 3.6.1))
   (menhir (and (>= 20201216) :build))

earlybird.opam

@@ -8,7 +8,7 @@ homepage: "https://github.com/hackwaly/ocamlearlybird"
 bug-reports: "https://github.com/hackwaly/ocamlearlybird/issues"
 depends: [
   "dune" {>= "2.8"}
-  "ocaml" {>= "4.12.0" & < "5.1"}
+  "ocaml" {>= "4.12.0"}
   "ppx_deriving" {>= "5.1"}
   "ppx_deriving_yojson" {>= "3.6.1"}
   "menhir" {>= "20201216" & build}

src/debugger/misc/util.ml

@@ -23,13 +23,17 @@ module Path = struct
       match path with
       | Pident id -> Ident.name id
       | Pdot (p, d) -> aux p ^ "." ^ d
+      | Pextra_ty (p, Pcstr_ty d) [@if ocaml_version >= (5, 1, 0)] -> aux p ^ "." ^ d
       | Papply (p1, p2) -> aux p1 ^ " (" ^ aux p2 ^ ")"
+      | Pextra_ty (p, Pext_ty) [@if ocaml_version >= (5, 1, 0)] -> aux p
     in
     aux path
 
   let rec to_longident path =
     match path with
     | Pident id -> Longident.Lident (Ident.name id)
     | Pdot (p, d) -> Longident.Ldot (to_longident p, d)
+    | Pextra_ty (p, Pcstr_ty d) [@if ocaml_version >= (5, 1, 0)] -> Longident.Ldot (to_longident p, d)
     | Papply (p1, p2) -> Longident.Lapply (to_longident p1, to_longident p2)
+    | Pextra_ty (p, Pext_ty) [@if ocaml_version >= (5, 1, 0)] -> to_longident p
 end