summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-16 12:58:41 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-16 12:58:41 +0000
commit5bcfcce7b4c4a87e1af65d2f218e9d8252e16a48 (patch)
tree2e42011a78d286e9ad736c16a616c740b0d1e714
parent1da4c6fa26f2d01681dcee57940d53c8f4181512 (diff)
* ext/stringio/stringio.c (strio_each, strio_readlines): IO#each and
IO#readlines do not affect $_. [ruby-core:17277] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@17366 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/stringio/stringio.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c0ff4b855..7a64a0d011 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 16 21:58:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/stringio/stringio.c (strio_each, strio_readlines): IO#each and
+ IO#readlines do not affect $_. [ruby-core:17277]
+
Mon Jun 16 14:46:25 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/e2mmap.rb (E2MM.def_e2message): typo.
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 484b299e53..7838c51aa2 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -1016,7 +1016,6 @@ strio_each(argc, argv, self)
RETURN_ENUMERATOR(self, argc, argv);
while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
- rb_lastline_set(line);
rb_yield(line);
}
return self;
@@ -1039,7 +1038,6 @@ strio_readlines(argc, argv, self)
while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
rb_ary_push(ary, line);
}
- rb_lastline_set(Qnil);
return ary;
}