nobu	2008-12-15 15:13:24 +0900 (Mon, 15 Dec 2008)

  New Revision: 20746

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

  Log:
    * id.h, template/id.h.tmpl (ruby_method_ids): sees YYTOKENTYPE too.
      [ruby-dev:37436]

  Modified files:
    trunk/ChangeLog
    trunk/id.h
    trunk/template/id.h.tmpl

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 20745)
+++ ChangeLog	(revision 20746)
@@ -1,3 +1,8 @@
+Mon Dec 15 15:13:22 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* id.h, template/id.h.tmpl (ruby_method_ids): sees YYTOKENTYPE too.
+	  [ruby-dev:37436]
+
 Mon Dec 15 15:02:24 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.
Index: id.h
===================================================================
--- id.h	(revision 20745)
+++ id.h	(revision 20746)
@@ -32,7 +32,7 @@
 #define symCFUNC ID2SYM(idCFUNC)
 
 enum ruby_method_ids {
-#ifndef tLAST_TOKEN
+#if !defined tLAST_TOKEN && !defined YYTOKENTYPE
     tUPLUS = 321,
     tUMINUS = 322,
     tPOW = 323,
Index: template/id.h.tmpl
===================================================================
--- template/id.h.tmpl	(revision 20745)
+++ template/id.h.tmpl	(revision 20746)
@@ -54,7 +54,7 @@
 #define symCFUNC ID2SYM(idCFUNC)
 
 enum ruby_method_ids {
-#ifndef tLAST_TOKEN
+#if !defined tLAST_TOKEN && !defined YYTOKENTYPE
 % tokens.each do |token, value|
     <%=token%> = <%=value%>,
 % end

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