Ppxlib.0.26.0 compatibility (#110)

ocaml-community · Mar 29, 2022 · e35a026 · e35a026
1 parent b44bbaf
commit e35a026
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/sedlex.opam b/sedlex.opam
@@ -18,7 +18,7 @@ bug-reports: "https://github.com/ocaml-community/sedlex/issues"
 depends: [
   "ocaml" {>= "4.04"}
   "dune" {>= "2.8"}
-  "ppxlib" {>= "0.18.0"}
+  "ppxlib" {>= "0.26.0"}
   "gen"
   "uchar"
   "odoc" {with-doc}

diff --git a/src/lib/dune b/src/lib/dune
@@ -2,5 +2,5 @@
  (name sedlex)
  (public_name sedlex)
  (wrapped false)
- (libraries gen uchar)
+ (libraries gen)
  (flags :standard -w +A-4-9 -safe-string))
diff --git a/src/syntax/ppx_sedlex.ml b/src/syntax/ppx_sedlex.ml
@@ -284,13 +284,13 @@ let regexp_of_pattern env =
         List.fold_left (fun r p -> Sedlex.seq r (aux p))
           (aux p)
           pl
-    | Ppat_construct ({txt = Lident "Star"}, Some p) ->
+    | Ppat_construct ({txt = Lident "Star"}, Some (_, p)) ->
         Sedlex.rep (aux p)
-    | Ppat_construct ({txt = Lident "Plus"}, Some p) ->
+    | Ppat_construct ({txt = Lident "Plus"}, Some (_, p)) ->
         Sedlex.plus (aux p)
     | Ppat_construct
         ({txt = Lident "Rep"},
-         Some {ppat_desc=Ppat_tuple[p0; {ppat_desc=Ppat_constant (i1 as i2)|Ppat_interval(i1, i2)}]}) ->
+         Some (_, {ppat_desc=Ppat_tuple[p0; {ppat_desc=Ppat_constant (i1 as i2)|Ppat_interval(i1, i2)}]})) ->
          begin match i1, i2 with
          | Pconst_integer(i1,_), Pconst_integer(i2,_) ->
              let i1 = int_of_string i1 in
@@ -302,11 +302,11 @@ let regexp_of_pattern env =
          end
     | Ppat_construct ({txt = Lident "Rep"}, _) ->
         err p.ppat_loc "the Rep operator takes 2 arguments"
-    | Ppat_construct ({txt = Lident "Opt"}, Some p) ->
+    | Ppat_construct ({txt = Lident "Opt"}, Some (_, p)) ->
         Sedlex.alt Sedlex.eps (aux p)
     | Ppat_construct ({txt = Lident "Compl"}, arg) ->
         begin match arg with
-        | Some p0 ->
+        | Some (_, p0) ->
             begin match Sedlex.compl (aux p0) with
             | Some r -> r
             | None ->
@@ -316,12 +316,12 @@ let regexp_of_pattern env =
         | _ -> err p.ppat_loc "the Compl operator requires an argument"
         end
     | Ppat_construct ({ txt = Lident "Sub" }, arg) ->
-        char_pair_op Sedlex.subtract "Sub" p arg
+        char_pair_op Sedlex.subtract "Sub" p (Option.map (fun (_, arg) -> arg) arg)
     | Ppat_construct ({ txt = Lident "Intersect" }, arg) ->
-        char_pair_op Sedlex.intersection "Intersect" p arg
+        char_pair_op Sedlex.intersection "Intersect" p (Option.map (fun (_, arg) -> arg) arg)
     | Ppat_construct ({txt = Lident "Chars"}, arg) ->
         let const = match arg with
-          | Some {ppat_desc=Ppat_constant const} ->
+          | Some (_, {ppat_desc=Ppat_constant const}) ->
               Some (const)
           | _ -> None
         in