summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-27 06:55:06 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-27 06:55:06 +0000
commit782f3bd3f9d89130e7b8486e82e2f7f270833013 (patch)
tree88dfee59eac2e8a0e26a18f71e4333bfe2637820
parent1a863754faed73a0a9ff1a4ce03bf022e94788c1 (diff)
* io.c (argf_init): initial value of $. should be 0.
see [ruby-dev:36937]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19964 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--io.c2
-rw-r--r--test/ruby/test_io.rb2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 157fa41873..5282b620af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 27 15:55:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (argf_init): initial value of $. should be 0.
+ see [ruby-dev:36937].
+
Mon Oct 27 15:38:38 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* test/minitest/test_mini_test.rb
diff --git a/io.c b/io.c
index ff1c74a3e3..6e76f23c8b 100644
--- a/io.c
+++ b/io.c
@@ -5821,7 +5821,7 @@ argf_init(struct argf *p, VALUE v)
{
p->filename = Qnil;
p->current_file = Qnil;
- p->lineno = Qnil;
+ p->lineno = INT2FIX(0);
p->argv = v;
}
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 4d9bb51fe3..4305293a3d 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -812,7 +812,7 @@ class TestIO < Test::Unit::TestCase
f.gets; p $.
end
SRC
- assert_equal("nil,1,2,2,1001,1001,1001,1,2,3,3", f.read.chomp.gsub("\n", ","))
+ assert_equal("0,1,2,2,1001,1001,1001,1,2,3,3", f.read.chomp.gsub("\n", ","))
end
pipe(proc do |w|