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

* parse.y (cond0): warn only range literals whose both side are

Browse Source 
literals.  [ruby-core:00964]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3688 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2003-04-17 05:22:40 +00:00
parent 05654dddc4
commit ecdf51dfc4
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Apr 17 14:22:36 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* parse.y (cond0): warn only range literals whose both side are
literals. [ruby-core:00964]
Thu Apr 17 11:10:59 2003 WATANABE Hirofumi <eban@ruby-lang.org> Thu Apr 17 11:10:59 2003 WATANABE Hirofumi <eban@ruby-lang.org>
* ext/readline/readline.c: add the defined operator for bcc32. * ext/readline/readline.c: add the defined operator for bcc32.

35
parse.y
View File

@ -5196,6 +5196,28 @@ range_op(node)
return node; return node;
} }
static int
literal_node(node)
NODE *node;
{
if (!node) return 1; /* same as NODE_NIL */
switch (nd_type(node)) {
case NODE_LIT:
case NODE_STR:
case NODE_DSTR:
case NODE_EVSTR:
case NODE_DREGX:
case NODE_DREGX_ONCE:
case NODE_DSYM:
return 2;
case NODE_TRUE:
case NODE_FALSE:
case NODE_NIL:
return 1;
}
return 0;
}
static NODE* static NODE*
cond0(node) cond0(node)
NODE *node; NODE *node;
@ -5206,6 +5228,7 @@ cond0(node)
switch (type) { switch (type) {
case NODE_DSTR: case NODE_DSTR:
case NODE_EVSTR:
case NODE_STR: case NODE_STR:
rb_warn("string literal in condition"); rb_warn("string literal in condition");
break; break;
@ -5230,7 +5253,17 @@ cond0(node)
if (type == NODE_DOT2) nd_set_type(node,NODE_FLIP2); if (type == NODE_DOT2) nd_set_type(node,NODE_FLIP2);
else if (type == NODE_DOT3) nd_set_type(node, NODE_FLIP3); else if (type == NODE_DOT3) nd_set_type(node, NODE_FLIP3);
node->nd_cnt = local_append(internal_id()); node->nd_cnt = local_append(internal_id());
warning_unless_e_option("range literal in condition"); if (!e_option_supplied()) {
int b = literal_node(node->nd_beg);
int e = literal_node(node->nd_end);
if ((b == 1 && e == 1) || (b + e >= 2 && RTEST(ruby_verbose))) {
rb_warn("range literal in condition");
}
}
break;
case NODE_DSYM:
rb_warning("literal in condition");
break; break;
case NODE_LIT: case NODE_LIT: