Fix multi-group top level regexp for ppx_tyre.

Author: Drup

ppx_tyre/ppx_tyre.ml

@@ -188,10 +188,10 @@ let simplify = collapse_ungrouped
 let rec make_nested_tuple_pat ~loc ids =
   match ids with
   | [] -> internal_error ~loc
-  | [ v ] -> [v], AC.pvar ~loc v
+  | [ v ] -> AC.pvar ~loc v
   | v :: ids -> 
-    let vars, pat = make_nested_tuple_pat ~loc ids in
-    (v :: vars), A.Pat.tuple ~loc [AC.pvar ~loc v;pat]
+    let pat = make_nested_tuple_pat ~loc ids in
+    A.Pat.tuple ~loc [AC.pvar ~loc v;pat]
 let rec make_nested_tuple_expr ~loc exprs =
   match exprs with
   | [] -> internal_error ~loc
@@ -216,8 +216,8 @@ let make_object_expr ~loc expr meths =
 
 let make_conv_of_nested_tuple ~loc ~make_pat ~make_expr ~ids tyre_expr =
   let fun_to =
-    let vars, tuple_pat = make_nested_tuple_pat ~loc ids in
-    let lids = List.map (AC.evar ~loc) vars in
+    let tuple_pat = make_nested_tuple_pat ~loc ids in
+    let lids = List.map (AC.evar ~loc) ids in
     let expr = make_expr ~loc lids in
     A.Exp.fun_ ~loc Nolabel None tuple_pat expr
   in
@@ -442,7 +442,8 @@ let expr_of_function ~loc l =
       | Named [] | Unnamed 0 -> internal_error ~loc
       | No | Unnamed _ -> A.Pat.any ~loc ()
       | Named [lid] -> pvar_of_lid lid
-      | Named l -> AC.ptuple ~loc @@ List.map pvar_of_lid l 
+      | Named l ->
+        make_nested_tuple_pat ~loc @@ List.map (fun {Loc.txt ; _} -> txt) l
     in
     let e = AC.func ~loc [arg, pc_rhs] in
     AC.constr ~loc "Tyre.Route" [re; e]

tests/test_ppx_tyre.ml

@@ -32,6 +32,7 @@ type t = [
   | `Comment of string
   | `Even_sigils of string option
   | `Odd_sigils
+  | `Id of string * int * string
   | `Unknown ]
 
 let test1 : t Tyre.re =
@@ -40,14 +41,17 @@ let test1 : t Tyre.re =
    | {|^# (?<comment>.+)$|} -> `Comment comment
    | {|^(?<sigil>([@%]{2})+)?$|} -> `Even_sigils sigil
    | {|^[@%]|} -> `Odd_sigils
+   | {|^(?<id>[a-z]+)(?&num:Tyre.pos_int)(?<sym>[^[:alnum:]]+)$|}
+     -> `Id (id, num, sym)
    | _ -> `Unknown)
 
 let () =
   assert (test1 %% "x: 1" = `Attr ("x", Some "1"));
   assert (test1 %% "# Kommentar" = `Comment "Kommentar");
   assert (test1 %% "" = `Even_sigils None);
   assert (test1 %% "%%%@" = `Even_sigils (Some "%%%@"));
-  assert (test1 %% "%%@" = `Odd_sigils)
+  assert (test1 %% "%%@" = `Odd_sigils);
+  assert (test1 %% "abc42#@" = `Id ("abc", 42, "#@"))
 
 let concat_seq sep seq =
   let rec f seq =