mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
ast.c: Fix to raise SyntaxError
* ast.c: Fix to raise `SyntaxError` when `RubyVM::AST.parse` or `RubyVM::AST.parse_file` fail to parse input. * test/ruby/test_ast.rb: Add test cases for invalid syntax. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
afa7bfee8f
commit
6666103480
2 changed files with 31 additions and 4 deletions
14
ast.c
14
ast.c
|
@ -58,10 +58,13 @@ rb_ast_s_parse(VALUE module, VALUE str)
|
|||
const VALUE parser = rb_parser_new();
|
||||
|
||||
str = rb_check_string_type(str);
|
||||
rb_parser_set_context(parser, NULL, 1);
|
||||
rb_parser_set_context(parser, NULL, 0);
|
||||
ast = rb_parser_compile_string_path(parser, rb_str_new_cstr("no file name"), str, 1);
|
||||
|
||||
if (!ast->body.root) return Qnil;
|
||||
if (!ast->body.root) {
|
||||
rb_ast_dispose(ast);
|
||||
rb_exc_raise(GET_EC()->errinfo);
|
||||
}
|
||||
|
||||
obj = ast_new_internal(ast, (NODE *)ast->body.root);
|
||||
|
||||
|
@ -80,12 +83,15 @@ rb_ast_s_parse_file(VALUE module, VALUE path)
|
|||
FilePathValue(path);
|
||||
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_parser_set_context(parser, NULL, 1);
|
||||
rb_parser_set_context(parser, NULL, 0);
|
||||
ast = rb_parser_compile_file_path(parser, path, f, 1);
|
||||
|
||||
rb_io_close(f);
|
||||
|
||||
if (!ast->body.root) return Qnil;
|
||||
if (!ast->body.root) {
|
||||
rb_ast_dispose(ast);
|
||||
rb_exc_raise(GET_EC()->errinfo);
|
||||
}
|
||||
|
||||
obj = ast_new_internal(ast, (NODE *)ast->body.root);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue