summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-14 02:31:28 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-14 02:31:28 +0000
commit5e4edb43a2a3183931b3d891b1c4bd6031b73560 (patch)
tree72a01359c66730ddc010ad3a49cde1ba766d3199
parent86294fad68d33767a153acddf6d3c2044e7ec36f (diff)
* insns.def: add a "putcbase" instruction.
* compile.c, insns.def: fix to use putcbase instruction for class search. Qundef should not be used. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16411 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--compile.c16
-rw-r--r--insns.def40
3 files changed, 32 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f7e7bf..edb7d17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed May 14 11:29:06 2008 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def: add a "putcbase" instruction.
+
+ * compile.c, insns.def: fix to use putcbase instruction for
+ class search. Qundef should not be used.
+
Wed May 14 07:49:35 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_call0): defer calling of rb_frame_self() until it
diff --git a/compile.c b/compile.c
index e29d6ae..1047608 100644
--- a/compile.c
+++ b/compile.c
@@ -2280,22 +2280,24 @@ compile_colon2(rb_iseq_t *iseq, NODE * node,
return COMPILE_OK;
}
-static int
+static VALUE
compile_cpath(LINK_ANCHOR *ret, rb_iseq_t *iseq, NODE *cpath)
{
if (nd_type(cpath) == NODE_COLON3) {
/* toplevel class ::Foo */
ADD_INSN1(ret, nd_line(cpath), putobject, rb_cObject);
+ return Qfalse;
}
else if (cpath->nd_head) {
/* Bar::Foo */
COMPILE(ret, "nd_else->nd_head", cpath->nd_head);
+ return Qfalse;
}
else {
/* class at cbase Foo */
- ADD_INSN1(ret, nd_line(cpath), putobject, Qundef);
+ ADD_INSN(ret, nd_line(cpath), putcbase);
+ return Qtrue;
}
- return COMPILE_OK;
}
static int
@@ -3438,14 +3440,12 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
}
if (node->nd_vid) {
- ADD_INSN1(ret, nd_line(node), putobject, Qundef);
- ADD_INSN1(ret, nd_line(node), setconstant,
- ID2SYM(node->nd_vid));
+ ADD_INSN (ret, nd_line(node), putcbase);
+ ADD_INSN1(ret, nd_line(node), setconstant, ID2SYM(node->nd_vid));
}
else {
compile_cpath(ret, iseq, node->nd_else);
- ADD_INSN1(ret, nd_line(node), setconstant,
- ID2SYM(node->nd_else->nd_mid));
+ ADD_INSN1(ret, nd_line(node), setconstant, ID2SYM(node->nd_else->nd_mid));
}
break;
}
diff --git a/insns.def b/insns.def
index 0850fab..7723874 100644
--- a/insns.def
+++ b/insns.def
@@ -237,18 +237,11 @@ getconstant
DEFINE_INSN
setconstant
(ID id)
-(VALUE val, VALUE klass)
+(VALUE val, VALUE cbase)
()
{
- if (klass == Qundef) {
- klass = vm_get_cbase(th);
- if (NIL_P(klass)) {
- rb_raise(rb_eTypeError, "no class/module to define constant");
- }
- }
-
- vm_check_if_namespace(klass);
- rb_const_set(klass, id, val);
+ vm_check_if_namespace(cbase);
+ rb_const_set(cbase, id, val);
INC_VM_STATE_VERSION();
}
@@ -315,6 +308,20 @@ putself
/**
@c put
+ @e put cbase.
+ @j スタックに cbase をプッシュする。
+ */
+DEFINE_INSN
+putcbase
+()
+()
+(VALUE val)
+{
+ val = vm_get_cbase(th);
+}
+
+/**
+ @c put
@e put some object.
i.e. Fixnum, true, false, nil, and so on.
@j オブジェクト val をスタックにプッシュする。
@@ -929,13 +936,6 @@ defineclass
super = rb_cObject;
}
- if (cbase == Qundef) {
- cbase = vm_get_cbase(th);
- if (NIL_P(cbase)) {
- rb_raise(rb_eTypeError, "no class/module to define constant");
- }
- }
-
vm_check_if_namespace(cbase);
/* find klass */
@@ -972,12 +972,6 @@ defineclass
case 2:
/* val is dummy. classdef returns class scope value */
/* super is dummy */
- if (cbase == Qundef) {
- cbase = vm_get_cbase(th);
- if (NIL_P(cbase)) {
- rb_raise(rb_eTypeError, "no class/module to define constant");
- }
- }
vm_check_if_namespace(cbase);