ruby-changes:2504
From: ko1@a...
Date: 22 Nov 2007 10:18:16 +0900
Subject: [ruby-changes:2504] matz - Ruby:r13995 (trunk): * insnhelper.ci (vm_search_normal_superclass): rename function.
matz 2007-11-22 10:17:52 +0900 (Thu, 22 Nov 2007)
New Revision: 13995
Modified files:
trunk/ChangeLog
trunk/insnhelper.ci
trunk/insns.def
trunk/marshal.c
trunk/prec.c
trunk/proc.c
trunk/thread.c
trunk/version.h
trunk/vm.c
trunk/vm_core.h
Log:
* insnhelper.ci (vm_search_normal_superclass): rename function.
* insnhelper.ci (vm_search_superclass): ditto.
* proc.c (struct METHOD): rename rklass -> rclass.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/insnhelper.ci?r1=13995&r2=13994
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=13995&r2=13994
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13995&r2=13994
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/thread.c?r1=13995&r2=13994
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/prec.c?r1=13995&r2=13994
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/vm_core.h?r1=13995&r2=13994
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/proc.c?r1=13995&r2=13994
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/marshal.c?r1=13995&r2=13994
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/vm.c?r1=13995&r2=13994
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/insns.def?r1=13995&r2=13994
Index: insns.def
===================================================================
--- insns.def (revision 13994)
+++ insns.def (revision 13995)
@@ -861,7 +861,7 @@
ip = ip->parent_iseq;
}
if (ip) {
- VALUE klass = vm_search_normal_super_klass(ip->klass, GET_SELF());
+ VALUE klass = vm_search_normal_superclass(ip->klass, GET_SELF());
if (rb_method_boundp(klass, ip->defined_method_id, 0)) {
expr_type = "super";
}
@@ -944,7 +944,7 @@
*/
DEFINE_INSN
defineclass
-(ID id, ISEQ klass_iseq, rb_num_t define_type)
+(ID id, ISEQ class_iseq, rb_num_t define_type)
(VALUE cbase, VALUE super)
(VALUE val)
{
@@ -1019,13 +1019,13 @@
rb_bug("unknown defineclass type: %d", (int)define_type);
}
- COPY_CREF(klass_iseq->cref_stack, vm_cref_push(th, klass, NOEX_PUBLIC));
+ COPY_CREF(class_iseq->cref_stack, vm_cref_push(th, klass, NOEX_PUBLIC));
/* enter scope */
- vm_push_frame(th, klass_iseq,
+ vm_push_frame(th, class_iseq,
FRAME_MAGIC_CLASS, klass, (VALUE) GET_DFP() | 0x02,
- klass_iseq->iseq_encoded, GET_SP(), 0,
- klass_iseq->local_size);
+ class_iseq->iseq_encoded, GET_SP(), 0,
+ class_iseq->local_size);
RESTORE_REGS();
INC_VM_STATE_VERSION();
@@ -1096,7 +1096,7 @@
const VALUE flag = VM_CALL_SUPER_BIT | VM_CALL_FCALL_BIT;
recv = GET_SELF();
- vm_search_super_klass(GET_CFP(), GET_ISEQ(), recv, TOPN(num), &id, &klass);
+ vm_search_superclass(GET_CFP(), GET_ISEQ(), recv, TOPN(num), &id, &klass);
mn = rb_method_node(klass, id);
CALL_METHOD(num, blockptr, flag, id, mn, recv, klass);
Index: ChangeLog
===================================================================
--- ChangeLog (revision 13994)
+++ ChangeLog (revision 13995)
@@ -21,6 +21,14 @@
* array.c (rb_ary_permutation): add gc guard codes.
+Wed Nov 21 11:16:37 2007 Yukihiro Matsumoto <matz@r...>
+
+ * insnhelper.ci (vm_search_normal_superclass): rename function.
+
+ * insnhelper.ci (vm_search_superclass): ditto.
+
+ * proc.c (struct METHOD): rename rklass -> rclass.
+
Wed Nov 21 03:12:50 2007 Yukihiro Matsumoto <matz@r...>
* process.c (rb_f_system): returns nil on execution failure.
Index: vm_core.h
===================================================================
--- vm_core.h (revision 13994)
+++ vm_core.h (revision 13995)
@@ -321,7 +321,7 @@
rb_iseq_t *block_iseq; /* cfp[8] / block[3] */
VALUE proc; /* cfp[9] / block[4] */
ID method_id; /* cfp[10] saved in special case */
- VALUE method_klass; /* cfp[11] saved in special case */
+ VALUE method_class; /* cfp[11] saved in special case */
VALUE prof_time_self; /* cfp[12] */
VALUE prof_time_chld; /* cfp[13] */
} rb_control_frame_t;
@@ -522,7 +522,7 @@
/* inline (method|const) cache */
#define NEW_INLINE_CACHE_ENTRY() NEW_WHILE(Qundef, 0, 0)
-#define ic_klass u1.value
+#define ic_class u1.value
#define ic_method u2.node
#define ic_value u2.value
#define ic_vmstat u3.cnt
@@ -593,7 +593,7 @@
VALUE rb_iseq_eval(VALUE iseqval);
void rb_enable_interrupt(void);
void rb_disable_interrupt(void);
-int rb_thread_method_id_and_klass(rb_thread_t *th, ID *idp, VALUE *klassp);
+int rb_thread_method_id_and_class(rb_thread_t *th, ID *idp, VALUE *klassp);
VALUE vm_eval_body(rb_thread_t *th);
VALUE vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc, VALUE self, int argc, VALUE *argv);
Index: proc.c
===================================================================
--- proc.c (revision 13994)
+++ proc.c (revision 13995)
@@ -14,7 +14,8 @@
#include "gc.h"
struct METHOD {
- VALUE klass, rklass;
+ VALUE oclass; /* class that holds the method */
+ VALUE rclass; /* class of the recevier */
VALUE recv;
ID id, oid;
NODE *body;
@@ -349,7 +350,7 @@
}
VALUE
-proc_invoke(VALUE self, VALUE args, VALUE alt_self, VALUE alt_klass)
+proc_invoke(VALUE self, VALUE args, VALUE alt_self, VALUE alt_class)
{
rb_proc_t *proc;
GetProcPtr(self, proc);
@@ -595,8 +596,8 @@
void
bm_mark(struct METHOD *data)
{
- rb_gc_mark(data->rklass);
- rb_gc_mark(data->klass);
+ rb_gc_mark(data->rclass);
+ rb_gc_mark(data->oclass);
rb_gc_mark(data->recv);
rb_gc_mark((VALUE)data->body);
}
@@ -604,17 +605,17 @@
NODE *rb_get_method_body(VALUE klass, ID id, ID *idp);
static VALUE
-mnew(VALUE klass, VALUE obj, ID id, VALUE mklass)
+mnew(VALUE klass, VALUE obj, ID id, VALUE mclass)
{
VALUE method;
NODE *body;
struct METHOD *data;
- VALUE rklass = klass;
+ VALUE rclass = klass;
ID oid = id;
again:
if ((body = rb_get_method_body(klass, id, 0)) == 0) {
- print_undef(rklass, oid);
+ print_undef(rclass, oid);
}
klass = body->nd_clss;
@@ -625,19 +626,19 @@
goto again;
}
- while (rklass != klass &&
- (FL_TEST(rklass, FL_SINGLETON) || TYPE(rklass) == T_ICLASS)) {
- rklass = RCLASS_SUPER(rklass);
+ while (rclass != klass &&
+ (FL_TEST(rclass, FL_SINGLETON) || TYPE(rclass) == T_ICLASS)) {
+ rclass = RCLASS_SUPER(rclass);
}
if (TYPE(klass) == T_ICLASS)
klass = RBASIC(klass)->klass;
- method = Data_Make_Struct(mklass, struct METHOD, bm_mark, -1, data);
- data->klass = klass;
+ method = Data_Make_Struct(mclass, struct METHOD, bm_mark, -1, data);
+ data->oclass = klass;
data->recv = obj;
data->id = id;
data->body = body;
- data->rklass = rklass;
+ data->rclass = rclass;
data->oid = oid;
OBJ_INFECT(method, klass);
@@ -692,7 +693,7 @@
Data_Get_Struct(method, struct METHOD, m1);
Data_Get_Struct(other, struct METHOD, m2);
- if (m1->klass != m2->klass || m1->rklass != m2->rklass ||
+ if (m1->oclass != m2->oclass || m1->rclass != m2->rclass ||
m1->recv != m2->recv || m1->body != m2->body)
return Qfalse;
@@ -713,8 +714,8 @@
long hash;
Data_Get_Struct(method, struct METHOD, m);
- hash = (long)m->klass;
- hash ^= (long)m->rklass;
+ hash = (long)m->oclass;
+ hash ^= (long)m->rclass;
hash ^= (long)m->recv;
hash ^= (long)m->body;
@@ -740,11 +741,11 @@
method =
Data_Make_Struct(rb_cUnboundMethod, struct METHOD, bm_mark, free,
data);
- data->klass = orig->klass;
+ data->oclass = orig->oclass;
data->recv = Qundef;
data->id = orig->id;
data->body = orig->body;
- data->rklass = orig->rklass;
+ data->rclass = orig->rclass;
data->oid = orig->oid;
OBJ_INFECT(method, obj);
@@ -796,7 +797,7 @@
struct METHOD *data;
Data_Get_Struct(obj, struct METHOD, data);
- return data->klass;
+ return data->oclass;
}
/*
@@ -935,16 +936,16 @@
if (RDATA(body)->dmark == (RUBY_DATA_FUNC) bm_mark) {
struct METHOD *method = (struct METHOD *)DATA_PTR(body);
- VALUE rklass = method->rklass;
- if (rklass != mod) {
- if (FL_TEST(rklass, FL_SINGLETON)) {
+ VALUE rclass = method->rclass;
+ if (rclass != mod) {
+ if (FL_TEST(rclass, FL_SINGLETON)) {
rb_raise(rb_eTypeError,
"can't bind singleton method to a different class");
}
- if (!RTEST(rb_class_inherited_p(mod, rklass))) {
+ if (!RTEST(rb_class_inherited_p(mod, rclass))) {
rb_raise(rb_eTypeError,
"bind argument must be a subclass of %s",
- rb_class2name(rklass));
+ rb_class2name(rclass));
}
}
node = method->body;
@@ -1035,7 +1036,7 @@
if ((state = EXEC_TAG()) == 0) {
PASS_PASSED_BLOCK();
result = vm_call0(GET_THREAD(),
- data->klass, data->recv, data->id, data->oid,
+ data->oclass, data->recv, data->id, data->oid,
argc, argv, data->body, 0);
}
POP_TAG();
@@ -1143,21 +1144,21 @@
struct METHOD *data, *bound;
Data_Get_Struct(method, struct METHOD, data);
- if (data->rklass != CLASS_OF(recv)) {
- if (FL_TEST(data->rklass, FL_SINGLETON)) {
+ if (data->rclass != CLASS_OF(recv)) {
+ if (FL_TEST(data->rclass, FL_SINGLETON)) {
rb_raise(rb_eTypeError,
"singleton method called for a different object");
}
- if (!rb_obj_is_kind_of(recv, data->rklass)) {
+ if (!rb_obj_is_kind_of(recv, data->rclass)) {
rb_raise(rb_eTypeError, "bind argument must be an instance of %s",
- rb_class2name(data->rklass));
+ rb_class2name(data->rclass));
}
}
method = Data_Make_Struct(rb_cMethod, struct METHOD, bm_mark, free, bound);
*bound = *data;
bound->recv = recv;
- bound->rklass = CLASS_OF(recv);
+ bound->rclass = CLASS_OF(recv);
return method;
}
@@ -1280,11 +1281,11 @@
rb_str_buf_cat2(str, s);
rb_str_buf_cat2(str, ": ");
- if (FL_TEST(data->klass, FL_SINGLETON)) {
- VALUE v = rb_iv_get(data->klass, "__attached__");
+ if (FL_TEST(data->oclass, FL_SINGLETON)) {
+ VALUE v = rb_iv_get(data->oclass, "__attached__");
if (data->recv == Qundef) {
- rb_str_buf_append(str, rb_inspect(data->klass));
+ rb_str_buf_append(str, rb_inspect(data->oclass));
}
else if (data->recv == v) {
rb_str_buf_append(str, rb_inspect(v));
@@ -1299,10 +1300,10 @@
}
}
else {
- rb_str_buf_cat2(str, rb_class2name(data->rklass));
- if (data->rklass != data->klass) {
+ rb_str_buf_cat2(str, rb_class2name(data->rclass));
+ if (data->rclass != data->oclass) {
rb_str_buf_cat2(str, "(");
- rb_str_buf_cat2(str, rb_class2name(data->klass));
+ rb_str_buf_cat2(str, rb_class2name(data->oclass));
rb_str_buf_cat2(str, ")");
}
}
Index: thread.c
===================================================================
--- thread.c (revision 13994)
+++ thread.c (revision 13995)
@@ -2906,7 +2906,7 @@
klass = p->klass;
}
else {
- rb_thread_method_id_and_klass(GET_THREAD(), &id, &klass);
+ rb_thread_method_id_and_class(GET_THREAD(), &id, &klass);
}
if (id == ID_ALLOCATOR)
return Qnil;
Index: prec.c
===================================================================
--- prec.c (revision 13994)
+++ prec.c (revision 13995)
@@ -19,7 +19,7 @@
/*
* call-seq:
- * num.prec(klass) => a_klass
+ * num.prec(klass) => a_class
*
* Converts _self_ into an instance of _klass_. By default,
* +prec+ invokes
Index: vm.c
===================================================================
--- vm.c (revision 13994)
+++ vm.c (revision 13995)
@@ -448,7 +448,7 @@
recv, (VALUE)blockptr, 0, reg_cfp->sp, 0, 1);
cfp->method_id = id;
- cfp->method_klass = klass;
+ cfp->method_class = klass;
val = call_cfunc(body->nd_cfnc, recv, body->nd_argc, argc, argv);
@@ -502,11 +502,11 @@
rb_control_frame_t *cfp = th->cfp;
if (!cfp->iseq) {
- klass = cfp->method_klass;
+ klass = cfp->method_class;
klass = RCLASS_SUPER(klass);
if (klass == 0) {
- klass = vm_search_normal_super_klass(cfp->method_klass, recv);
+ klass = vm_search_normal_superclass(cfp->method_class, recv);
}
id = cfp->method_id;
@@ -1375,13 +1375,13 @@
}
int
-rb_thread_method_id_and_klass(rb_thread_t *th, ID *idp, VALUE *klassp)
+rb_thread_method_id_and_class(rb_thread_t *th, ID *idp, VALUE *klassp)
{
rb_control_frame_t *cfp = th->cfp;
rb_iseq_t *iseq = cfp->iseq;
if (!iseq) {
if (idp) *idp = cfp->method_id;
- if (klassp) *klassp = cfp->method_klass;
+ if (klassp) *klassp = cfp->method_class;
return 1;
}
while (iseq) {
@@ -1420,7 +1420,7 @@
}
else if (cfp->method_id) {
str = rb_sprintf("`%s#%s' (cfunc)",
- RSTRING_PTR(rb_class_name(cfp->method_klass)),
+ RSTRING_PTR(rb_class_name(cfp->method_class)),
rb_id2name(cfp->method_id));
}
Index: version.h
===================================================================
--- version.h (revision 13994)
+++ version.h (revision 13995)
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-11-21"
+#define RUBY_RELEASE_DATE "2007-11-22"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20071121
+#define RUBY_RELEASE_CODE 20071122
#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 11
-#define RUBY_RELEASE_DAY 21
+#define RUBY_RELEASE_DAY 22
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
Index: marshal.c
===================================================================
--- marshal.c (revision 13994)
+++ marshal.c (revision 13995)
@@ -444,13 +444,13 @@
}
static void
-w_uclass(VALUE obj, VALUE base_klass, struct dump_arg *arg)
+w_uclass(VALUE obj, VALUE super, struct dump_arg *arg)
{
VALUE klass = CLASS_OF(obj);
w_extended(klass, arg, Qtrue);
klass = rb_class_real(klass);
- if (klass != base_klass) {
+ if (klass != super) {
w_byte(TYPE_UCLASS, arg);
w_unique(RSTRING_PTR(class2path(klass)), arg);
}
Index: insnhelper.ci
===================================================================
--- insnhelper.ci (revision 13994)
+++ insnhelper.ci (revision 13995)
@@ -359,7 +359,7 @@
recv, (VALUE) blockptr, 0, reg_cfp->sp, 0, 1);
cfp->method_id = id;
- cfp->method_klass = klass;
+ cfp->method_class = klass;
reg_cfp->sp -= num + 1;
@@ -393,7 +393,7 @@
/* control block frame */
(cfp-2)->method_id = id;
- (cfp-2)->method_klass = klass;
+ (cfp-2)->method_class = klass;
GetProcPtr(procval, proc);
val = vm_invoke_proc(th, proc, recv, argc, argv);
@@ -1107,13 +1107,13 @@
#if OPT_INLINE_METHOD_CACHE
{
- if (LIKELY(klass == ic->ic_klass) &&
+ if (LIKELY(klass == ic->ic_class) &&
LIKELY(GET_VM_STATE_VERSION() == ic->ic_vmstat)) {
mn = ic->ic_method;
}
else {
mn = rb_method_node(klass, id);
- ic->ic_klass = klass;
+ ic->ic_class = klass;
ic->ic_method = mn;
ic->ic_vmstat = GET_VM_STATE_VERSION();
}
@@ -1125,7 +1125,7 @@
}
static inline VALUE
-vm_search_normal_super_klass(VALUE klass, VALUE recv)
+vm_search_normal_superclass(VALUE klass, VALUE recv)
{
if (BUILTIN_TYPE(klass) == T_CLASS) {
klass = RCLASS_SUPER(klass);
@@ -1144,7 +1144,7 @@
}
static void
-vm_search_super_klass(rb_control_frame_t *reg_cfp, rb_iseq_t *ip, VALUE recv, VALUE sigval, ID *idp, VALUE *klassp)
+vm_search_superclass(rb_control_frame_t *reg_cfp, rb_iseq_t *ip, VALUE recv, VALUE sigval, ID *idp, VALUE *klassp)
{
ID id;
VALUE klass;
@@ -1174,7 +1174,7 @@
}
id = lcfp->method_id;
- klass = vm_search_normal_super_klass(lcfp->method_klass, recv);
+ klass = vm_search_normal_superclass(lcfp->method_class, recv);
if (sigval == Qfalse) {
/* zsuper */
@@ -1182,7 +1182,7 @@
}
}
else {
- klass = vm_search_normal_super_klass(ip->klass, recv);
+ klass = vm_search_normal_superclass(ip->klass, recv);
}
*idp = id;
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml