1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Bug #19877] Flip-flop needs to be direct condition

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2023-12-07 20:04:33 +09:00
parent 8bb90f4d77
commit 9b7a964318
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
parse.y
View File

@ -14108,7 +14108,7 @@ enum cond_type {
} \ } \
} while (0) } while (0)
static NODE *cond0(struct parser_params*,NODE*,enum cond_type,const YYLTYPE*); static NODE *cond0(struct parser_params*,NODE*,enum cond_type,const YYLTYPE*,bool);
static NODE* static NODE*
range_op(struct parser_params *p, NODE *node, const YYLTYPE *loc) range_op(struct parser_params *p, NODE *node, const YYLTYPE *loc)
@ -14124,11 +14124,11 @@ range_op(struct parser_params *p, NODE *node, const YYLTYPE *loc)
ID lineno = rb_intern("$."); ID lineno = rb_intern("$.");
return NEW_CALL(node, tEQ, NEW_LIST(NEW_GVAR(lineno, loc), loc), loc); return NEW_CALL(node, tEQ, NEW_LIST(NEW_GVAR(lineno, loc), loc), loc);
} }
return cond0(p, node, COND_IN_FF, loc); return cond0(p, node, COND_IN_FF, loc, true);
} }
static NODE* static NODE*
cond0(struct parser_params *p, NODE *node, enum cond_type type, const YYLTYPE *loc) cond0(struct parser_params *p, NODE *node, enum cond_type type, const YYLTYPE *loc, bool top)
{ {
if (node == 0) return 0; if (node == 0) return 0;
if (!(node = nd_once_body(node))) return 0; if (!(node = nd_once_body(node))) return 0;
@ -14136,7 +14136,7 @@ cond0(struct parser_params *p, NODE *node, enum cond_type type, const YYLTYPE *l
switch (nd_type(node)) { switch (nd_type(node)) {
case NODE_BEGIN: case NODE_BEGIN:
RNODE_BEGIN(node)->nd_body = cond0(p, RNODE_BEGIN(node)->nd_body, type, loc); RNODE_BEGIN(node)->nd_body = cond0(p, RNODE_BEGIN(node)->nd_body, type, loc, top);
break; break;
case NODE_DSTR: case NODE_DSTR:
@ -14151,17 +14151,18 @@ cond0(struct parser_params *p, NODE *node, enum cond_type type, const YYLTYPE *l
return NEW_MATCH2(node, NEW_GVAR(idLASTLINE, loc), loc); return NEW_MATCH2(node, NEW_GVAR(idLASTLINE, loc), loc);
case NODE_BLOCK: case NODE_BLOCK:
RNODE_BLOCK(RNODE_BLOCK(node)->nd_end)->nd_head = cond0(p, RNODE_BLOCK(RNODE_BLOCK(node)->nd_end)->nd_head, type, loc); RNODE_BLOCK(RNODE_BLOCK(node)->nd_end)->nd_head = cond0(p, RNODE_BLOCK(RNODE_BLOCK(node)->nd_end)->nd_head, type, loc, false);
break; break;
case NODE_AND: case NODE_AND:
case NODE_OR: case NODE_OR:
RNODE_AND(node)->nd_1st = cond0(p, RNODE_AND(node)->nd_1st, COND_IN_COND, loc); RNODE_AND(node)->nd_1st = cond0(p, RNODE_AND(node)->nd_1st, COND_IN_COND, loc, true);
RNODE_AND(node)->nd_2nd = cond0(p, RNODE_AND(node)->nd_2nd, COND_IN_COND, loc); RNODE_AND(node)->nd_2nd = cond0(p, RNODE_AND(node)->nd_2nd, COND_IN_COND, loc, true);
break; break;
case NODE_DOT2: case NODE_DOT2:
case NODE_DOT3: case NODE_DOT3:
if (!top) break;
RNODE_DOT2(node)->nd_beg = range_op(p, RNODE_DOT2(node)->nd_beg, loc); RNODE_DOT2(node)->nd_beg = range_op(p, RNODE_DOT2(node)->nd_beg, loc);
RNODE_DOT2(node)->nd_end = range_op(p, RNODE_DOT2(node)->nd_end, loc); RNODE_DOT2(node)->nd_end = range_op(p, RNODE_DOT2(node)->nd_end, loc);
if (nd_type_p(node, NODE_DOT2)) nd_set_type(node,NODE_FLIP2); if (nd_type_p(node, NODE_DOT2)) nd_set_type(node,NODE_FLIP2);
@ -14198,14 +14199,14 @@ static NODE*
cond(struct parser_params *p, NODE *node, const YYLTYPE *loc) cond(struct parser_params *p, NODE *node, const YYLTYPE *loc)
{ {
if (node == 0) return 0; if (node == 0) return 0;
return cond0(p, node, COND_IN_COND, loc); return cond0(p, node, COND_IN_COND, loc, true);
} }
static NODE* static NODE*
method_cond(struct parser_params *p, NODE *node, const YYLTYPE *loc) method_cond(struct parser_params *p, NODE *node, const YYLTYPE *loc)
{ {
if (node == 0) return 0; if (node == 0) return 0;
return cond0(p, node, COND_IN_OP, loc); return cond0(p, node, COND_IN_OP, loc, true);
} }
static NODE* static NODE*
@ -14219,7 +14220,7 @@ static NODE*
new_if(struct parser_params *p, NODE *cc, NODE *left, NODE *right, const YYLTYPE *loc) new_if(struct parser_params *p, NODE *cc, NODE *left, NODE *right, const YYLTYPE *loc)
{ {
if (!cc) return right; if (!cc) return right;
cc = cond0(p, cc, COND_IN_COND, loc); cc = cond0(p, cc, COND_IN_COND, loc, true);
return newline_node(NEW_IF(cc, left, right, loc)); return newline_node(NEW_IF(cc, left, right, loc));
} }
@ -14227,7 +14228,7 @@ static NODE*
new_unless(struct parser_params *p, NODE *cc, NODE *left, NODE *right, const YYLTYPE *loc) new_unless(struct parser_params *p, NODE *cc, NODE *left, NODE *right, const YYLTYPE *loc)
{ {
if (!cc) return right; if (!cc) return right;
cc = cond0(p, cc, COND_IN_COND, loc); cc = cond0(p, cc, COND_IN_COND, loc, true);
return newline_node(NEW_UNLESS(cc, left, right, loc)); return newline_node(NEW_UNLESS(cc, left, right, loc));
} }

20
test/ruby/test_parse.rb
View File

@ -466,21 +466,25 @@ class TestParse < Test::Unit::TestCase
end end
def test_flip_flop def test_flip_flop
[ all_assertions_foreach(nil,
'((cond1..cond2))', ['(cond1..cond2)', true],
'(; cond1..cond2)', ['((cond1..cond2))', true],
# '(;;;cond1..cond2)', # don't care
'(1; cond1..cond2)', '(1; cond1..cond2)',
'(%s(); cond1..cond2)', '(%s(); cond1..cond2)',
'(%w(); cond1..cond2)', '(%w(); cond1..cond2)',
'(1; (2; (3; 4; cond1..cond2)))', '(1; (2; (3; 4; cond1..cond2)))',
'(1+1; cond1..cond2)', '(1+1; cond1..cond2)',
].each do |code| ) do |code, pass|
code = code.sub("cond1", "n==4").sub("cond2", "n==5") code = code.sub("cond1", "n==4").sub("cond2", "n==5")
begin if pass
$VERBOSE, verbose_bak = nil, $VERBOSE
assert_equal([4,5], eval("(1..9).select {|n| true if #{code}}")) assert_equal([4,5], eval("(1..9).select {|n| true if #{code}}"))
ensure else
$VERBOSE = verbose_bak assert_raise_with_message(ArgumentError, /bad value for range/, code) {
eval("[4].each {|n| true if #{code}}")
}
end end
end end
end end