archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Change return value of gets function to be rb_parser_string_t * instead of VALUE

Browse source 
This change reduces parser's dependency on ruby object.
This commit is contained in:
yui-knk 2024-04-25 16:09:42 +09:00 • committed by Yuichiro Kaneko
parent a510175e8f
commit cf74ff714a
5 changed files with 35 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

26
ruby_parser.c
View file

@ -630,8 +630,8 @@ rb_parser_keep_tokens(VALUE vparser)
rb_ruby_parser_keep_tokens(parser->parser_params);
}
VALUE
rb_parser_lex_get_str(struct lex_pointer_string *ptr_str)
rb_parser_string_t *
rb_parser_lex_get_str(struct parser_params *p, struct lex_pointer_string *ptr_str)
{
char *beg, *end, *start;
long len;
@ -641,20 +641,20 @@ rb_parser_lex_get_str(struct lex_pointer_string *ptr_str)
len = RSTRING_LEN(s);
start = beg;
if (ptr_str->ptr) {
if (len == ptr_str->ptr) return Qnil;
if (len == ptr_str->ptr) return 0;
beg += ptr_str->ptr;
len -= ptr_str->ptr;
}
end = memchr(beg, '\n', len);
if (end) len = ++end - beg;
ptr_str->ptr += len;
return rb_str_subseq(s, beg - start, len);
return rb_str_to_parser_string(p, rb_str_subseq(s, beg - start, len));
}
static VALUE
static rb_parser_string_t *
lex_get_str(struct parser_params *p, rb_parser_input_data input, int line_count)
{
return rb_parser_lex_get_str((struct lex_pointer_string *)input);
return rb_parser_lex_get_str(p, (struct lex_pointer_string *)input);
}
static void parser_aset_script_lines_for(VALUE path, rb_parser_ary_t *lines);
@ -716,15 +716,16 @@ parser_compile_string(struct ruby_parser *parser, const char *f, VALUE s, int li
VALUE rb_io_gets_internal(VALUE io);
static VALUE
static rb_parser_string_t *
lex_io_gets(struct parser_params *p, rb_parser_input_data input, int line_count)
{
VALUE io = (VALUE)input;
return rb_io_gets_internal(io);
VALUE line = rb_io_gets_internal(io);
if (NIL_P(line)) return 0;
return rb_str_to_parser_string(p, line);
}
static VALUE
static rb_parser_string_t *
lex_gets_array(struct parser_params *p, rb_parser_input_data data, int index)
{
VALUE array = (VALUE)data;
@ -734,8 +735,11 @@ lex_gets_array(struct parser_params *p, rb_parser_input_data data, int index)
if (!rb_enc_asciicompat(rb_enc_get(str))) {
rb_raise(rb_eArgError, "invalid source encoding");
}
return rb_str_to_parser_string(p, str);
}
else {
return 0;
}
return str;
}
static rb_ast_t*