ruby-changes:2263
From: ko1@a...
Date: 23 Oct 2007 00:29:30 +0900
Subject: [ruby-changes:2263] matz - Ruby:r13754 (trunk): * enum.c (enum_cycle): hide temporary array from ObjectSpace.
matz 2007-10-23 00:29:17 +0900 (Tue, 23 Oct 2007)
New Revision: 13754
Modified files:
trunk/ChangeLog
trunk/enum.c
trunk/version.h
Log:
* enum.c (enum_cycle): hide temporary array from ObjectSpace.
[ruby-core:12762]
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=13754&r2=13753
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13754&r2=13753
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enum.c?r1=13754&r2=13753
Index: ChangeLog
===================================================================
--- ChangeLog (revision 13753)
+++ ChangeLog (revision 13754)
@@ -16,6 +16,11 @@
* encoding.c (set_primary_encoding): removed primary_encoding setter.
+Sat Oct 20 13:17:01 2007 Yukihiro Matsumoto <matz@r...>
+
+ * enum.c (enum_cycle): hide temporary array from ObjectSpace.
+ [ruby-core:12762]
+
Sat Oct 20 11:49:20 2007 Nobuyoshi Nakada <nobu@r...>
* file.c (rb_get_path): returns frozen string.
Index: enum.c
===================================================================
--- enum.c (revision 13753)
+++ enum.c (revision 13754)
@@ -1541,17 +1541,20 @@
enum_cycle(VALUE obj)
{
VALUE ary;
- long i;
+ long i, len;
RETURN_ENUMERATOR(obj, 0, 0);
ary = rb_ary_new();
+ RBASIC(ary)->klass = 0;
rb_block_call(obj, id_each, 0, 0, cycle_i, ary);
- while (RARRAY_LEN(ary) > 0) {
- for (i=0; i<RARRAY_LEN(ary); i++) {
+ len = RARRAY_LEN(ary);
+ if (len == 0) return Qnil;
+ for (;;) {
+ for (i=0; i<len; i++) {
rb_yield(RARRAY_PTR(ary)[i]);
}
}
- return Qnil;
+ return Qnil; /* not reached */
}
/*
Index: version.h
===================================================================
--- version.h (revision 13753)
+++ version.h (revision 13754)
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-10-22"
+#define RUBY_RELEASE_DATE "2007-10-23"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20071022
+#define RUBY_RELEASE_CODE 20071023
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 23
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml