1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

parse.y: refactor out ast generation code of two rb_parser_compile_*

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2018-01-05 05:27:25 +00:00
parent 4493657582
commit db81395da8
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
parse.y
View File

@ -5666,13 +5666,20 @@ yycompile0(VALUE arg)
return (VALUE)tree; return (VALUE)tree;
} }
static NODE* static rb_ast_t *
yycompile(struct parser_params *parser, VALUE fname, int line) yycompile(VALUE vparser, struct parser_params *parser, VALUE fname, int line)
{ {
rb_ast_t *ast;
ruby_sourcefile_string = rb_str_new_frozen(fname); ruby_sourcefile_string = rb_str_new_frozen(fname);
ruby_sourcefile = RSTRING_PTR(fname); ruby_sourcefile = RSTRING_PTR(fname);
ruby_sourceline = line - 1; ruby_sourceline = line - 1;
return (NODE *)rb_suppress_tracing(yycompile0, (VALUE)parser);
parser->ast = ast = rb_ast_new();
ast->root = (NODE *)rb_suppress_tracing(yycompile0, (VALUE)parser);
parser->ast = 0;
RB_GC_GUARD(vparser); /* prohibit tail call optimization */
return ast;
} }
#endif /* !RIPPER */ #endif /* !RIPPER */
@ -5731,21 +5738,15 @@ static rb_ast_t*
parser_compile_string(VALUE vparser, VALUE fname, VALUE s, int line) parser_compile_string(VALUE vparser, VALUE fname, VALUE s, int line)
{ {
struct parser_params *parser; struct parser_params *parser;
rb_ast_t *ast;
TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, parser); TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, parser);
parser->ast = ast = rb_ast_new();
lex_gets = lex_get_str; lex_gets = lex_get_str;
lex_gets_ptr = 0; lex_gets_ptr = 0;
lex_input = rb_str_new_frozen(s); lex_input = rb_str_new_frozen(s);
lex_pbeg = lex_p = lex_pend = 0; lex_pbeg = lex_p = lex_pend = 0;
ast->root = yycompile(parser, fname, line); return yycompile(vparser, parser, fname, line);
parser->ast = 0;
RB_GC_GUARD(vparser); /* prohibit tail call optimization */
return ast;
} }
rb_ast_t* rb_ast_t*
@ -5808,20 +5809,14 @@ rb_ast_t*
rb_parser_compile_file_path(VALUE vparser, VALUE fname, VALUE file, int start) rb_parser_compile_file_path(VALUE vparser, VALUE fname, VALUE file, int start)
{ {
struct parser_params *parser; struct parser_params *parser;
rb_ast_t *ast;
TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, parser); TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, parser);
parser->ast = ast = rb_ast_new();
lex_gets = lex_io_gets; lex_gets = lex_io_gets;
lex_input = file; lex_input = file;
lex_pbeg = lex_p = lex_pend = 0; lex_pbeg = lex_p = lex_pend = 0;
ast->root = yycompile(parser, fname, start); return yycompile(vparser, parser, fname, start);
parser->ast = 0;
RB_GC_GUARD(vparser); /* prohibit tail call optimization */
return ast;
} }
#endif /* !RIPPER */ #endif /* !RIPPER */