From f63c7b7cc7977e9661c3fdb72ff3d938be7154c9 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 10 Jun 2007 07:58:09 +0000
Subject: * parse.y (do_block, brace_block): fix line numbers. 
 [ruby-dev:30831]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12512 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 parse.y | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 14a081a06..6fcc6987b 100644
--- a/parse.y
+++ b/parse.y
@@ -2516,7 +2516,7 @@ primary		: literal
 		| keyword_begin
 		    {
 		    /*%%%*/
-			$<num>1 = ruby_sourceline;
+			$<num>$ = ruby_sourceline;
 		    /*%
 		    %*/
 		    }
@@ -2530,10 +2530,10 @@ primary		: literal
 			else {
 			    if (nd_type($3) == NODE_RESCUE ||
 				nd_type($3) == NODE_ENSURE)
-				nd_set_line($3, $<num>1);
+				nd_set_line($3, $<num>2);
 			    $$ = NEW_BEGIN($3);
 			}
-			nd_set_line($$, $<num>1);
+			nd_set_line($$, $<num>2);
 		    /*%
 			$$ = dispatch1(begin, $3);
 		    %*/
@@ -3292,7 +3292,7 @@ do_block	: keyword_do_block
 		    {
 		    /*%%%*/
 			dyna_push();
-			$<num>1 = ruby_sourceline;
+			$<num>$ = ruby_sourceline;
 		    /*% %*/
 		    }
 		  opt_block_param
@@ -3301,7 +3301,7 @@ do_block	: keyword_do_block
 		    {
 		    /*%%%*/
 			$$ = NEW_ITER($3,$4);
-			nd_set_line($$, $<num>1);
+			nd_set_line($$, $<num>2);
 			dyna_pop();
 		    /*%
 			$$ = dispatch2(do_block, escape_Qundef($3), $5);
@@ -3433,7 +3433,7 @@ brace_block	: '{'
 		    {
 		    /*%%%*/
 			dyna_push();
-			$<num>1 = ruby_sourceline;
+			$<num>$ = ruby_sourceline;
 		    /*% %*/
 		    }
 		  opt_block_param
@@ -3451,7 +3451,7 @@ brace_block	: '{'
 		    {
 		    /*%%%*/
 			dyna_push();
-			$<num>1 = ruby_sourceline;
+			$<num>$ = ruby_sourceline;
 		    /*% %*/
 		    }
 		  opt_block_param
-- 
cgit