kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

Make RubyVM::AST.of work with code written in `-e` command-line option 

[Bug #18434]
This commit is contained in:
Yusuke Endoh 2021-12-26 19:41:42 +09:00
parent 18da9359de
commit 0dc7816c43
Notes: git 2021-12-26 20:57:53 +09:00 
Merged: https://github.com/ruby/ruby/pull/5347
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ast.c
View File

@ -195,7 +195,7 @@ script_lines(VALUE path)
static VALUE
ast_s_of(rb_execution_context_t *ec, VALUE module, VALUE body, VALUE keep_script_lines)
{
VALUE path, node, lines = Qnil;
VALUE node, lines = Qnil;
const rb_iseq_t *iseq;
int node_id;
@ -223,15 +223,18 @@ ast_s_of(rb_execution_context_t *ec, VALUE module, VALUE body, VALUE keep_script
return Qnil;
}
lines = iseq->body->variable.script_lines;
if (NIL_P(lines) && rb_iseq_from_eval_p(iseq)) {
VALUE path = rb_iseq_path(iseq);
int e_option = RSTRING_LEN(path) == 2 && memcmp(RSTRING_PTR(path), "-e", 2) == 0;
if (NIL_P(lines) && rb_iseq_from_eval_p(iseq) && !e_option) {
rb_raise(rb_eArgError, "cannot get AST for method defined in eval");
}
path = rb_iseq_path(iseq);
if (!NIL_P(lines) || !NIL_P(lines = script_lines(path))) {
node = rb_ast_parse_array(lines, keep_script_lines);
}
else if (RSTRING_LEN(path) == 2 && memcmp(RSTRING_PTR(path), "-e", 2) == 0) {
else if (e_option) {
node = rb_ast_parse_str(rb_e_script, keep_script_lines);
}
else {

5
test/ruby/test_ast.rb
View File

@ -537,4 +537,9 @@ dummy
assert_equal("{ 1 + 2 }", node_proc.source)
assert_equal("def test_keep_script_lines_for_of\n", node_method.source.lines.first)
end
def test_e_option
assert_in_out_err(["-e", "def foo; end; pp RubyVM::AbstractSyntaxTree.of(method(:foo)).type"],
"", [":SCOPE"], [])
end
end