* parse.y (string_content): cond_stack and cmdarg_stack are VALUE.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27391 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index eb0c8fa2f9..9bbfa722d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Apr 18 22:13:21 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (string_content): cond_stack and cmdarg_stack are VALUE.
+
 Sun Apr 18 18:07:47 2010  Tanaka Akira  <akr@fsij.org>
 
 	* lib/resolv.rb (Resolv::IPv4::Regex): make it only accept 0 to 255.
diff --git a/parse.y b/parse.y
index 6a33f08e35..3d8ec4100c 100644
--- a/parse.y
+++ b/parse.y
@@ -4030,8 +4030,8 @@ string_content	: tSTRING_CONTENT
 		    }
 		| tSTRING_DBEG
 		    {
-			$<num>1 = cond_stack;
-			$<num>$ = cmdarg_stack;
+			$<val>1 = cond_stack;
+			$<val>$ = cmdarg_stack;
 			cond_stack = 0;
 			cmdarg_stack = 0;
 		    }
@@ -4042,8 +4042,8 @@ string_content	: tSTRING_CONTENT
 		    }
 		  compstmt '}'
 		    {
-			cond_stack = $<num>1;
-			cmdarg_stack = $<num>2;
+			cond_stack = $<val>1;
+			cmdarg_stack = $<val>2;
 			lex_strterm = $<node>3;
 		    /*%%%*/
 			if ($4) $4->flags &= ~NODE_FL_NEWLINE;