nobu	2010-12-05 11:27:13 +0900 (Sun, 05 Dec 2010)

  New Revision: 30084

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30084

  Log:
    * ruby.c (load_file_internal): decrement for ungotten line.
      [ruby-dev:42680]

  Modified files:
    trunk/ChangeLog
    trunk/ruby.c
    trunk/test/ruby/test_rubyoptions.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30083)
+++ ChangeLog	(revision 30084)
@@ -1,3 +1,8 @@
+Sun Dec  5 11:27:08 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ruby.c (load_file_internal): decrement for ungotten line.
+	  [ruby-dev:42680]
+
 Sun Dec  5 10:32:11 2010  Tanaka Akira  <akr@f...>
 
 	* complex.c: parenthesize macro arguments.
Index: ruby.c
===================================================================
--- ruby.c	(revision 30083)
+++ ruby.c	(revision 30084)
@@ -1551,6 +1551,7 @@
 	rb_funcall(f, set_encoding, 1, rb_enc_from_encoding(enc));
 
 	if (xflag || opt->xflag) {
+	    line_start--;
 	  search_shebang:
 	    forbid_setid("-x");
 	    opt->xflag = FALSE;
Index: test/ruby/test_rubyoptions.rb
===================================================================
--- test/ruby/test_rubyoptions.rb	(revision 30083)
+++ test/ruby/test_rubyoptions.rb	(revision 30084)
@@ -271,6 +271,12 @@
       assert_equal("\"\u3042\"", r.join.force_encoding(Encoding::UTF_8))
       assert_equal([], e)
     end
+
+    bug4118 = '[ruby-dev:42680]'
+    assert_in_out_err(%w[], "#!/bin/sh\n""#!shebang\n""#!ruby\n""puts __LINE__\n",
+                      %w[4], [], bug4118)
+    assert_in_out_err(%w[-x], "#!/bin/sh\n""#!shebang\n""#!ruby\n""puts __LINE__\n",
+                      %w[4], [], bug4118)
   end
 
   def test_sflag

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/