ruby-changes:4964
From: ko1@a...
Date: Sun, 18 May 2008 23:48:31 +0900 (JST)
Subject: [ruby-changes:4964] knu - Ruby:r16457 (ruby_1_8_7): Merge r16206 and r16239 from ruby_1_8.
knu 2008-05-18 23:48:15 +0900 (Sun, 18 May 2008)
New Revision: 16457
Modified files:
branches/ruby_1_8_7/ChangeLog
branches/ruby_1_8_7/class.c
branches/ruby_1_8_7/eval.c
branches/ruby_1_8_7/intern.h
branches/ruby_1_8_7/re.c
branches/ruby_1_8_7/version.h
Log:
Merge r16206 and r16239 from ruby_1_8.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/eval.c?r1=16457&r2=16456&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/class.c?r1=16457&r2=16456&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/re.c?r1=16457&r2=16456&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ChangeLog?r1=16457&r2=16456&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/version.h?r1=16457&r2=16456&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/intern.h?r1=16457&r2=16456&diff_format=u
Index: ruby_1_8_7/intern.h
===================================================================
--- ruby_1_8_7/intern.h (revision 16456)
+++ ruby_1_8_7/intern.h (revision 16457)
@@ -193,6 +193,8 @@
void rb_obj_call_init _((VALUE, int, VALUE*));
VALUE rb_class_new_instance _((int, VALUE*, VALUE));
VALUE rb_block_proc _((void));
+VALUE rb_block_dup _((VALUE, VALUE, VALUE));
+VALUE rb_method_dup _((VALUE, VALUE, VALUE));
VALUE rb_f_lambda _((void));
VALUE rb_proc_call _((VALUE, VALUE));
VALUE rb_obj_method _((VALUE, VALUE));
Index: ruby_1_8_7/class.c
===================================================================
--- ruby_1_8_7/class.c (revision 16456)
+++ ruby_1_8_7/class.c (revision 16457)
@@ -51,6 +51,7 @@
struct clone_method_data {
st_table *tbl;
VALUE klass;
+ VALUE cref;
};
static int
@@ -61,16 +62,33 @@
{
NODE *fbody = body->nd_body;
- if (fbody && nd_type(fbody) == NODE_SCOPE) {
- VALUE cref = data->klass ?
- (VALUE)NEW_NODE(NODE_CREF,data->klass,0,fbody->nd_rval) :
- fbody->nd_rval;
- fbody = NEW_NODE(NODE_SCOPE, fbody->nd_tbl, cref, fbody->nd_next);
+ if (fbody && data->cref) {
+ VALUE body;
+
+ switch (nd_type(fbody)) {
+ case NODE_SCOPE:
+ if (fbody->nd_rval) {
+ NODE *tmp = NEW_NODE(nd_type(fbody->u2.node), data->cref,
+ fbody->u2.node->u2.node, fbody->u2.node->u3.node);
+ fbody = NEW_NODE(nd_type(fbody), fbody->u1.node, tmp, fbody->u3.node);
+ }
+ break;
+ case NODE_BMETHOD:
+ body = rb_block_dup(fbody->nd_cval, data->klass, data->cref);
+ fbody = NEW_BMETHOD(body);
+ break;
+ case NODE_DMETHOD:
+ body = rb_method_dup(fbody->nd_cval, data->klass, data->cref);
+ fbody = NEW_DMETHOD(body);
+ break;
+ }
}
st_insert(data->tbl, mid, (st_data_t)NEW_METHOD(fbody, body->nd_noex));
return ST_CONTINUE;
}
+static VALUE singleton_class_clone_int _((VALUE, VALUE));
+
/* :nodoc: */
VALUE
rb_mod_init_copy(clone, orig)
@@ -78,8 +96,7 @@
{
rb_obj_init_copy(clone, orig);
if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) {
- RBASIC(clone)->klass = RBASIC(orig)->klass;
- RBASIC(clone)->klass = rb_singleton_class_clone(clone);
+ RBASIC(clone)->klass = singleton_class_clone_int(orig, clone);
}
RCLASS(clone)->super = RCLASS(orig)->super;
if (RCLASS(orig)->iv_tbl) {
@@ -94,9 +111,10 @@
if (RCLASS(orig)->m_tbl) {
struct clone_method_data data;
- data.tbl = RCLASS(clone)->m_tbl = st_init_numtable();
- data.klass = (VALUE)clone;
-
+ RCLASS(clone)->m_tbl = st_init_numtable();
+ data.tbl = RCLASS(clone)->m_tbl;
+ data.klass = clone;
+ data.cref = clone;
st_foreach(RCLASS(orig)->m_tbl, clone_method, (st_data_t)&data);
}
@@ -117,15 +135,16 @@
return rb_mod_init_copy(clone, orig);
}
-VALUE
-rb_singleton_class_clone(obj)
- VALUE obj;
+static VALUE
+singleton_class_clone_int(obj, cref)
+ VALUE obj, cref;
{
VALUE klass = RBASIC(obj)->klass;
if (!FL_TEST(klass, FL_SINGLETON))
return klass;
else {
+ struct clone_method_data data;
/* copy singleton(unnamed) class */
NEWOBJ(clone, struct RClass);
OBJSETUP(clone, 0, RBASIC(klass)->flags);
@@ -143,28 +162,24 @@
if (RCLASS(klass)->iv_tbl) {
clone->iv_tbl = st_copy(RCLASS(klass)->iv_tbl);
}
- {
- struct clone_method_data data;
-
- data.tbl = clone->m_tbl = st_init_numtable();
- switch (TYPE(obj)) {
- case T_CLASS:
- case T_MODULE:
- data.klass = obj;
- break;
- default:
- data.klass = 0;
- break;
- }
-
- st_foreach(RCLASS(klass)->m_tbl, clone_method, (st_data_t)&data);
- }
+ clone->m_tbl = st_init_numtable();
+ data.tbl = clone->m_tbl;
+ data.klass = (VALUE)clone;
+ data.cref = cref;
+ st_foreach(RCLASS(klass)->m_tbl, clone_method, (st_data_t)&data);
rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
FL_SET(clone, FL_SINGLETON);
return (VALUE)clone;
}
}
+VALUE
+rb_singleton_class_clone(obj)
+ VALUE obj;
+{
+ return singleton_class_clone_int(obj, 0);
+}
+
void
rb_singleton_class_attached(klass, obj)
VALUE klass, obj;
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog (revision 16456)
+++ ruby_1_8_7/ChangeLog (revision 16457)
@@ -1,3 +1,18 @@
+Wed Apr 30 17:47:21 2008 Nobuyoshi Nakada <nobu@r...>
+
+ * re.c (rb_reg_search): use local variable. a patch from wanabe
+ <s.wanabe AT gmail.com> in [ruby-dev:34537]. [ruby-dev:34492]
+
+Sat Apr 26 19:40:34 2008 Guy Decoux <decoux@m...>
+
+ * class.c (struct clone_method_data): Add cref.
+ (clone_method): Properly handle NODE_BMETHOD and NODE_DMETHOD.
+ (rb_singleton_class_clone, singleton_class_clone_int): Set a
+ proper value to klass and propagate cref. [ruby-core:16238]
+
+ * eval.c (rb_block_dup, rb_method_dup), intern.h: Add duplicator
+ methods for use from class.c#clone_method().
+
Fri Apr 25 15:46:37 2008 Hidetoshi NAGAI <nagai@a...>
* ext/tk/lib/tk.rb, ext/tk/lib/tk/scrollbar.rb, ext/tk/lib/tk/scale.rb:
Index: ruby_1_8_7/re.c
===================================================================
--- ruby_1_8_7/re.c (revision 16456)
+++ ruby_1_8_7/re.c (revision 16457)
@@ -78,7 +78,7 @@
int tmp;
while (len--) {
- if (tmp = casetable[(unsigned)*p1++] - casetable[(unsigned)*p2++])
+ if ((tmp = casetable[(unsigned)*p1++] - casetable[(unsigned)*p2++]) != 0)
return tmp;
}
return 0;
@@ -892,7 +892,7 @@
{
long result;
VALUE match;
- static struct re_registers regs;
+ struct re_registers regs;
long range;
if (pos > RSTRING(str)->len || pos < 0) {
@@ -914,6 +914,7 @@
else {
range = RSTRING(str)->len - pos;
}
+ MEMZERO(®s, struct re_registers, 1);
result = re_search(RREGEXP(re)->ptr,RSTRING(str)->ptr,RSTRING(str)->len,
pos, range, ®s);
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h (revision 16456)
+++ ruby_1_8_7/version.h (revision 16457)
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-04-25"
+#define RUBY_RELEASE_DATE "2008-05-18"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080425
+#define RUBY_RELEASE_CODE 20080518
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2008
-#define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 25
+#define RUBY_RELEASE_MONTH 5
+#define RUBY_RELEASE_DAY 18
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/eval.c
===================================================================
--- ruby_1_8_7/eval.c (revision 16456)
+++ ruby_1_8_7/eval.c (revision 16457)
@@ -8414,6 +8414,19 @@
return bind;
}
+VALUE
+rb_block_dup(self, klass, cref)
+ VALUE self, klass, cref;
+{
+ struct BLOCK *block;
+ VALUE obj = proc_dup(self);
+ Data_Get_Struct(obj, struct BLOCK, block);
+ block->klass = klass;
+ block->cref = NEW_NODE(nd_type(block->cref), cref, block->cref->u2.node,
+ block->cref->u3.node);
+ return obj;
+}
+
/*
* call-seq:
* binding -> a_binding
@@ -9340,6 +9353,29 @@
return clone;
}
+VALUE
+rb_method_dup(self, klass, cref)
+ VALUE self;
+ VALUE klass;
+ VALUE cref;
+{
+ VALUE clone;
+ struct METHOD *orig, *data;
+
+ Data_Get_Struct(self, struct METHOD, orig);
+ clone = Data_Make_Struct(CLASS_OF(self),struct METHOD, bm_mark, free, data);
+ *data = *orig;
+ data->rklass = klass;
+ if (data->body->nd_rval) {
+ NODE *tmp = NEW_NODE(nd_type(data->body->u2.node), cref,
+ data->body->u2.node->u2.node,
+ data->body->u2.node->u3.node);
+ data->body = NEW_NODE(nd_type(data->body), data->body->u1.node, tmp,
+ data->body->u3.node);
+ }
+ return clone;
+}
+
/*
* call-seq:
* meth.call(args, ...) => obj
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/