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
commit51fbc0699cb972d6f328b15ddfd2173bb8cebe70 (patch)
tree0768fe20ab3780ccdd4d0b52d42a545ed07e8505
parent82543dbc999091c921cd1ce76ed84ff79e306937 (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/trunk@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 643c4ed309..5ba0d01d69 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 18:52:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/thwait.rb (ThreadsWait): Exception2MessageMapper no longer has
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index d140ced7e7..b9c7eb7f80 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -953,7 +953,6 @@ strio_each(int argc, VALUE *argv, VALUE 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;
@@ -975,7 +974,6 @@ strio_readlines(int argc, VALUE *argv, VALUE self)
while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
rb_ary_push(ary, line);
}
- rb_lastline_set(Qnil);
return ary;
}