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 (dyna_init_gen): dvar initialization only if dvar is

Browse source 
assigned inner block.  [ruby-talk:227402]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2006-12-04 08:03:54 +00:00
parent f5d69fc57c
commit b52503466d
2 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Dec 4 10:43:46 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (dyna_init_gen): dvar initialization only if dvar is
assigned inner block. [ruby-talk:227402]
Mon Dec 4 08:32:49 2006 Shugo Maeda <shugo@ruby-lang.org>
* lib/cgi.rb (CGI::QueryExtension::read_multipart): should quote

24
parse.y
View file

@ -4861,6 +4861,8 @@ gettable(id)
return 0;
}
static VALUE dyna_var_lookup _((ID id));
static NODE*
assignable(id, val)
ID id;
@ -4889,7 +4891,7 @@ assignable(id, val)
if (rb_dvar_curr(id)) {
return NEW_DASGN_CURR(id, val);
}
else if (rb_dvar_defined(id)) {
else if (dyna_var_lookup(id)) {
return NEW_DASGN(id, val);
}
else if (local_id(id) || !dyna_in_block()) {
@ -5731,6 +5733,22 @@ top_local_setup()
local_pop();
}
static VALUE
dyna_var_lookup(id)
ID id;
{
struct RVarmap *vars = ruby_dyna_vars;
while (vars) {
if (vars->id == id) {
vars->val = Qtrue;
return Qtrue;
}
vars = vars->next;
}
return Qfalse;
}
static struct RVarmap*
dyna_push()
{
@ -5765,7 +5783,9 @@ dyna_init(node, pre)
if (!node || !post || pre == post) return node;
for (var = 0; post != pre && post->id; post = post->next) {
var = NEW_DASGN_CURR(post->id, var);
if (RTEST(post->val)) {
var = NEW_DASGN_CURR(post->id, var);
}
}
return block_append(var, node);
}