* 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

1 files changed, 17 insertions, 23 deletions

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();
 }
 
@@ -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);