From 531aa2dfe32c7a0913ab179a05a8e330742c8da6 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 17 Dec 2008 06:15:38 +0000 Subject: merges r20746 from trunk into ruby_1_9_1. * id.h, template/id.h.tmpl (ruby_method_ids): sees YYTOKENTYPE too. [ruby-dev:37436] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ id.h | 2 +- template/id.h.tmpl | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b4d4d9d1a..832c38002 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Dec 15 15:13:22 2008 Nobuyoshi Nakada + + * id.h, template/id.h.tmpl (ruby_method_ids): sees YYTOKENTYPE too. + [ruby-dev:37436] + Mon Dec 15 15:02:24 2008 Nobuyoshi Nakada * common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile. diff --git a/id.h b/id.h index 40aaf2254..6120b6c9a 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 5fc0c528d..643c71186 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 -- cgit