kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

parse.y: mlhs_add_post

Browse source 
* 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
This commit is contained in:
nobu 2017-07-01 01:51:17 +00:00
parent 9ded671461
commit 844ca35a92
2 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
parse.y
View file

@ -691,13 +691,12 @@ static void ripper_error_gen(struct parser_params *parser);
#define mlhs_new() dispatch0(mlhs_new) #define mlhs_new() dispatch0(mlhs_new)
#define mlhs_add(l,a) dispatch2(mlhs_add, (l), (a)) #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_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) \ #define params_new(pars, opts, rest, pars2, kws, kwrest, blk) \
dispatch7(params, (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_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_optarg(m,a) ((a)==Qundef ? (m) : dispatch2(method_add_arg,(m),(a)))
#define method_arg(m,a) 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)); $$ = NEW_MASGN($1, NEW_POSTARG($3,$5));
/*% /*%
$1 = mlhs_add_star($1, $3); $1 = mlhs_add_star($1, $3);
$$ = mlhs_add($1, $5); $$ = mlhs_add_post($1, $5);
%*/ %*/
} }
| mlhs_head tSTAR | mlhs_head tSTAR
@ -1619,7 +1618,7 @@ mlhs_basic : mlhs_head
$$ = NEW_MASGN($1, NEW_POSTARG(-1, $4)); $$ = NEW_MASGN($1, NEW_POSTARG(-1, $4));
/*% /*%
$1 = mlhs_add_star($1, Qnil); $1 = mlhs_add_star($1, Qnil);
$$ = mlhs_add($1, $4); $$ = mlhs_add_post($1, $4);
%*/ %*/
} }
| tSTAR mlhs_node | tSTAR mlhs_node
@ -1636,7 +1635,7 @@ mlhs_basic : mlhs_head
$$ = NEW_MASGN(0, NEW_POSTARG($2,$4)); $$ = NEW_MASGN(0, NEW_POSTARG($2,$4));
/*% /*%
$2 = mlhs_add_star(mlhs_new(), $2); $2 = mlhs_add_star(mlhs_new(), $2);
$$ = mlhs_add($2, $4); $$ = mlhs_add_post($2, $4);
%*/ %*/
} }
| tSTAR | tSTAR
@ -1653,7 +1652,7 @@ mlhs_basic : mlhs_head
$$ = NEW_MASGN(0, NEW_POSTARG(-1, $3)); $$ = NEW_MASGN(0, NEW_POSTARG(-1, $3));
/*% /*%
$$ = mlhs_add_star(mlhs_new(), Qnil); $$ = mlhs_add_star(mlhs_new(), Qnil);
$$ = mlhs_add($$, $3); $$ = mlhs_add_post($$, $3);
%*/ %*/
} }
; ;

31
test/ripper/test_parser_events.rb
View file

@ -474,19 +474,42 @@ class TestRipper::ParserEvents < Test::Unit::TestCase
thru_mlhs_add_star = false thru_mlhs_add_star = false
tree = parse("a, *b, c = 1, 2", :on_mlhs_add_star) {thru_mlhs_add_star = true} tree = parse("a, *b, c = 1, 2", :on_mlhs_add_star) {thru_mlhs_add_star = true}
assert_equal true, thru_mlhs_add_star 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 thru_mlhs_add_star = false
tree = parse("a, *, c = 1, 2", :on_mlhs_add_star) {thru_mlhs_add_star = true} tree = parse("a, *, c = 1, 2", :on_mlhs_add_star) {thru_mlhs_add_star = true}
assert_equal true, thru_mlhs_add_star 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 thru_mlhs_add_star = false
tree = parse("*b, c = 1, 2", :on_mlhs_add_star) {thru_mlhs_add_star = true} tree = parse("*b, c = 1, 2", :on_mlhs_add_star) {thru_mlhs_add_star = true}
assert_equal true, thru_mlhs_add_star 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 thru_mlhs_add_star = false
tree = parse("*, c = 1, 2", :on_mlhs_add_star) {thru_mlhs_add_star = true} tree = parse("*, c = 1, 2", :on_mlhs_add_star) {thru_mlhs_add_star = true}
assert_equal true, thru_mlhs_add_star 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 end
def test_mlhs_new def test_mlhs_new