From a823fc5d8bb87d978b3027b5efe3c76e08e9e4ae Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 5 May 2008 02:27:29 +0000 Subject: * compile.c (compile_cpath): use Qundef to denote cbase lookup. * insns.def (defineclass): Qudef is passed for cbase. * insns.def (setconstant): ditto. * vm_insnhelper.c (vm_check_if_namespace): use rb_inspect() instead of rb_obj_as_string() for better description. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16290 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- compile.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'compile.c') diff --git a/compile.c b/compile.c index c4cbf837e1..a5604fa9ae 100644 --- a/compile.c +++ b/compile.c @@ -2283,14 +2283,17 @@ compile_colon2(rb_iseq_t *iseq, NODE * node, static int compile_cpath(LINK_ANCHOR *ret, rb_iseq_t *iseq, NODE *cpath) { - if (cpath->nd_head) { - COMPILE(ret, "nd_else->nd_head", cpath->nd_head); + if (nd_type(cpath) == NODE_COLON3) { + /* toplevel class ::Foo */ + ADD_INSN1(ret, nd_line(cpath), putobject, rb_cObject); } - else if (nd_type(cpath) == NODE_COLON2) { - COMPILE(ret, "cpath (NODE_COLON2)", cpath->nd_head); + else if (cpath->nd_head) { + /* Bar::Foo */ + COMPILE(ret, "nd_else->nd_head", cpath->nd_head); } else { - ADD_INSN1(ret, nd_line(cpath), putobject, rb_cObject); + /* class at cbase Foo */ + ADD_INSN1(ret, nd_line(cpath), putobject, Qundef); } return COMPILE_OK; } @@ -3432,7 +3435,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) } if (node->nd_vid) { - ADD_INSN(ret, nd_line(node), putnil); + ADD_INSN1(ret, nd_line(node), putobject, Qundef); ADD_INSN1(ret, nd_line(node), setconstant, ID2SYM(node->nd_vid)); } -- cgit v1.2.3