From 5a322dfa52418ff829bcef7162fa8f71e8569144 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 14 Dec 2006 14:53:05 +0000
Subject: This commit was manufactured by cvs2svn to create tag 'v1_8_5_9'.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_8_5_9@11389 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 parse.y | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index e2982f2c80..14561ca185 100644
--- a/parse.y
+++ b/parse.y
@@ -1481,7 +1481,8 @@ primary		: literal
 		    }
 		| tLPAREN compstmt ')'
 		    {
-			$$ = $2;
+			if (!$2) $$ = NEW_NIL();
+			else $$ = $2;
 		    }
 		| primary_value tCOLON2 tCONSTANT
 		    {
@@ -4865,6 +4866,8 @@ gettable(id)
     return 0;
 }
 
+static VALUE dyna_var_lookup _((ID id));
+
 static NODE*
 assignable(id, val)
     ID id;
@@ -4893,7 +4896,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()) {
@@ -5735,6 +5738,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()
 {
@@ -5769,7 +5788,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);
 }
-- 
cgit v1.2.3