From c42c08bb72466be67cecd732c6325447bcfc57cf Mon Sep 17 00:00:00 2001
From: Ryan Davis <ryand@zenspider.com>
Date: Mon, 22 Aug 2011 15:45:07 -0800
Subject: [PATCH] - Fixed line numbers for certain call/iter edge cases
 [git-p4: depot-paths = "//src/ruby_parser/dev/": change = 6568]

---
 lib/ruby_parser.y | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/ruby_parser.y b/lib/ruby_parser.y
index f3f7f625..fa19c0ab 100644
--- a/lib/ruby_parser.y
+++ b/lib/ruby_parser.y
@@ -987,7 +987,7 @@ rule
                       call = new_call(nil, oper.to_sym)
                       iter.insert 1, call
                       result = iter
-                      call.line ||= iter.line
+                      call.line = iter.line
                     }
                 | method_call
                 | method_call brace_block
@@ -1203,6 +1203,7 @@ rule
         do_block: kDO_BLOCK
                     {
                       self.env.extend :dynamic
+                      result = self.lexer.lineno
                     }
                     opt_block_var
                     {
@@ -1213,6 +1214,7 @@ rule
                       vars   = val[2]
                       body   = val[4]
                       result = new_iter nil, vars, body
+                      result.line = val[1]
 
                       self.env.unextend
                     }