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

* eval.c (rb_eval): avoid uninitialized global/class variable

Browse source 
warnings at `||='.  [ruby-dev:18278]

* parse.y (stmt, arg): ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2002-09-13 09:36:28 +00:00
parent 449f885d62
commit 026e185838
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Fri Sep 13 18:35:12 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* eval.c (rb_eval): avoid uninitialized global/class variable
warnings at `||='. [ruby-dev:18278]
* parse.y (stmt, arg): ditto
Fri Sep 13 13:28:04 2002 WATANABE Hirofumi <eban@ruby-lang.org> Fri Sep 13 13:28:04 2002 WATANABE Hirofumi <eban@ruby-lang.org>
* lib/mkmf.rb ($INSTALLFILES): avoid warning when $VERBOSE mode. * lib/mkmf.rb ($INSTALLFILES): avoid warning when $VERBOSE mode.

2
eval.c
View file

@ -2891,7 +2891,7 @@ rb_eval(self, n)
goto again; goto again;
case NODE_OP_ASGN_OR: case NODE_OP_ASGN_OR:
if ((node->nd_aid && !rb_ivar_defined(self, node->nd_aid)) || if ((node->nd_aid && !is_defined(self, node->nd_head, 0)) ||
!RTEST(result = rb_eval(self, node->nd_head))) { !RTEST(result = rb_eval(self, node->nd_head))) {
node = node->nd_value; node = node->nd_value;
goto again; goto again;

9
parse.y
View file

@ -49,6 +49,11 @@
#define is_const_id(id) (is_notop_id(id)&&((id)&ID_SCOPE_MASK)==ID_CONST) #define is_const_id(id) (is_notop_id(id)&&((id)&ID_SCOPE_MASK)==ID_CONST)
#define is_class_id(id) (is_notop_id(id)&&((id)&ID_SCOPE_MASK)==ID_CLASS) #define is_class_id(id) (is_notop_id(id)&&((id)&ID_SCOPE_MASK)==ID_CLASS)
#define is_asgn_or_id(id) ((is_notop_id(id)) && \
(((id)&ID_SCOPE_MASK) == ID_GLOBAL || \
((id)&ID_SCOPE_MASK) == ID_INSTANCE || \
((id)&ID_SCOPE_MASK) == ID_CLASS))
NODE *ruby_eval_tree_begin = 0; NODE *ruby_eval_tree_begin = 0;
NODE *ruby_eval_tree = 0; NODE *ruby_eval_tree = 0;
@ -462,7 +467,7 @@ stmt : kALIAS fitem {lex_state = EXPR_FNAME;} fitem
if ($2 == tOROP) { if ($2 == tOROP) {
$1->nd_value = $3; $1->nd_value = $3;
$$ = NEW_OP_ASGN_OR(gettable(vid), $1); $$ = NEW_OP_ASGN_OR(gettable(vid), $1);
if (is_instance_id(vid)) { if (is_asgn_or_id(vid)) {
$$->nd_aid = vid; $$->nd_aid = vid;
} }
} }
@ -828,7 +833,7 @@ arg : lhs '=' arg
if ($2 == tOROP) { if ($2 == tOROP) {
$1->nd_value = $3; $1->nd_value = $3;
$$ = NEW_OP_ASGN_OR(gettable(vid), $1); $$ = NEW_OP_ASGN_OR(gettable(vid), $1);
if (is_instance_id(vid)) { if (is_asgn_or_id(vid)) {
$$->nd_aid = vid; $$->nd_aid = vid;
} }
} }