fix: module names in conversion function

Author: zazedd

common/mik_lexer.mll

@@ -58,7 +58,9 @@ let lowercase = ['a'-'z']
 let uppercase = ['A'-'Z']
 let alpha = lowercase | uppercase
 let digit = ['0'-'9']
-let ident = (alpha | '_') (alpha | digit | '_' | '\'')*
+let ident = (lowercase | '_') (alpha | digit | '_' | '\'')*
+let module_name = uppercase (alpha | digit | '_' | '\'')*
+let module_ident = module_name ('.' (module_name | ident))*
 
 rule token = parse
   | [' ' '\t' '\r']+ { token lexbuf }
@@ -83,6 +85,7 @@ rule token = parse
   | "int" { INT_CONVERTER }
   | "float" { FLOAT_CONVERTER }
   | digit+ as n { INT (int_of_string n) }
+  | module_ident as id { MOD_IDENT id }
   | ident as id {
       match List.assoc_opt id predefined_classes with
       | Some pcre_class -> PREDEFINED_CLASS pcre_class

common/mik_parser.mly

@@ -40,7 +40,7 @@ let unclosed_error what startpos endpos =
   syntax_error (Printf.sprintf "Unclosed %s" what) startpos endpos
 %}
 
-%token <string> CHAR_LITERAL STRING_LITERAL IDENT PREDEFINED_CLASS
+%token <string> CHAR_LITERAL STRING_LITERAL IDENT MOD_IDENT PREDEFINED_CLASS
 %token <int> INT
 %token SLASH LPAREN RPAREN LBRACKET RBRACKET CARET LBRACE RBRACE
 %token DASH BAR STAR PLUS QUESTION UNDERSCORE COLON EQUAL AS
@@ -187,6 +187,7 @@ basic_atom:
       let pattern_node = to_pcre_regex $2 $startpos($2) $endpos($2) in
       wrap_loc $startpos $endpos (Named_subs (ident_loc, Some name_loc, Some Float, pattern_node))
     }
+  | LPAREN IDENT AS name = IDENT COLON EQUAL func = MOD_IDENT RPAREN
   | LPAREN IDENT AS name = IDENT COLON EQUAL func = IDENT RPAREN {
       let ident_loc = wrap_loc $startpos($2) $endpos($2) $2 in
       let name_loc = wrap_loc $startpos(name) $endpos(name) name in
@@ -222,6 +223,7 @@ basic_atom:
       let name_loc = wrap_loc $startpos(name) $endpos(name) name in
       wrap_loc $startpos $endpos (Capture_as (name_loc, Some Float, $2))
     }
+  | LPAREN pattern AS name = IDENT COLON EQUAL func = MOD_IDENT RPAREN
   | LPAREN pattern AS name = IDENT COLON EQUAL func = IDENT RPAREN {
       let name_loc = wrap_loc $startpos(name) $endpos(name) name in
       wrap_loc $startpos $endpos (Capture_as (name_loc, Some (Func func), $2))

ppx_regexp/ppx_regexp.ml

@@ -183,7 +183,19 @@ let rec wrap_group_bindings ~loc rhs offG = function
       | Some Regexp_types.Int -> [%expr int_of_string [%e eG]]
       | Some Regexp_types.Float -> [%expr float_of_string [%e eG]]
       | Some (Regexp_types.Func func_name) ->
-        let func_ident = pexp_ident ~loc { txt = Lident func_name; loc } in
+        let longident =
+          match String.split_on_char '.' func_name with
+          | [] -> assert false
+          | [ name ] -> Lident name
+          | module_path ->
+            let rec build_longident = function
+              | [] -> assert false
+              | [ name ] -> Lident name
+              | module_name :: rest -> Ldot (build_longident rest, module_name)
+            in
+            build_longident (List.rev module_path)
+        in
+        let func_ident = pexp_ident ~loc { txt = longident; loc } in
         [%expr [%e func_ident] [%e eG]]
     in
     let eG = if mustG then eG else [%expr try Some [%e eG] with Not_found -> None] in