diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-17 06:15:38 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-17 06:15:38 +0000 |
| commit | 2463b42e86af4c962a903e48ff7dfd9a05ec7b30 (patch) | |
| tree | b3ba4964096831ba91eaee8a4b9356845a337272 | |
| parent | acb618484b2746494f94eb7ad729377c0e065e10 (diff) | |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | id.h | 2 | ||||
| -rw-r--r-- | template/id.h.tmpl | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -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. @@ -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 5fc0c528db..643c711861 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 |