diff options
| author | yui-knk <[email protected]> | 2024-04-21 09:54:23 +0900 |
|---|---|---|
| committer | Yuichiro Kaneko <[email protected]> | 2024-04-23 07:20:22 +0900 |
| commit | 2992e1074adf86ed6c06ba1750648a35d877001a (patch) | |
| tree | 8d21e90b00fed4ef58465c5008d92a15f276d3c6 /internal/ruby_parser.h | |
| parent | ed9834efbdcac5bc54df673703095bdecc797c7d (diff) | |
Refactor parser compile functions
Refactor parser compile functions to reduce the dependence
on ruby functions.
This commit includes these changes
1. Refactor `gets`, `input` and `gets_` of `parser_params`
Parser needs two different data structure to get next line, function (`gets`) and input data (`input`).
However `gets_` is used for both function (`call`) and input data (`ptr`).
`call` is used for managing general callback function when `rb_ruby_parser_compile_generic` is used.
`ptr` is used for managing the current pointer on String when `parser_compile_string` is used.
This commit changes parser to used only `gets` and `input` then removes `gets_`.
2. Move parser_compile functions and `gets` functions from parse.y to ruby_parser.c
This change reduces the dependence on ruby functions from parser.
3. Change ruby_parser and ripper to take care of `VALUE input` GC mark
Move the responsibility of calling `rb_gc_mark` for `VALUE input` from parser to ruby_parser and ripper.
`input` is arbitrary data pointer from the viewpoint of parser.
4. Introduce rb_parser_compile_array function
Caller of `rb_parser_compile_generic` needs to take care about GC because ruby_parser doesn’t know
about the detail of `lex_gets` and `input`.
Introduce `rb_parser_compile_array` to reduce the complexity of ast.c.
Diffstat (limited to 'internal/ruby_parser.h')
| -rw-r--r-- | internal/ruby_parser.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/internal/ruby_parser.h b/internal/ruby_parser.h index 2559724480..afb8909429 100644 --- a/internal/ruby_parser.h +++ b/internal/ruby_parser.h @@ -5,10 +5,16 @@ #include "internal/bignum.h" #include "internal/compilers.h" #include "internal/complex.h" +#include "internal/parse.h" #include "internal/rational.h" #include "rubyparser.h" #include "vm.h" +struct lex_pointer_string { + VALUE str; + long ptr; +}; + RUBY_SYMBOL_EXPORT_BEGIN #ifdef UNIVERSAL_PARSER const rb_parser_config_t *rb_ruby_parser_config(void); @@ -19,6 +25,7 @@ VALUE rb_parser_new(void); rb_ast_t *rb_parser_compile_string_path(VALUE vparser, VALUE fname, VALUE src, int line); VALUE rb_str_new_parser_string(rb_parser_string_t *str); VALUE rb_str_new_mutable_parser_string(rb_parser_string_t *str); +VALUE rb_parser_lex_get_str(struct lex_pointer_string *ptr_str); VALUE rb_node_str_string_val(const NODE *); VALUE rb_node_sym_string_val(const NODE *); @@ -48,7 +55,8 @@ void rb_parser_keep_tokens(VALUE vparser); rb_ast_t *rb_parser_compile_string(VALUE, const char*, VALUE, int); rb_ast_t *rb_parser_compile_file_path(VALUE vparser, VALUE fname, VALUE input, int line); -rb_ast_t *rb_parser_compile_generic(VALUE vparser, VALUE (*lex_gets)(VALUE, int), VALUE fname, VALUE input, int line); +rb_ast_t *rb_parser_compile_generic(VALUE vparser, rb_parser_lex_gets_func *lex_gets, VALUE fname, VALUE input, int line); +rb_ast_t *rb_parser_compile_array(VALUE vparser, VALUE fname, VALUE array, int start); enum lex_state_bits { EXPR_BEG_bit, /* ignore newline, +/- is a sign. */ |