From 5e4edb43a2a3183931b3d891b1c4bd6031b73560 Mon Sep 17 00:00:00 2001 From: ko1 Date: Wed, 14 May 2008 02:31:28 +0000 Subject: * 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 --- ChangeLog | 7 +++++++ compile.c | 16 ++++++++-------- insns.def | 40 +++++++++++++++++----------------------- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f7e7bffd6..edb7d17fcd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed May 14 11:29:06 2008 Koichi Sasada + + * 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 * eval.c (rb_call0): defer calling of rb_frame_self() until it diff --git a/compile.c b/compile.c index e29d6aedd3..10476081fe 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 0850fab32f..7723874c6c 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(); } @@ -313,6 +306,20 @@ putself val = GET_SELF(); } +/** + @c put + @e put cbase. + @j スタックに cbase をプッシュする。 + */ +DEFINE_INSN +putcbase +() +() +(VALUE val) +{ + val = vm_get_cbase(th); +} + /** @c put @e put some object. @@ -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); -- cgit v1.2.3