diff options
author | nagachika <nagachika@ruby-lang.org> | 2020-08-07 20:16:51 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2020-08-07 20:16:51 +0900 |
commit | e9e4f8430a62f56a4e62dd728f4498ee4c300c12 (patch) | |
tree | d3614c21b297a73abf1d0e584d5a4baabe546c33 | |
parent | 23d130a9ddcaf766d6ce309f8518b434a2537fc1 (diff) |
merge revision(s) 8e189df32cacef4b21e357a590d349330532baf5: [Backport #17013]
Add operator info to `OP_ASGN2` of `RubyVM::AbstractSyntaxTree`.
-rw-r--r-- | ast.c | 3 | ||||
-rw-r--r-- | test/ruby/test_ast.rb | 11 | ||||
-rw-r--r-- | version.h | 4 |
3 files changed, 15 insertions, 3 deletions
@@ -407,9 +407,10 @@ node_children(rb_ast_t *ast, NODE *node) NEW_CHILD(ast, node->nd_args->nd_head), NEW_CHILD(ast, node->nd_args->nd_body)); case NODE_OP_ASGN2: - return rb_ary_new_from_args(4, NEW_CHILD(ast, node->nd_recv), + return rb_ary_new_from_args(5, NEW_CHILD(ast, node->nd_recv), node->nd_next->nd_aid ? Qtrue : Qfalse, ID2SYM(node->nd_next->nd_vid), + ID2SYM(node->nd_next->nd_mid), NEW_CHILD(ast, node->nd_value)); case NODE_OP_ASGN_AND: return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_head), ID2SYM(idANDOP), diff --git a/test/ruby/test_ast.rb b/test/ruby/test_ast.rb index 147d05eadf..da7dde4a38 100644 --- a/test/ruby/test_ast.rb +++ b/test/ruby/test_ast.rb @@ -319,4 +319,15 @@ class TestAst < Test::Unit::TestCase helper.validate_range assert_equal([], helper.errors) end + + def test_op_asgn2 + node = RubyVM::AbstractSyntaxTree.parse("struct.field += foo") + _, _, body = *node.children + assert_equal(:OP_ASGN2, body.type) + recv, _, mid, op, value = body.children + assert_equal(:VCALL, recv.type) + assert_equal(:field, mid) + assert_equal(:+, op) + assert_equal(:VCALL, value.type) + end end @@ -2,11 +2,11 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 117 +#define RUBY_PATCHLEVEL 118 #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 8 -#define RUBY_RELEASE_DAY 1 +#define RUBY_RELEASE_DAY 7 #include "ruby/version.h" |