kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* compile.c (iseq_compile_each): joke shouldn't use id.h defined ids.

Browse source 
* id.c (Init_id): ditto.
* common.mk: fix dpendency.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2012-12-03 05:14:50 +00:00
parent 983c2e874f
commit 38766319e1
4 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Mon Dec 03 14:14:19 2012 Koichi Sasada <ko1@atdot.net>
* compile.c (iseq_compile_each): joke shouldn't use id.h defined ids.
* id.c (Init_id): ditto.
* common.mk: fix dpendency.
Mon Dec 3 12:43:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* misc/ruby-mode.el (ruby-block-end-re, ruby-delimiter)

3
common.mk
View file

@ -682,8 +682,7 @@ parse.$(OBJEXT): {$(VPATH)}parse.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h \
$(ENCODING_H_INCLUDES) {$(VPATH)}id.h {$(VPATH)}regenc.h \
{$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c \
{$(VPATH)}defs/keywords {$(VPATH)}id.c {$(VPATH)}parse.y \
{$(VPATH)}parse.h {$(VPATH)}vm_opts.h \
{$(VPATH)}internal.h $(PROBES_H_INCLUDES)
{$(VPATH)}parse.h {$(VPATH)}internal.h $(PROBES_H_INCLUDES)
proc.$(OBJEXT): {$(VPATH)}proc.c {$(VPATH)}eval_intern.h \
$(RUBY_H_INCLUDES) {$(VPATH)}gc.h $(VM_CORE_H_INCLUDES) \
{$(VPATH)}internal.h {$(VPATH)}iseq.h

10
compile.c
View file

@ -4222,11 +4222,17 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
INIT_ANCHOR(args);
#if SUPPORT_JOKE
if (nd_type(node) == NODE_VCALL) {
if (mid == idBitblt) {
ID id_bitblt;
ID id_answer;
CONST_ID(id_bitblt, "bitblt");
CONST_ID(id_answer, "the_answer_to_life_the_universe_and_everything");
if (mid == id_bitblt) {
ADD_INSN(ret, nd_line(node), bitblt);
break;
}
else if (mid == idAnswer) {
else if (mid == id_answer) {
ADD_INSN(ret, nd_line(node), answer);
break;
}

6
id.c
View file

@ -13,8 +13,6 @@
#include "id.h"
#include "vm_opts.h" /* for SUPPORT_JOKE */
static void
Init_id(void)
{
@ -48,10 +46,6 @@ Init_id(void)
REGISTER_SYMID(idGets, "gets");
REGISTER_SYMID(idSucc, "succ");
REGISTER_SYMID(idMethodMissing, "method_missing");
#if SUPPORT_JOKE
REGISTER_SYMID(idBitblt, "bitblt");
REGISTER_SYMID(idAnswer, "the_answer_to_life_the_universe_and_everything");
#endif
REGISTER_SYMID(idSend, "send");
REGISTER_SYMID(id__send__, "__send__");
REGISTER_SYMID(idInitialize, "initialize");