diff options
author | HASUMI Hitoshi <[email protected]> | 2024-02-16 17:45:22 +0900 |
---|---|---|
committer | Yuichiro Kaneko <[email protected]> | 2024-03-12 17:17:52 +0900 |
commit | 9a19cfd4cd1a16528cc997e3a510c3046b83cdec (patch) | |
tree | 1d061cebf79d8aee39be26887b539f12b48a6f9f /rubyparser.h | |
parent | f42164e03700469a7000b4f00148a8ca01d75044 (diff) |
[Universal Parser] Reduce dependence on RArray in parse.y
- Introduce `rb_parser_ary_t` structure to partly eliminate RArray from parse.y
- In this patch, `parser_params->tokens` and `parser_params->ast->node_buffer->tokens` are now `rb_parser_ary_t *`
- Instead, `ast_node_all_tokens()` internally creates a Ruby Array object from the `rb_parser_ary_t`
- Also, delete `rb_ast_tokens()` and `rb_ast_set_tokens()` in node.c
- Implement `rb_parser_str_escape()`
- This is a port of the `rb_str_escape()` function in string.c
- `rb_parser_str_escape()` does not depend on `VALUE` (RString)
- Instead, it uses `rb_parser_stirng_t *`
- This function works when --dump=y option passed
- Because WIP of the universal parser, similar functions like `rb_parser_tokens_free()` exist in both node.c and parse.y. Refactoring them may be needed in some way in the future
- Although we considered redesigning the structure: `ast->node_buffer->tokens` into `ast->tokens`, we leave it as it is because `rb_ast_t` is an imemo. (We will address it in the future)
Diffstat (limited to 'rubyparser.h')
-rw-r--r-- | rubyparser.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/rubyparser.h b/rubyparser.h index 34ee117f65..cf40ad970e 100644 --- a/rubyparser.h +++ b/rubyparser.h @@ -189,6 +189,22 @@ typedef struct rb_code_location_struct { rb_code_position_t end_pos; } rb_code_location_t; +typedef struct rb_parser_ast_token { + int id; + const char *type_name; + rb_parser_string_t *str; + rb_code_location_t loc; +} rb_parser_ast_token_t; + +/* + * Array-like object for parser + */ +typedef struct rb_parser_ary { + rb_parser_ast_token_t **data; + long len; // current size + long capa; // capacity +} rb_parser_ary_t; + /* Header part of AST Node */ typedef struct RNode { VALUE flags; @@ -1340,6 +1356,10 @@ typedef struct rb_parser_config_struct { void (*encoding_set)(VALUE obj, int encindex); int (*encoding_is_ascii8bit)(VALUE obj); rb_encoding *(*usascii_encoding)(void); + int enc_coderange_broken; + int (*enc_mbminlen)(rb_encoding *enc); + bool (*enc_isascii)(OnigCodePoint c, rb_encoding *enc); + OnigCodePoint (*enc_mbc_to_codepoint)(const char *p, const char *e, rb_encoding *enc); /* Ractor */ VALUE (*ractor_make_shareable)(VALUE obj); |