[前][次][番号順一覧][スレッド一覧]

ruby-changes:9276

From: yugui <ko1@a...>
Date: Wed, 17 Dec 2008 15:16:01 +0900 (JST)
Subject: [ruby-changes:9276] Ruby:r20813 (ruby_1_9_1): merges r20746 from trunk into ruby_1_9_1.

yugui	2008-12-17 15:15:38 +0900 (Wed, 17 Dec 2008)

  New Revision: 20813

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

  Log:
    merges r20746 from trunk into ruby_1_9_1.
    * id.h, template/id.h.tmpl (ruby_method_ids): sees YYTOKENTYPE too.
      [ruby-dev:37436]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/id.h
    branches/ruby_1_9_1/template/id.h.tmpl

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20812)
+++ ruby_1_9_1/ChangeLog	(revision 20813)
@@ -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: ruby_1_9_1/id.h
===================================================================
--- ruby_1_9_1/id.h	(revision 20812)
+++ ruby_1_9_1/id.h	(revision 20813)
@@ -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: ruby_1_9_1/template/id.h.tmpl
===================================================================
--- ruby_1_9_1/template/id.h.tmpl	(revision 20812)
+++ ruby_1_9_1/template/id.h.tmpl	(revision 20813)
@@ -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/

[前][次][番号順一覧][スレッド一覧]