summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--id.h2
-rw-r--r--template/id.h.tmpl2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e5dbbea..7c61963 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 15 15:13:22 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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@ruby-lang.org>
* common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.
diff --git a/id.h b/id.h
index b01ac08..393f79d 100644
--- a/id.h
+++ b/id.h
@@ -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,
diff --git a/template/id.h.tmpl b/template/id.h.tmpl
index 1be4bad..c16137c 100644
--- a/template/id.h.tmpl
+++ b/template/id.h.tmpl
@@ -54,7 +54,7 @@ end
#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