ko1	2012-12-03 14:14:50 +0900 (Mon, 03 Dec 2012)

  New Revision: 38151

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38151

  Log:
    * compile.c (iseq_compile_each): joke shouldn't use id.h defined ids.
    * id.c (Init_id): ditto.
    * common.mk: fix dpendency.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/compile.c
    trunk/id.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38150)
+++ ChangeLog	(revision 38151)
@@ -1,3 +1,11 @@
+Mon Dec 03 14:14:19 2012  Koichi Sasada  <ko1@a...>
+
+	* 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@r...>
 
 	* misc/ruby-mode.el (ruby-block-end-re, ruby-delimiter)
Index: compile.c
===================================================================
--- compile.c	(revision 38150)
+++ compile.c	(revision 38151)
@@ -4222,11 +4222,17 @@
 	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;
 	    }
Index: common.mk
===================================================================
--- common.mk	(revision 38150)
+++ common.mk	(revision 38151)
@@ -682,8 +682,7 @@
   $(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
Index: id.c
===================================================================
--- id.c	(revision 38150)
+++ id.c	(revision 38151)
@@ -13,8 +13,6 @@
 
 #include "id.h"
 
-#include "vm_opts.h" /* for SUPPORT_JOKE */
-
 static void
 Init_id(void)
 {
@@ -48,10 +46,6 @@
     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");

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/