summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-29 08:21:46 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-29 08:21:46 (GMT)
commitdf1b7c729fc0701b2c371b78650f26acf0ec3398 (patch)
tree7453e7301495731829ec04f4941557fc165f1a1f
parent04c232c95c78cbcaab48780a209325fed8511a3c (diff)
merge revision(s) 17366:
* 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_6@17662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/stringio/stringio.c2
-rw-r--r--version.h2
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 97893aa..0d55265 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 29 17:21:08 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]
+
Sun Jun 29 17:18:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/stringio/stringio.c (strio_readline, strio_each)
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 011ccb7..86ff565 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -969,7 +969,6 @@ strio_each(argc, argv, self)
VALUE line;
while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
- rb_lastline_set(line);
rb_yield(line);
}
return self;
@@ -992,7 +991,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;
}
diff --git a/version.h b/version.h
index 9a12c0c..3bfe801 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-29"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20080629
-#define RUBY_PATCHLEVEL 243
+#define RUBY_PATCHLEVEL 244
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8