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 (stmt, primary): get rid of SEGV at empty or invalid

Browse source 
condition.  (ruby-bugs-ja:PR#410)

* parse.y (cond_negative): negate condition node when NODE_NOT.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3585 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2003-03-20 07:03:22 +00:00
parent 85dd7bb0ef
commit bf12ea0deb
2 changed files with 36 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Thu Mar 20 16:03:18 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* parse.y (stmt, primary): get rid of SEGV at empty or invalid
condition. (ruby-bugs-ja:PR#410)
* parse.y (cond_negative): negate condition node when NODE_NOT.
Thu Mar 20 10:45:29 2003 Tanaka Akira <akr@m17n.org> Thu Mar 20 10:45:29 2003 Tanaka Akira <akr@m17n.org>
* eval.c (bmcall): add volatile to avoid GC problem. * eval.c (bmcall): add volatile to avoid GC problem.

45
parse.y
View file

@ -116,6 +116,7 @@ static int quoted_term;
static NODE *cond(); static NODE *cond();
static NODE *logop(); static NODE *logop();
static int cond_negative();
static NODE *newline_node(); static NODE *newline_node();
static void fixpos(); static void fixpos();
@ -409,8 +410,7 @@ stmt : kALIAS fitem {lex_state = EXPR_FNAME;} fitem
{ {
$$ = NEW_IF(cond($3), $1, 0); $$ = NEW_IF(cond($3), $1, 0);
fixpos($$, $3); fixpos($$, $3);
if (nd_type($$->nd_cond) == NODE_NOT) { if (cond_negative(&$$->nd_cond)) {
$$->nd_cond = $$->nd_cond->nd_body;
$$->nd_else = $$->nd_body; $$->nd_else = $$->nd_body;
$$->nd_body = 0; $$->nd_body = 0;
} }
@ -419,8 +419,7 @@ stmt : kALIAS fitem {lex_state = EXPR_FNAME;} fitem
{ {
$$ = NEW_UNLESS(cond($3), $1, 0); $$ = NEW_UNLESS(cond($3), $1, 0);
fixpos($$, $3); fixpos($$, $3);
if (nd_type($$->nd_cond) == NODE_NOT) { if (cond_negative(&$$->nd_cond)) {
$$->nd_cond = $$->nd_cond->nd_body;
$$->nd_body = $$->nd_else; $$->nd_body = $$->nd_else;
$$->nd_else = 0; $$->nd_else = 0;
} }
@ -433,8 +432,7 @@ stmt : kALIAS fitem {lex_state = EXPR_FNAME;} fitem
else { else {
$$ = NEW_WHILE(cond($3), $1, 1); $$ = NEW_WHILE(cond($3), $1, 1);
} }
if (nd_type($$->nd_cond) == NODE_NOT) { if (cond_negative(&$$->nd_cond)) {
$$->nd_cond = $$->nd_cond->nd_body;
nd_set_type($$, NODE_UNTIL); nd_set_type($$, NODE_UNTIL);
} }
} }
@ -446,8 +444,7 @@ stmt : kALIAS fitem {lex_state = EXPR_FNAME;} fitem
else { else {
$$ = NEW_UNTIL(cond($3), $1, 1); $$ = NEW_UNTIL(cond($3), $1, 1);
} }
if (nd_type($$->nd_cond) == NODE_NOT) { if (cond_negative(&$$->nd_cond)) {
$$->nd_cond = $$->nd_cond->nd_body;
nd_set_type($$, NODE_WHILE); nd_set_type($$, NODE_WHILE);
} }
} }
@ -1494,9 +1491,8 @@ primary : literal
{ {
$$ = NEW_IF(cond($2), $4, $5); $$ = NEW_IF(cond($2), $4, $5);
fixpos($$, $2); fixpos($$, $2);
if (nd_type($$->nd_cond) == NODE_NOT) { if (cond_negative(&$$->nd_cond)) {
NODE *tmp = $$->nd_body; NODE *tmp = $$->nd_body;
$$->nd_cond = $$->nd_cond->nd_body;
$$->nd_body = $$->nd_else; $$->nd_body = $$->nd_else;
$$->nd_else = tmp; $$->nd_else = tmp;
} }
@ -1508,9 +1504,8 @@ primary : literal
{ {
$$ = NEW_UNLESS(cond($2), $4, $5); $$ = NEW_UNLESS(cond($2), $4, $5);
fixpos($$, $2); fixpos($$, $2);
if (nd_type($$->nd_cond) == NODE_NOT) { if (cond_negative(&$$->nd_cond)) {
NODE *tmp = $$->nd_body; NODE *tmp = $$->nd_body;
$$->nd_cond = $$->nd_cond->nd_body;
$$->nd_body = $$->nd_else; $$->nd_body = $$->nd_else;
$$->nd_else = tmp; $$->nd_else = tmp;
} }
@ -1521,8 +1516,7 @@ primary : literal
{ {
$$ = NEW_WHILE(cond($3), $6, 1); $$ = NEW_WHILE(cond($3), $6, 1);
fixpos($$, $3); fixpos($$, $3);
if (nd_type($$->nd_cond) == NODE_NOT) { if (cond_negative(&$$->nd_cond)) {
$$->nd_cond = $$->nd_cond->nd_body;
nd_set_type($$, NODE_UNTIL); nd_set_type($$, NODE_UNTIL);
} }
} }
@ -1532,8 +1526,7 @@ primary : literal
{ {
$$ = NEW_UNTIL(cond($3), $6, 1); $$ = NEW_UNTIL(cond($3), $6, 1);
fixpos($$, $3); fixpos($$, $3);
if (nd_type($$->nd_cond) == NODE_NOT) { if (cond_negative(&$$->nd_cond)) {
$$->nd_cond = $$->nd_cond->nd_body;
nd_set_type($$, NODE_WHILE); nd_set_type($$, NODE_WHILE);
} }
} }
@ -5287,6 +5280,26 @@ logop(type, left, right)
return rb_node_newnode(type, left, right, 0); return rb_node_newnode(type, left, right, 0);
} }
static int
cond_negative(nodep)
NODE **nodep;
{
NODE *c = *nodep;
if (!c) return 0;
switch (nd_type(c)) {
case NODE_NOT:
*nodep = c->nd_body;
return 1;
case NODE_NEWLINE:
if (c->nd_next && nd_type(c->nd_next) == NODE_NOT) {
c->nd_next = c->nd_next->nd_body;
return 1;
}
}
return 0;
}
static NODE * static NODE *
ret_args(node) ret_args(node)
NODE *node; NODE *node;