Pass prism parser into regexp parser

Author: kddnewton

fuzz/regexp.c

@@ -7,5 +7,10 @@ regexp_name_callback(const pm_string_t *name, void *data) {
 
 void
 harness(const uint8_t *input, size_t size) {
-    pm_regexp_parse(input, size, false, PM_ENCODING_UTF_8_ENTRY, regexp_name_callback, NULL);
+    pm_parser_t parser;
+    pm_parser_init(&parser, input, size, NULL);
+
+    pm_regexp_parse(&parser, input, size, regexp_name_callback, NULL);
+
+    pm_parser_free(&parser);
 }

include/prism/regexp.h

@@ -24,14 +24,13 @@ typedef void (*pm_regexp_name_callback_t)(const pm_string_t *name, void *data);
 /**
  * Parse a regular expression.
  *
+ * @param parser The parser that is currently being used.
  * @param source The source code to parse.
  * @param size The size of the source code.
- * @param encoding_changed Whether or not the encoding changed from the default.
- * @param encoding The encoding of the source code.
  * @param name_callback The callback to call when a named capture group is found.
  * @param name_data The data to pass to the name callback.
  * @return Whether or not the parsing was successful.
  */
-PRISM_EXPORTED_FUNCTION bool pm_regexp_parse(const uint8_t *source, size_t size, bool encoding_changed, const pm_encoding_t *encoding, pm_regexp_name_callback_t name_callback, void *name_data);
+PRISM_EXPORTED_FUNCTION bool pm_regexp_parse(pm_parser_t *parser, const uint8_t *source, size_t size, pm_regexp_name_callback_t name_callback, void *name_data);
 
 #endif

src/prism.c

@@ -20108,7 +20108,7 @@ parse_regular_expression_named_captures(pm_parser_t *parser, const pm_string_t *
         .names = { 0 }
     };
 
-    pm_regexp_parse(pm_string_source(content), pm_string_length(content), parser->encoding_changed, parser->encoding, parse_regular_expression_named_capture, &callback_data);
+    pm_regexp_parse(parser, pm_string_source(content), pm_string_length(content), parse_regular_expression_named_capture, &callback_data);
     pm_constant_id_list_free(&callback_data.names);
 
     if (callback_data.match != NULL) {

src/regexp.c

@@ -4,6 +4,9 @@
  * This is the parser that is going to handle parsing regular expressions.
  */
 typedef struct {
+    /** The parser that is currently being used. */
+    pm_parser_t *parser;
+
     /** A pointer to the start of the source that we are parsing. */
     const uint8_t *start;
 
@@ -26,22 +29,6 @@ typedef struct {
     void *name_data;
 } pm_regexp_parser_t;
 
-/**
- * This initializes a new parser with the given source.
- */
-static void
-pm_regexp_parser_init(pm_regexp_parser_t *parser, const uint8_t *start, const uint8_t *end, bool encoding_changed, const pm_encoding_t *encoding, pm_regexp_name_callback_t name_callback, void *name_data) {
-    *parser = (pm_regexp_parser_t) {
-        .start = start,
-        .cursor = start,
-        .end = end,
-        .encoding_changed = encoding_changed,
-        .encoding = encoding,
-        .name_callback = name_callback,
-        .name_data = name_data
-    };
-}
-
 /**
  * This appends a new string to the list of named captures.
  */
@@ -650,8 +637,17 @@ pm_regexp_parse_pattern(pm_regexp_parser_t *parser) {
  * groups.
  */
 PRISM_EXPORTED_FUNCTION bool
-pm_regexp_parse(const uint8_t *source, size_t size, bool encoding_changed, const pm_encoding_t *encoding, pm_regexp_name_callback_t name_callback, void *name_data) {
-    pm_regexp_parser_t parser;
-    pm_regexp_parser_init(&parser, source, source + size, encoding_changed, encoding, name_callback, name_data);
-    return pm_regexp_parse_pattern(&parser);
+pm_regexp_parse(pm_parser_t *parser, const uint8_t *source, size_t size, pm_regexp_name_callback_t name_callback, void *name_data) {
+    pm_regexp_parser_t regexp_parser = {
+        .parser = parser,
+        .start = source,
+        .cursor = source,
+        .end = source + size,
+        .encoding_changed = parser->encoding_changed,
+        .encoding = parser->encoding,
+        .name_callback = name_callback,
+        .name_data = name_data
+    };
+
+    return pm_regexp_parse_pattern(&regexp_parser);
 }