yarp 0.8.0 → 0.10.0

data/src/regexp.c

@@ -2,9 +2,9 @@
 
 // This is the parser that is going to handle parsing regular expressions.
 typedef struct {
-    const char *start;
-    const char *cursor;
-    const char *end;
+    const uint8_t *start;
+    const uint8_t *cursor;
+    const uint8_t *end;
     yp_string_list_t *named_captures;
     bool encoding_changed;
     yp_encoding_t *encoding;
@@ -12,7 +12,7 @@ typedef struct {
 
 // This initializes a new parser with the given source.
 static void
-yp_regexp_parser_init(yp_regexp_parser_t *parser, const char *start, const char *end, yp_string_list_t *named_captures, bool encoding_changed, yp_encoding_t *encoding) {
+yp_regexp_parser_init(yp_regexp_parser_t *parser, const uint8_t *start, const uint8_t *end, yp_string_list_t *named_captures, bool encoding_changed, yp_encoding_t *encoding) {
     *parser = (yp_regexp_parser_t) {
         .start = start,
         .cursor = start,
@@ -25,7 +25,7 @@ yp_regexp_parser_init(yp_regexp_parser_t *parser, const char *start, const char
 
 // This appends a new string to the list of named captures.
 static void
-yp_regexp_parser_named_capture(yp_regexp_parser_t *parser, const char *start, const char *end) {
+yp_regexp_parser_named_capture(yp_regexp_parser_t *parser, const uint8_t *start, const uint8_t *end) {
     yp_string_t string;
     yp_string_shared_init(&string, start, end);
     yp_string_list_append(parser->named_captures, &string);
@@ -40,7 +40,7 @@ yp_regexp_char_is_eof(yp_regexp_parser_t *parser) {
 
 // Optionally accept a char and consume it if it exists.
 static inline bool
-yp_regexp_char_accept(yp_regexp_parser_t *parser, char value) {
+yp_regexp_char_accept(yp_regexp_parser_t *parser, uint8_t value) {
     if (!yp_regexp_char_is_eof(parser) && *parser->cursor == value) {
         parser->cursor++;
         return true;
@@ -50,7 +50,7 @@ yp_regexp_char_accept(yp_regexp_parser_t *parser, char value) {
 
 // Expect a character to be present and consume it.
 static inline bool
-yp_regexp_char_expect(yp_regexp_parser_t *parser, char value) {
+yp_regexp_char_expect(yp_regexp_parser_t *parser, uint8_t value) {
     if (!yp_regexp_char_is_eof(parser) && *parser->cursor == value) {
         parser->cursor++;
         return true;
@@ -60,12 +60,12 @@ yp_regexp_char_expect(yp_regexp_parser_t *parser, char value) {
 
 // This advances the current token to the next instance of the given character.
 static bool
-yp_regexp_char_find(yp_regexp_parser_t *parser, char value) {
+yp_regexp_char_find(yp_regexp_parser_t *parser, uint8_t value) {
     if (yp_regexp_char_is_eof(parser)) {
         return false;
     }
 
-    const char *end = (const char *) yp_memchr(parser->cursor, value, (size_t) (parser->end - parser->cursor), parser->encoding_changed, parser->encoding);
+    const uint8_t *end = (const uint8_t *) yp_memchr(parser->cursor, value, (size_t) (parser->end - parser->cursor), parser->encoding_changed, parser->encoding);
     if (end == NULL) {
         return false;
     }
@@ -107,7 +107,7 @@ yp_regexp_char_find(yp_regexp_parser_t *parser, char value) {
 // consumed so we're in the start state.
 static bool
 yp_regexp_parse_range_quantifier(yp_regexp_parser_t *parser) {
-    const char *savepoint = parser->cursor;
+    const uint8_t *savepoint = parser->cursor;
 
     enum {
         YP_REGEXP_RANGE_QUANTIFIER_STATE_START,
@@ -252,7 +252,7 @@ yp_regexp_parse_character_set(yp_regexp_parser_t *parser) {
 // A left bracket can either mean a POSIX class or a character set.
 static bool
 yp_regexp_parse_lbracket(yp_regexp_parser_t *parser) {
-    const char *reset = parser->cursor;
+    const uint8_t *reset = parser->cursor;
 
     if ((parser->cursor + 2 < parser->end) && parser->cursor[0] == '[' && parser->cursor[1] == ':') {
         parser->cursor++;
@@ -287,7 +287,7 @@ typedef enum {
 
 // This is the set of options that are configurable on the regular expression.
 typedef struct {
-    unsigned char values[YP_REGEXP_OPTION_STATE_SLOTS];
+    uint8_t values[YP_REGEXP_OPTION_STATE_SLOTS];
 } yp_regexp_options_t;
 
 // Initialize a new set of options to their default values.
@@ -305,9 +305,9 @@ yp_regexp_options_init(yp_regexp_options_t *options) {
 // Attempt to add the given option to the set of options. Returns true if it was
 // added, false if it was already present.
 static bool
-yp_regexp_options_add(yp_regexp_options_t *options, unsigned char key) {
+yp_regexp_options_add(yp_regexp_options_t *options, uint8_t key) {
     if (key >= YP_REGEXP_OPTION_STATE_SLOT_MINIMUM && key <= YP_REGEXP_OPTION_STATE_SLOT_MAXIMUM) {
-        key = (unsigned char) (key - YP_REGEXP_OPTION_STATE_SLOT_MINIMUM);
+        key = (uint8_t) (key - YP_REGEXP_OPTION_STATE_SLOT_MINIMUM);
 
         switch (options->values[key]) {
             case YP_REGEXP_OPTION_STATE_INVALID:
@@ -328,9 +328,9 @@ yp_regexp_options_add(yp_regexp_options_t *options, unsigned char key) {
 // Attempt to remove the given option from the set of options. Returns true if
 // it was removed, false if it was already absent.
 static bool
-yp_regexp_options_remove(yp_regexp_options_t *options, unsigned char key) {
+yp_regexp_options_remove(yp_regexp_options_t *options, uint8_t key) {
     if (key >= YP_REGEXP_OPTION_STATE_SLOT_MINIMUM && key <= YP_REGEXP_OPTION_STATE_SLOT_MAXIMUM) {
-        key = (unsigned char) (key - YP_REGEXP_OPTION_STATE_SLOT_MINIMUM);
+        key = (uint8_t) (key - YP_REGEXP_OPTION_STATE_SLOT_MINIMUM);
 
         switch (options->values[key]) {
             case YP_REGEXP_OPTION_STATE_INVALID:
@@ -431,7 +431,7 @@ yp_regexp_parse_group(yp_regexp_parser_t *parser) {
                         parser->cursor++;
                         break;
                     default: { // named capture group
-                        const char *start = parser->cursor;
+                        const uint8_t *start = parser->cursor;
                         if (!yp_regexp_char_find(parser, '>')) {
                             return false;
                         }
@@ -441,7 +441,7 @@ yp_regexp_parse_group(yp_regexp_parser_t *parser) {
                 }
                 break;
             case '\'': { // named capture group
-                const char *start = ++parser->cursor;
+                const uint8_t *start = ++parser->cursor;
                 if (!yp_regexp_char_find(parser, '\'')) {
                     return false;
                 }
@@ -456,7 +456,7 @@ yp_regexp_parse_group(yp_regexp_parser_t *parser) {
                 break;
             case 'i': case 'm': case 'x': case 'd': case 'a': case 'u': // options
                 while (!yp_regexp_char_is_eof(parser) && *parser->cursor != '-' && *parser->cursor != ':' && *parser->cursor != ')') {
-                    if (!yp_regexp_options_add(&options, (unsigned char) *parser->cursor)) {
+                    if (!yp_regexp_options_add(&options, *parser->cursor)) {
                         return false;
                     }
                     parser->cursor++;
@@ -474,7 +474,7 @@ yp_regexp_parse_group(yp_regexp_parser_t *parser) {
             case '-':
                 parser->cursor++;
                 while (!yp_regexp_char_is_eof(parser) && *parser->cursor != ':' && *parser->cursor != ')') {
-                    if (!yp_regexp_options_remove(&options, (unsigned char) *parser->cursor)) {
+                    if (!yp_regexp_options_remove(&options, *parser->cursor)) {
                         return false;
                     }
                     parser->cursor++;
@@ -573,7 +573,7 @@ yp_regexp_parse_pattern(yp_regexp_parser_t *parser) {
 // Parse a regular expression and extract the names of all of the named capture
 // groups.
 YP_EXPORTED_FUNCTION bool
-yp_regexp_named_capture_group_names(const char *source, size_t size, yp_string_list_t *named_captures, bool encoding_changed, yp_encoding_t *encoding) {
+yp_regexp_named_capture_group_names(const uint8_t *source, size_t size, yp_string_list_t *named_captures, bool encoding_changed, yp_encoding_t *encoding) {
     yp_regexp_parser_t parser;
     yp_regexp_parser_init(&parser, source, source + size, named_captures, encoding_changed, encoding);
     return yp_regexp_parse_pattern(&parser);