* id.h, id.c: remove idFuncall.

* compile.c (iseq_specialized_instruction): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13255 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 13 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 5589afb961..80c7482b1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Aug 25 08:54:12 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* id.h, id.c: remove idFuncall.
+
+	* compile.c (iseq_specialized_instruction): ditto.
+
 Sat Aug 25 08:47:28 2007  Koichi Sasada  <ko1@atdot.net>
 
 	* tool/compile_prelude.rb: fix to include "vm_core.h".
diff --git a/compile.c b/compile.c
index f50228d447..708556f2a1 100644
--- a/compile.c
+++ b/compile.c
@@ -1482,8 +1482,9 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
 	    }
 	}
 
-	if (mid == idSend || mid == id__send__ || mid == id__send ||
-		 mid == idFuncall || mid == id__send_bang) {
+	if (mid == idSend || mid == id__send ||
+	    mid == idSendBang || mid == id__send_bang ||
+	    mid == id__send__ ) {
 	    OPERAND_AT(iobj, 3) |= INT2FIX(VM_CALL_SEND_BIT);
 	}
     }
diff --git a/id.c b/id.c
index 46853905fa..28d7d54f2f 100644
--- a/id.c
+++ b/id.c
@@ -61,8 +61,8 @@ Init_id(void)
     idAnswer = rb_intern("the_answer_to_life_the_universe_and_everything");
 
     idSend = rb_intern("send");
-    id__send__ = rb_intern("__send__");
+    idSendBang = rb_intern("send!");
     id__send = rb_intern("__send");
-    idFuncall = rb_intern("funcall");
     id__send_bang = rb_intern("__send!");
+    id__send__ = rb_intern("__send__");
 }
diff --git a/id.h b/id.h
index 32f4e27d45..4990dcd006 100644
--- a/id.h
+++ b/id.h
@@ -45,9 +45,9 @@ extern ID idEnd;
 extern ID idBitblt;

 extern ID idAnswer;

 extern ID idSend;

-extern ID id__send__;

+extern ID idSendBang;

 extern ID id__send;

-extern ID idFuncall;

 extern ID id__send_bang;

+extern ID id__send__;