diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-01 01:51:17 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-01 01:51:17 +0000 |
| commit | 64aad5e733c08df3f82e94d3e313983321a33bad (patch) | |
| tree | dc6a35d47a52246f32db8815a3cd8799b16e21c3 | |
| parent | 73ac1bd971b25880f1293f96c26906d1180d1241 (diff) | |
| download | ruby-64aad5e733c08df3f82e94d3e313983321a33bad.tar.gz | |
parse.y: mlhs_add_post
* parse.y (mlhs_add_post): new parser event corresponding to
POSTARG.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59245 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | parse.y | 11 | ||||
| -rw-r--r-- | test/ripper/test_parser_events.rb | 31 |
2 files changed, 32 insertions, 10 deletions
@@ -691,13 +691,12 @@ static void ripper_error_gen(struct parser_params *parser); #define mlhs_new() dispatch0(mlhs_new) #define mlhs_add(l,a) dispatch2(mlhs_add, (l), (a)) #define mlhs_add_star(l,a) dispatch2(mlhs_add_star, (l), (a)) +#define mlhs_add_post(l,a) dispatch2(mlhs_add_post, (l), (a)) #define params_new(pars, opts, rest, pars2, kws, kwrest, blk) \ dispatch7(params, (pars), (opts), (rest), (pars2), (kws), (kwrest), (blk)) #define blockvar_new(p,v) dispatch2(block_var, (p), (v)) -#define blockvar_add_star(l,a) dispatch2(block_var_add_star, (l), (a)) -#define blockvar_add_block(l,a) dispatch2(block_var_add_block, (l), (a)) #define method_optarg(m,a) ((a)==Qundef ? (m) : dispatch2(method_add_arg,(m),(a))) #define method_arg(m,a) dispatch2(method_add_arg,(m),(a)) @@ -1602,7 +1601,7 @@ mlhs_basic : mlhs_head $$ = NEW_MASGN($1, NEW_POSTARG($3,$5)); /*% $1 = mlhs_add_star($1, $3); - $$ = mlhs_add($1, $5); + $$ = mlhs_add_post($1, $5); %*/ } | mlhs_head tSTAR @@ -1619,7 +1618,7 @@ mlhs_basic : mlhs_head $$ = NEW_MASGN($1, NEW_POSTARG(-1, $4)); /*% $1 = mlhs_add_star($1, Qnil); - $$ = mlhs_add($1, $4); + $$ = mlhs_add_post($1, $4); %*/ } | tSTAR mlhs_node @@ -1636,7 +1635,7 @@ mlhs_basic : mlhs_head $$ = NEW_MASGN(0, NEW_POSTARG($2,$4)); /*% $2 = mlhs_add_star(mlhs_new(), $2); - $$ = mlhs_add($2, $4); + $$ = mlhs_add_post($2, $4); %*/ } | tSTAR @@ -1653,7 +1652,7 @@ mlhs_basic : mlhs_head $$ = NEW_MASGN(0, NEW_POSTARG(-1, $3)); /*% $$ = mlhs_add_star(mlhs_new(), Qnil); - $$ = mlhs_add($$, $3); + $$ = mlhs_add_post($$, $3); %*/ } ; diff --git a/test/ripper/test_parser_events.rb b/test/ripper/test_parser_events.rb index 94c55aa15e..c2d6a255be 100644 --- a/test/ripper/test_parser_events.rb +++ b/test/ripper/test_parser_events.rb @@ -474,19 +474,42 @@ class TestRipper::ParserEvents < Test::Unit::TestCase thru_mlhs_add_star = false tree = parse("a, *b, c = 1, 2", :on_mlhs_add_star) {thru_mlhs_add_star = true} assert_equal true, thru_mlhs_add_star - assert_include(tree, "massign([a,*b,[c]]", bug2232) + assert_include(tree, "massign([a,*b,c]", bug2232) thru_mlhs_add_star = false tree = parse("a, *, c = 1, 2", :on_mlhs_add_star) {thru_mlhs_add_star = true} assert_equal true, thru_mlhs_add_star - assert_include(tree, "massign([a,*,[c]]", bug4364) + assert_include(tree, "massign([a,*,c]", bug4364) thru_mlhs_add_star = false tree = parse("*b, c = 1, 2", :on_mlhs_add_star) {thru_mlhs_add_star = true} assert_equal true, thru_mlhs_add_star - assert_include(tree, "massign([*b,[c]]", bug4364) + assert_include(tree, "massign([*b,c]", bug4364) thru_mlhs_add_star = false tree = parse("*, c = 1, 2", :on_mlhs_add_star) {thru_mlhs_add_star = true} assert_equal true, thru_mlhs_add_star - assert_include(tree, "massign([*,[c]],", bug4364) + assert_include(tree, "massign([*,c],", bug4364) + end + + def test_mlhs_add_post + thru_mlhs_add_post = false + tree = parse("a, *b = 1, 2", :on_mlhs_add_post) {thru_mlhs_add_post = true} + assert_equal false, thru_mlhs_add_post + assert_include(tree, "massign([a,*b],") + thru_massign_add_post = false + tree = parse("a, *b, c = 1, 2", :on_mlhs_add_post) {thru_mlhs_add_post = true} + assert_equal true, thru_mlhs_add_post + assert_include(tree, "massign([a,*b,c],") + thru_mlhs_add_post = false + tree = parse("a, *, c = 1, 2", :on_mlhs_add_post) {thru_mlhs_add_post = true} + assert_equal true, thru_mlhs_add_post + assert_include(tree, "massign([a,*,c],") + thru_mlhs_add_post = false + tree = parse("*b, c = 1, 2", :on_mlhs_add_post) {thru_mlhs_add_post = true} + assert_equal true, thru_mlhs_add_post + assert_include(tree, "massign([*b,c],") + thru_mlhs_add_post = false + tree = parse("*, c = 1, 2", :on_mlhs_add_post) {thru_mlhs_add_post = true} + assert_equal true, thru_mlhs_add_post + assert_include(tree, "massign([*,c],") end def test_mlhs_new |