summaryrefslogtreecommitdiff
path: root/ruby_parser.c
diff options
context:
space:
mode:
authorHASUMI Hitoshi <[email protected]>2024-03-28 10:26:42 +0900
committerYuichiro Kaneko <[email protected]>2024-04-15 20:51:54 +0900
commit9b1e97b211565b605b8eb7fab277efe117fe2604 (patch)
tree8d2b58dc312f564005ab377d2f32ac1354dcc769 /ruby_parser.c
parentbb1c3418d0fd3235c678ad68f7b45d32f8183a3f (diff)
[Universal parser] DeVALUE of p->debug_lines and ast->body.script_lines
This patch is part of universal parser work. ## Summary - Decouple VALUE from members below: - `(struct parser_params *)->debug_lines` - `(rb_ast_t *)->body.script_lines` - Instead, they are now `rb_parser_ary_t *` - They can also be a `(VALUE)FIXNUM` as before to hold line count - `ISEQ_BODY(iseq)->variable.script_lines` remains VALUE - In order to do this, - Add `VALUE script_lines` param to `rb_iseq_new_with_opt()` - Introduce `rb_parser_build_script_lines_from()` to convert `rb_parser_ary_t *` into `VALUE` ## Other details - Extend `rb_parser_ary_t *`. It previously could only store `rb_parser_ast_token *`, now can store script_lines, too - Change tactics of building the top-level `SCRIPT_LINES__` in `yycompile0()` - Before: While parsing, each line of the script is added to `SCRIPT_LINES__[path]` - After: After `yyparse(p)`, `SCRIPT_LINES__[path]` will be built from `p->debug_lines` - Remove the second parameter of `rb_parser_set_script_lines()` to make it simple - Introduce `script_lines_free()` to be called from `rb_ast_free()` because the GC no longer takes care of the script_lines - Introduce `rb_parser_string_deep_copy()` in parse.y to maintain script_lines when `rb_ruby_parser_free()` called - With regard to this, please see *Future tasks* below ## Future tasks - Decouple IMEMO from `rb_ast_t *` - This lifts the five-members-restriction of Ruby object, - So we will be able to move the ownership of the `lex.string_buffer` from parser to AST - Then we remove `rb_parser_string_deep_copy()` to make the whole thing simple
Diffstat (limited to 'ruby_parser.c')
-rw-r--r--ruby_parser.c59
1 files changed, 46 insertions, 13 deletions
diff --git a/ruby_parser.c b/ruby_parser.c
index 1991735af4..5d9c6c938f 100644
--- a/ruby_parser.c
+++ b/ruby_parser.c
@@ -622,12 +622,12 @@ rb_parser_set_context(VALUE vparser, const struct rb_iseq_struct *base, int main
}
void
-rb_parser_set_script_lines(VALUE vparser, VALUE lines)
+rb_parser_set_script_lines(VALUE vparser)
{
struct ruby_parser *parser;
TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser);
- rb_ruby_parser_set_script_lines(parser->parser_params, lines);
+ rb_ruby_parser_set_script_lines(parser->parser_params);
}
void
@@ -727,9 +727,40 @@ rb_parser_set_yydebug(VALUE vparser, VALUE flag)
rb_ruby_parser_set_yydebug(parser->parser_params, RTEST(flag));
return flag;
}
+
+void
+rb_set_script_lines_for(VALUE vparser, VALUE path)
+{
+ struct ruby_parser *parser;
+ VALUE hash;
+ ID script_lines;
+ CONST_ID(script_lines, "SCRIPT_LINES__");
+ if (!rb_const_defined_at(rb_cObject, script_lines)) return;
+ hash = rb_const_get_at(rb_cObject, script_lines);
+ if (RB_TYPE_P(hash, T_HASH)) {
+ rb_hash_aset(hash, path, Qtrue);
+ TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser);
+ rb_ruby_parser_set_script_lines(parser->parser_params);
+ }
+}
#endif
VALUE
+rb_parser_build_script_lines_from(rb_parser_ary_t *lines)
+{
+ int i;
+ if (lines->data_type != PARSER_ARY_DATA_SCRIPT_LINE) {
+ rb_bug("unexpected rb_parser_ary_data_type (%d) for script lines", lines->data_type);
+ }
+ VALUE script_lines = rb_ary_new_capa(lines->len);
+ for (i = 0; i < lines->len; i++) {
+ rb_parser_string_t *str = (rb_parser_string_t *)lines->data[i];
+ rb_ary_push(script_lines, rb_enc_str_new(str->ptr, str->len, str->enc));
+ }
+ return script_lines;
+}
+
+VALUE
rb_str_new_parser_string(rb_parser_string_t *str)
{
VALUE string = rb_enc_interned_str(str->ptr, str->len, str->enc);
@@ -935,15 +966,17 @@ rb_node_encoding_val(const NODE *node)
return rb_enc_from_encoding(RNODE_ENCODING(node)->enc);
}
-VALUE
-rb_script_lines_for(VALUE path)
-{
- VALUE hash, lines;
- ID script_lines;
- CONST_ID(script_lines, "SCRIPT_LINES__");
- if (!rb_const_defined_at(rb_cObject, script_lines)) return Qnil;
- hash = rb_const_get_at(rb_cObject, script_lines);
- if (!RB_TYPE_P(hash, T_HASH)) return Qnil;
- rb_hash_aset(hash, path, lines = rb_ary_new());
- return lines;
+void
+rb_parser_aset_script_lines_for(VALUE path, rb_parser_ary_t *lines)
+{
+ VALUE hash, script_lines;
+ ID script_lines_id;
+ if (NIL_P(path) || !lines || FIXNUM_P((VALUE)lines)) return;
+ CONST_ID(script_lines_id, "SCRIPT_LINES__");
+ if (!rb_const_defined_at(rb_cObject, script_lines_id)) return;
+ hash = rb_const_get_at(rb_cObject, script_lines_id);
+ if (!RB_TYPE_P(hash, T_HASH)) return;
+ if (rb_hash_lookup(hash, path) == Qnil) return;
+ script_lines = rb_parser_build_script_lines_from(lines);
+ rb_hash_aset(hash, path, script_lines);
}