diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-05 02:27:29 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-05 02:27:29 +0000 |
commit | a823fc5d8bb87d978b3027b5efe3c76e08e9e4ae (patch) | |
tree | b0702f4e904be214d914e51ad4a763a5ba3bf13b /compile.c | |
parent | 3e8e963837c27554d393dcde695c7fc2a43d79e9 (diff) | |
download | ruby-a823fc5d8bb87d978b3027b5efe3c76e08e9e4ae.tar.gz |
* 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
Diffstat (limited to 'compile.c')
-rw-r--r-- | compile.c | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -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)); } |