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

Check the argument before creating a parser

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65652 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-11-10 11:16:36 +00:00
parent 2aed2cbcf2
commit 907ae13cf6
1 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
ast.c
View File

@ -55,6 +55,23 @@ ast_new_internal(rb_ast_t *ast, NODE *node)
VALUE rb_ast_parse_str(VALUE str); VALUE rb_ast_parse_str(VALUE str);
VALUE rb_ast_parse_file(VALUE path); VALUE rb_ast_parse_file(VALUE path);
static VALUE
ast_parse_new(void)
{
return rb_parser_set_context(rb_parser_new(), NULL, 0);
}
static VALUE
ast_parse_done(rb_ast_t *ast)
{
if (!ast->body.root) {
rb_ast_dispose(ast);
rb_exc_raise(GET_EC()->errinfo);
}
return ast_new_internal(ast, (NODE *)ast->body.root);
}
/* /*
* call-seq: * call-seq:
* RubyVM::AbstractSyntaxTree.parse(string) -> RubyVM::AbstractSyntaxTree::Node * RubyVM::AbstractSyntaxTree.parse(string) -> RubyVM::AbstractSyntaxTree::Node
@ -76,23 +93,11 @@ rb_ast_s_parse(VALUE module, VALUE str)
VALUE VALUE
rb_ast_parse_str(VALUE str) rb_ast_parse_str(VALUE str)
{ {
VALUE obj;
rb_ast_t *ast = 0; rb_ast_t *ast = 0;
const VALUE parser = rb_parser_new();
str = rb_check_string_type(str); str = rb_check_string_type(str);
rb_parser_set_context(parser, NULL, 0); ast = rb_parser_compile_string_path(ast_parse_new(), Qnil, str, 1);
ast = rb_parser_compile_string_path(parser, Qnil, str, 1); return ast_parse_done(ast);
if (!ast->body.root) {
rb_ast_dispose(ast);
rb_exc_raise(GET_EC()->errinfo);
}
obj = ast_new_internal(ast, (NODE *)ast->body.root);
return obj;
} }
/* /*
@ -117,28 +122,16 @@ rb_ast_s_parse_file(VALUE module, VALUE path)
VALUE VALUE
rb_ast_parse_file(VALUE path) rb_ast_parse_file(VALUE path)
{ {
VALUE obj, f; VALUE f;
rb_ast_t *ast = 0; rb_ast_t *ast = 0;
rb_encoding *enc = rb_utf8_encoding(); rb_encoding *enc = rb_utf8_encoding();
const VALUE parser = rb_parser_new();
FilePathValue(path); FilePathValue(path);
f = rb_file_open_str(path, "r"); f = rb_file_open_str(path, "r");
rb_funcall(f, rb_intern("set_encoding"), 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-")); rb_funcall(f, rb_intern("set_encoding"), 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-"));
rb_parser_set_context(parser, NULL, 0); ast = rb_parser_compile_file_path(ast_parse_new(), Qnil, f, 1);
ast = rb_parser_compile_file_path(parser, Qnil, f, 1);
rb_io_close(f); rb_io_close(f);
return ast_parse_done(ast);
if (!ast->body.root) {
rb_ast_dispose(ast);
rb_exc_raise(GET_EC()->errinfo);
}
obj = ast_new_internal(ast, (NODE *)ast->body.root);
return obj;
} }
static VALUE node_children(rb_ast_t*, NODE*); static VALUE node_children(rb_ast_t*, NODE*);