Boost-Commit :

Date view	Thread view	Subject view	Author view

From: hartmut.kaiser_at_[hidden]
Date: 2008-01-18 12:57:50

Next message: john_at_[hidden]: "[Boost-commit] svn:boost r42855 - trunk/boost/test/impl"
Previous message: hartmut.kaiser_at_[hidden]: "[Boost-commit] svn:boost r42853 - in trunk: boost/wave libs/wave/doc libs/wave/samples/cpp_tokens/slex libs/wave/src"

Author: hkaiser
Date: 2008-01-18 12:57:49 EST (Fri, 18 Jan 2008)
New Revision: 42854
URL: http://svn.boost.org/trac/boost/changeset/42854

Log:
Wave: removed T_DEFINED token id from the library.
Text files modified:
   branches/release/boost/wave/token_ids.hpp | 227 ++++++++++-----------
   branches/release/libs/wave/doc/token_ids.html | 7
   branches/release/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp | 1
   branches/release/libs/wave/src/token_ids.cpp | 412 +++++++++++++++++++--------------------
   4 files changed, 319 insertions(+), 328 deletions(-)

Modified: branches/release/boost/wave/token_ids.hpp
==============================================================================
--- branches/release/boost/wave/token_ids.hpp (original)
+++ branches/release/boost/wave/token_ids.hpp 2008-01-18 12:57:49 EST (Fri, 18 Jan 2008)
@@ -167,125 +167,124 @@
     T_CONSTCAST = TOKEN_FROM_ID(316, KeywordTokenType),
     T_CONTINUE = TOKEN_FROM_ID(317, KeywordTokenType),
     T_DEFAULT = TOKEN_FROM_ID(318, KeywordTokenType),
- T_DEFINED = TOKEN_FROM_ID(319, KeywordTokenType),
- T_DELETE = TOKEN_FROM_ID(320, KeywordTokenType),
- T_DO = TOKEN_FROM_ID(321, KeywordTokenType),
- T_DOUBLE = TOKEN_FROM_ID(322, KeywordTokenType),
- T_DYNAMICCAST = TOKEN_FROM_ID(323, KeywordTokenType),
- T_ELSE = TOKEN_FROM_ID(324, KeywordTokenType),
- T_ENUM = TOKEN_FROM_ID(325, KeywordTokenType),
- T_EXPLICIT = TOKEN_FROM_ID(326, KeywordTokenType),
- T_EXPORT = TOKEN_FROM_ID(327, KeywordTokenType),
- T_EXTERN = TOKEN_FROM_ID(328, KeywordTokenType),
- T_FLOAT = TOKEN_FROM_ID(329, KeywordTokenType),
- T_FOR = TOKEN_FROM_ID(330, KeywordTokenType),
- T_FRIEND = TOKEN_FROM_ID(331, KeywordTokenType),
- T_GOTO = TOKEN_FROM_ID(332, KeywordTokenType),
- T_IF = TOKEN_FROM_ID(333, KeywordTokenType),
- T_INLINE = TOKEN_FROM_ID(334, KeywordTokenType),
- T_INT = TOKEN_FROM_ID(335, KeywordTokenType),
- T_LONG = TOKEN_FROM_ID(336, KeywordTokenType),
- T_MUTABLE = TOKEN_FROM_ID(337, KeywordTokenType),
- T_NAMESPACE = TOKEN_FROM_ID(338, KeywordTokenType),
- T_NEW = TOKEN_FROM_ID(339, KeywordTokenType),
- T_OPERATOR = TOKEN_FROM_ID(340, KeywordTokenType),
- T_PRIVATE = TOKEN_FROM_ID(341, KeywordTokenType),
- T_PROTECTED = TOKEN_FROM_ID(342, KeywordTokenType),
- T_PUBLIC = TOKEN_FROM_ID(343, KeywordTokenType),
- T_REGISTER = TOKEN_FROM_ID(344, KeywordTokenType),
- T_REINTERPRETCAST = TOKEN_FROM_ID(345, KeywordTokenType),
- T_RETURN = TOKEN_FROM_ID(346, KeywordTokenType),
- T_SHORT = TOKEN_FROM_ID(347, KeywordTokenType),
- T_SIGNED = TOKEN_FROM_ID(348, KeywordTokenType),
- T_SIZEOF = TOKEN_FROM_ID(349, KeywordTokenType),
- T_STATIC = TOKEN_FROM_ID(350, KeywordTokenType),
- T_STATICCAST = TOKEN_FROM_ID(351, KeywordTokenType),
- T_STRUCT = TOKEN_FROM_ID(352, KeywordTokenType),
- T_SWITCH = TOKEN_FROM_ID(353, KeywordTokenType),
- T_TEMPLATE = TOKEN_FROM_ID(354, KeywordTokenType),
- T_THIS = TOKEN_FROM_ID(355, KeywordTokenType),
- T_THROW = TOKEN_FROM_ID(356, KeywordTokenType),
- T_TRY = TOKEN_FROM_ID(357, KeywordTokenType),
- T_TYPEDEF = TOKEN_FROM_ID(358, KeywordTokenType),
- T_TYPEID = TOKEN_FROM_ID(359, KeywordTokenType),
- T_TYPENAME = TOKEN_FROM_ID(360, KeywordTokenType),
- T_UNION = TOKEN_FROM_ID(361, KeywordTokenType),
- T_UNSIGNED = TOKEN_FROM_ID(362, KeywordTokenType),
- T_USING = TOKEN_FROM_ID(363, KeywordTokenType),
- T_VIRTUAL = TOKEN_FROM_ID(364, KeywordTokenType),
- T_VOID = TOKEN_FROM_ID(365, KeywordTokenType),
- T_VOLATILE = TOKEN_FROM_ID(366, KeywordTokenType),
- T_WCHART = TOKEN_FROM_ID(367, KeywordTokenType),
- T_WHILE = TOKEN_FROM_ID(368, KeywordTokenType),
- T_PP_DEFINE = TOKEN_FROM_ID(369, PPTokenType),
- T_PP_IF = TOKEN_FROM_ID(370, PPConditionalTokenType),
- T_PP_IFDEF = TOKEN_FROM_ID(371, PPConditionalTokenType),
- T_PP_IFNDEF = TOKEN_FROM_ID(372, PPConditionalTokenType),
- T_PP_ELSE = TOKEN_FROM_ID(373, PPConditionalTokenType),
- T_PP_ELIF = TOKEN_FROM_ID(374, PPConditionalTokenType),
- T_PP_ENDIF = TOKEN_FROM_ID(375, PPConditionalTokenType),
- T_PP_ERROR = TOKEN_FROM_ID(376, PPTokenType),
- T_PP_LINE = TOKEN_FROM_ID(377, PPTokenType),
- T_PP_PRAGMA = TOKEN_FROM_ID(378, PPTokenType),
- T_PP_UNDEF = TOKEN_FROM_ID(379, PPTokenType),
- T_PP_WARNING = TOKEN_FROM_ID(380, PPTokenType),
- T_IDENTIFIER = TOKEN_FROM_ID(381, IdentifierTokenType),
- T_OCTALINT = TOKEN_FROM_ID(382, IntegerLiteralTokenType),
- T_DECIMALINT = TOKEN_FROM_ID(383, IntegerLiteralTokenType),
- T_HEXAINT = TOKEN_FROM_ID(384, IntegerLiteralTokenType),
- T_INTLIT = TOKEN_FROM_ID(385, IntegerLiteralTokenType),
- T_LONGINTLIT = TOKEN_FROM_ID(386, IntegerLiteralTokenType),
- T_FLOATLIT = TOKEN_FROM_ID(387, FloatingLiteralTokenType),
- T_FIXEDPOINTLIT = TOKEN_FROM_ID(387, FloatingLiteralTokenType|AltTokenType), // IDL specific
- T_CCOMMENT = TOKEN_FROM_ID(388, WhiteSpaceTokenType|AltTokenType),
- T_CPPCOMMENT = TOKEN_FROM_ID(389, WhiteSpaceTokenType|AltTokenType),
- T_CHARLIT = TOKEN_FROM_ID(390, CharacterLiteralTokenType),
- T_STRINGLIT = TOKEN_FROM_ID(391, StringLiteralTokenType),
- T_CONTLINE = TOKEN_FROM_ID(392, EOLTokenType),
- T_SPACE = TOKEN_FROM_ID(393, WhiteSpaceTokenType),
- T_SPACE2 = TOKEN_FROM_ID(394, WhiteSpaceTokenType),
- T_NEWLINE = TOKEN_FROM_ID(395, EOLTokenType),
- T_GENERATEDNEWLINE = TOKEN_FROM_ID(395, EOLTokenType|AltTokenType),
- T_POUND_POUND = TOKEN_FROM_ID(396, OperatorTokenType),
- T_POUND_POUND_ALT = TOKEN_FROM_ID(396, OperatorTokenType|AltTokenType),
- T_POUND_POUND_TRIGRAPH = TOKEN_FROM_ID(396, OperatorTokenType|TriGraphTokenType),
- T_POUND = TOKEN_FROM_ID(397, OperatorTokenType),
- T_POUND_ALT = TOKEN_FROM_ID(397, OperatorTokenType|AltTokenType),
- T_POUND_TRIGRAPH = TOKEN_FROM_ID(397, OperatorTokenType|TriGraphTokenType),
- T_ANY = TOKEN_FROM_ID(398, UnknownTokenType),
- T_ANY_TRIGRAPH = TOKEN_FROM_ID(398, UnknownTokenType|TriGraphTokenType),
- T_PP_INCLUDE = TOKEN_FROM_ID(399, PPTokenType),
- T_PP_QHEADER = TOKEN_FROM_ID(400, PPTokenType),
- T_PP_HHEADER = TOKEN_FROM_ID(401, PPTokenType),
- T_PP_INCLUDE_NEXT = TOKEN_FROM_ID(399, PPTokenType|AltTokenType),
- T_PP_QHEADER_NEXT = TOKEN_FROM_ID(400, PPTokenType|AltTokenType),
- T_PP_HHEADER_NEXT = TOKEN_FROM_ID(401, PPTokenType|AltTokenType),
- T_EOF = TOKEN_FROM_ID(402, EOFTokenType), // end of file reached
- T_EOI = TOKEN_FROM_ID(403, EOFTokenType), // end of input reached
- T_PP_NUMBER = TOKEN_FROM_ID(404, InternalTokenType),
+ T_DELETE = TOKEN_FROM_ID(319, KeywordTokenType),
+ T_DO = TOKEN_FROM_ID(320, KeywordTokenType),
+ T_DOUBLE = TOKEN_FROM_ID(321, KeywordTokenType),
+ T_DYNAMICCAST = TOKEN_FROM_ID(322, KeywordTokenType),
+ T_ELSE = TOKEN_FROM_ID(323, KeywordTokenType),
+ T_ENUM = TOKEN_FROM_ID(324, KeywordTokenType),
+ T_EXPLICIT = TOKEN_FROM_ID(325, KeywordTokenType),
+ T_EXPORT = TOKEN_FROM_ID(326, KeywordTokenType),
+ T_EXTERN = TOKEN_FROM_ID(327, KeywordTokenType),
+ T_FLOAT = TOKEN_FROM_ID(328, KeywordTokenType),
+ T_FOR = TOKEN_FROM_ID(329, KeywordTokenType),
+ T_FRIEND = TOKEN_FROM_ID(330, KeywordTokenType),
+ T_GOTO = TOKEN_FROM_ID(331, KeywordTokenType),
+ T_IF = TOKEN_FROM_ID(332, KeywordTokenType),
+ T_INLINE = TOKEN_FROM_ID(333, KeywordTokenType),
+ T_INT = TOKEN_FROM_ID(334, KeywordTokenType),
+ T_LONG = TOKEN_FROM_ID(335, KeywordTokenType),
+ T_MUTABLE = TOKEN_FROM_ID(336, KeywordTokenType),
+ T_NAMESPACE = TOKEN_FROM_ID(337, KeywordTokenType),
+ T_NEW = TOKEN_FROM_ID(338, KeywordTokenType),
+ T_OPERATOR = TOKEN_FROM_ID(339, KeywordTokenType),
+ T_PRIVATE = TOKEN_FROM_ID(340, KeywordTokenType),
+ T_PROTECTED = TOKEN_FROM_ID(341, KeywordTokenType),
+ T_PUBLIC = TOKEN_FROM_ID(342, KeywordTokenType),
+ T_REGISTER = TOKEN_FROM_ID(343, KeywordTokenType),
+ T_REINTERPRETCAST = TOKEN_FROM_ID(344, KeywordTokenType),
+ T_RETURN = TOKEN_FROM_ID(345, KeywordTokenType),
+ T_SHORT = TOKEN_FROM_ID(346, KeywordTokenType),
+ T_SIGNED = TOKEN_FROM_ID(347, KeywordTokenType),
+ T_SIZEOF = TOKEN_FROM_ID(348, KeywordTokenType),
+ T_STATIC = TOKEN_FROM_ID(349, KeywordTokenType),
+ T_STATICCAST = TOKEN_FROM_ID(350, KeywordTokenType),
+ T_STRUCT = TOKEN_FROM_ID(351, KeywordTokenType),
+ T_SWITCH = TOKEN_FROM_ID(352, KeywordTokenType),
+ T_TEMPLATE = TOKEN_FROM_ID(353, KeywordTokenType),
+ T_THIS = TOKEN_FROM_ID(354, KeywordTokenType),
+ T_THROW = TOKEN_FROM_ID(355, KeywordTokenType),
+ T_TRY = TOKEN_FROM_ID(356, KeywordTokenType),
+ T_TYPEDEF = TOKEN_FROM_ID(357, KeywordTokenType),
+ T_TYPEID = TOKEN_FROM_ID(358, KeywordTokenType),
+ T_TYPENAME = TOKEN_FROM_ID(359, KeywordTokenType),
+ T_UNION = TOKEN_FROM_ID(360, KeywordTokenType),
+ T_UNSIGNED = TOKEN_FROM_ID(361, KeywordTokenType),
+ T_USING = TOKEN_FROM_ID(362, KeywordTokenType),
+ T_VIRTUAL = TOKEN_FROM_ID(363, KeywordTokenType),
+ T_VOID = TOKEN_FROM_ID(364, KeywordTokenType),
+ T_VOLATILE = TOKEN_FROM_ID(365, KeywordTokenType),
+ T_WCHART = TOKEN_FROM_ID(366, KeywordTokenType),
+ T_WHILE = TOKEN_FROM_ID(367, KeywordTokenType),
+ T_PP_DEFINE = TOKEN_FROM_ID(368, PPTokenType),
+ T_PP_IF = TOKEN_FROM_ID(369, PPConditionalTokenType),
+ T_PP_IFDEF = TOKEN_FROM_ID(370, PPConditionalTokenType),
+ T_PP_IFNDEF = TOKEN_FROM_ID(371, PPConditionalTokenType),
+ T_PP_ELSE = TOKEN_FROM_ID(372, PPConditionalTokenType),
+ T_PP_ELIF = TOKEN_FROM_ID(373, PPConditionalTokenType),
+ T_PP_ENDIF = TOKEN_FROM_ID(374, PPConditionalTokenType),
+ T_PP_ERROR = TOKEN_FROM_ID(375, PPTokenType),
+ T_PP_LINE = TOKEN_FROM_ID(376, PPTokenType),
+ T_PP_PRAGMA = TOKEN_FROM_ID(377, PPTokenType),
+ T_PP_UNDEF = TOKEN_FROM_ID(378, PPTokenType),
+ T_PP_WARNING = TOKEN_FROM_ID(379, PPTokenType),
+ T_IDENTIFIER = TOKEN_FROM_ID(380, IdentifierTokenType),
+ T_OCTALINT = TOKEN_FROM_ID(381, IntegerLiteralTokenType),
+ T_DECIMALINT = TOKEN_FROM_ID(382, IntegerLiteralTokenType),
+ T_HEXAINT = TOKEN_FROM_ID(383, IntegerLiteralTokenType),
+ T_INTLIT = TOKEN_FROM_ID(384, IntegerLiteralTokenType),
+ T_LONGINTLIT = TOKEN_FROM_ID(385, IntegerLiteralTokenType),
+ T_FLOATLIT = TOKEN_FROM_ID(386, FloatingLiteralTokenType),
+ T_FIXEDPOINTLIT = TOKEN_FROM_ID(386, FloatingLiteralTokenType|AltTokenType), // IDL specific
+ T_CCOMMENT = TOKEN_FROM_ID(387, WhiteSpaceTokenType|AltTokenType),
+ T_CPPCOMMENT = TOKEN_FROM_ID(388, WhiteSpaceTokenType|AltTokenType),
+ T_CHARLIT = TOKEN_FROM_ID(389, CharacterLiteralTokenType),
+ T_STRINGLIT = TOKEN_FROM_ID(390, StringLiteralTokenType),
+ T_CONTLINE = TOKEN_FROM_ID(391, EOLTokenType),
+ T_SPACE = TOKEN_FROM_ID(392, WhiteSpaceTokenType),
+ T_SPACE2 = TOKEN_FROM_ID(393, WhiteSpaceTokenType),
+ T_NEWLINE = TOKEN_FROM_ID(394, EOLTokenType),
+ T_GENERATEDNEWLINE = TOKEN_FROM_ID(394, EOLTokenType|AltTokenType),
+ T_POUND_POUND = TOKEN_FROM_ID(395, OperatorTokenType),
+ T_POUND_POUND_ALT = TOKEN_FROM_ID(395, OperatorTokenType|AltTokenType),
+ T_POUND_POUND_TRIGRAPH = TOKEN_FROM_ID(395, OperatorTokenType|TriGraphTokenType),
+ T_POUND = TOKEN_FROM_ID(396, OperatorTokenType),
+ T_POUND_ALT = TOKEN_FROM_ID(396, OperatorTokenType|AltTokenType),
+ T_POUND_TRIGRAPH = TOKEN_FROM_ID(396, OperatorTokenType|TriGraphTokenType),
+ T_ANY = TOKEN_FROM_ID(397, UnknownTokenType),
+ T_ANY_TRIGRAPH = TOKEN_FROM_ID(397, UnknownTokenType|TriGraphTokenType),
+ T_PP_INCLUDE = TOKEN_FROM_ID(398, PPTokenType),
+ T_PP_QHEADER = TOKEN_FROM_ID(399, PPTokenType),
+ T_PP_HHEADER = TOKEN_FROM_ID(400, PPTokenType),
+ T_PP_INCLUDE_NEXT = TOKEN_FROM_ID(398, PPTokenType|AltTokenType),
+ T_PP_QHEADER_NEXT = TOKEN_FROM_ID(399, PPTokenType|AltTokenType),
+ T_PP_HHEADER_NEXT = TOKEN_FROM_ID(400, PPTokenType|AltTokenType),
+ T_EOF = TOKEN_FROM_ID(401, EOFTokenType), // end of file reached
+ T_EOI = TOKEN_FROM_ID(402, EOFTokenType), // end of input reached
+ T_PP_NUMBER = TOKEN_FROM_ID(403, InternalTokenType),

// MS extensions
- T_MSEXT_INT8 = TOKEN_FROM_ID(405, KeywordTokenType),
- T_MSEXT_INT16 = TOKEN_FROM_ID(406, KeywordTokenType),
- T_MSEXT_INT32 = TOKEN_FROM_ID(407, KeywordTokenType),
- T_MSEXT_INT64 = TOKEN_FROM_ID(408, KeywordTokenType),
- T_MSEXT_BASED = TOKEN_FROM_ID(409, KeywordTokenType),
- T_MSEXT_DECLSPEC = TOKEN_FROM_ID(410, KeywordTokenType),
- T_MSEXT_CDECL = TOKEN_FROM_ID(411, KeywordTokenType),
- T_MSEXT_FASTCALL = TOKEN_FROM_ID(412, KeywordTokenType),
- T_MSEXT_STDCALL = TOKEN_FROM_ID(413, KeywordTokenType),
- T_MSEXT_TRY = TOKEN_FROM_ID(414, KeywordTokenType),
- T_MSEXT_EXCEPT = TOKEN_FROM_ID(415, KeywordTokenType),
- T_MSEXT_FINALLY = TOKEN_FROM_ID(416, KeywordTokenType),
- T_MSEXT_LEAVE = TOKEN_FROM_ID(417, KeywordTokenType),
- T_MSEXT_INLINE = TOKEN_FROM_ID(418, KeywordTokenType),
- T_MSEXT_ASM = TOKEN_FROM_ID(419, KeywordTokenType),
+ T_MSEXT_INT8 = TOKEN_FROM_ID(404, KeywordTokenType),
+ T_MSEXT_INT16 = TOKEN_FROM_ID(405, KeywordTokenType),
+ T_MSEXT_INT32 = TOKEN_FROM_ID(406, KeywordTokenType),
+ T_MSEXT_INT64 = TOKEN_FROM_ID(407, KeywordTokenType),
+ T_MSEXT_BASED = TOKEN_FROM_ID(408, KeywordTokenType),
+ T_MSEXT_DECLSPEC = TOKEN_FROM_ID(409, KeywordTokenType),
+ T_MSEXT_CDECL = TOKEN_FROM_ID(410, KeywordTokenType),
+ T_MSEXT_FASTCALL = TOKEN_FROM_ID(411, KeywordTokenType),
+ T_MSEXT_STDCALL = TOKEN_FROM_ID(412, KeywordTokenType),
+ T_MSEXT_TRY = TOKEN_FROM_ID(413, KeywordTokenType),
+ T_MSEXT_EXCEPT = TOKEN_FROM_ID(414, KeywordTokenType),
+ T_MSEXT_FINALLY = TOKEN_FROM_ID(415, KeywordTokenType),
+ T_MSEXT_LEAVE = TOKEN_FROM_ID(416, KeywordTokenType),
+ T_MSEXT_INLINE = TOKEN_FROM_ID(417, KeywordTokenType),
+ T_MSEXT_ASM = TOKEN_FROM_ID(418, KeywordTokenType),

- T_MSEXT_PP_REGION = TOKEN_FROM_ID(420, PPTokenType),
- T_MSEXT_PP_ENDREGION = TOKEN_FROM_ID(421, PPTokenType),
+ T_MSEXT_PP_REGION = TOKEN_FROM_ID(419, PPTokenType),
+ T_MSEXT_PP_ENDREGION = TOKEN_FROM_ID(420, PPTokenType),

// import is needed to be a keyword for the C++ module Standards proposal
- T_IMPORT = TOKEN_FROM_ID(422, KeywordTokenType),
+ T_IMPORT = TOKEN_FROM_ID(421, KeywordTokenType),

     T_LAST_TOKEN_ID,
     T_LAST_TOKEN = ID_FROM_TOKEN(T_LAST_TOKEN_ID),

Modified: branches/release/libs/wave/doc/token_ids.html
==============================================================================
--- branches/release/libs/wave/doc/token_ids.html (original)
+++ branches/release/libs/wave/doc/token_ids.html 2008-01-18 12:57:49 EST (Fri, 18 Jan 2008)
@@ -234,11 +234,6 @@
 <td class="table_cells" width="29%" ><code>default</code></td>
 </tr>
 <tr>
- <td class="table_cells" width="40%" > T_DEFINED </td>
- <td class="table_cells" width="31%" > KeywordTokenType</td>
- <td class="table_cells" width="29%" ><code>defined</code></td>
- </tr>
- <tr>
 <td class="table_cells" width="40%" > T_DELETE </td>
 <td class="table_cells" width="31%" > KeywordTokenType</td>
 <td class="table_cells" width="29%" ><code>delete</code></td>
@@ -975,7 +970,7 @@
 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) 

Last updated:
- Sunday, May 15, 2005 12:23
+ Friday, January 18, 2008 11:35
 
</body>
</html>

Modified: branches/release/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp
==============================================================================
--- branches/release/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp (original)
+++ branches/release/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp 2008-01-18 12:57:49 EST (Fri, 18 Jan 2008)
@@ -271,7 +271,6 @@
     TOKEN_DATA(CONSTCAST, "const_cast"),
     TOKEN_DATA(CONTINUE, "continue"),
     TOKEN_DATA(DEFAULT, "default"),
-// TOKEN_DATA(DEFINED, "defined"),
     TOKEN_DATA(DELETE, "delete"),
     TOKEN_DATA(DO, "do"),
     TOKEN_DATA(DOUBLE, "double"),

Modified: branches/release/libs/wave/src/token_ids.cpp
==============================================================================
--- branches/release/libs/wave/src/token_ids.cpp (original)
+++ branches/release/libs/wave/src/token_ids.cpp 2008-01-18 12:57:49 EST (Fri, 18 Jan 2008)
@@ -100,113 +100,112 @@
     /* 316 */ "CONSTCAST",
     /* 317 */ "CONTINUE",
     /* 318 */ "DEFAULT",
- /* 319 */ "DEFINED",
- /* 320 */ "DELETE",
- /* 321 */ "DO",
- /* 322 */ "DOUBLE",
- /* 323 */ "DYNAMICCAST",
- /* 324 */ "ELSE",
- /* 325 */ "ENUM",
- /* 326 */ "EXPLICIT",
- /* 327 */ "EXPORT",
- /* 328 */ "EXTERN",
- /* 329 */ "FLOAT",
- /* 330 */ "FOR",
- /* 331 */ "FRIEND",
- /* 332 */ "GOTO",
- /* 333 */ "IF",
- /* 334 */ "INLINE",
- /* 335 */ "INT",
- /* 336 */ "LONG",
- /* 337 */ "MUTABLE",
- /* 338 */ "NAMESPACE",
- /* 339 */ "NEW",
- /* 340 */ "OPERATOR",
- /* 341 */ "PRIVATE",
- /* 342 */ "PROTECTED",
- /* 343 */ "PUBLIC",
- /* 344 */ "REGISTER",
- /* 345 */ "REINTERPRETCAST",
- /* 346 */ "RETURN",
- /* 347 */ "SHORT",
- /* 348 */ "SIGNED",
- /* 349 */ "SIZEOF",
- /* 350 */ "STATIC",
- /* 351 */ "STATICCAST",
- /* 352 */ "STRUCT",
- /* 353 */ "SWITCH",
- /* 354 */ "TEMPLATE",
- /* 355 */ "THIS",
- /* 356 */ "THROW",
- /* 357 */ "TRY",
- /* 358 */ "TYPEDEF",
- /* 359 */ "TYPEID",
- /* 360 */ "TYPENAME",
- /* 361 */ "UNION",
- /* 362 */ "UNSIGNED",
- /* 363 */ "USING",
- /* 364 */ "VIRTUAL",
- /* 365 */ "VOID",
- /* 366 */ "VOLATILE",
- /* 367 */ "WCHART",
- /* 368 */ "WHILE",
- /* 369 */ "PP_DEFINE",
- /* 370 */ "PP_IF",
- /* 371 */ "PP_IFDEF",
- /* 372 */ "PP_IFNDEF",
- /* 373 */ "PP_ELSE",
- /* 374 */ "PP_ELIF",
- /* 375 */ "PP_ENDIF",
- /* 376 */ "PP_ERROR",
- /* 377 */ "PP_LINE",
- /* 378 */ "PP_PRAGMA",
- /* 379 */ "PP_UNDEF",
- /* 380 */ "PP_WARNING",
- /* 381 */ "IDENTIFIER",
- /* 382 */ "OCTALINT",
- /* 383 */ "DECIMALINT",
- /* 384 */ "HEXAINT",
- /* 385 */ "INTLIT",
- /* 386 */ "LONGINTLIT",
- /* 387 */ "FLOATLIT",
- /* 388 */ "CCOMMENT",
- /* 389 */ "CPPCOMMENT",
- /* 390 */ "CHARLIT",
- /* 391 */ "STRINGLIT",
- /* 392 */ "CONTLINE",
- /* 393 */ "SPACE",
- /* 394 */ "SPACE2",
- /* 395 */ "NEWLINE",
- /* 396 */ "POUND_POUND",
- /* 397 */ "POUND",
- /* 398 */ "ANY",
- /* 399 */ "PP_INCLUDE",
- /* 400 */ "PP_QHEADER",
- /* 401 */ "PP_HHEADER",
- /* 402 */ "EOF",
- /* 403 */ "EOI",
- /* 404 */ "PP_NUMBER",
+ /* 319 */ "DELETE",
+ /* 320 */ "DO",
+ /* 321 */ "DOUBLE",
+ /* 322 */ "DYNAMICCAST",
+ /* 323 */ "ELSE",
+ /* 324 */ "ENUM",
+ /* 325 */ "EXPLICIT",
+ /* 326 */ "EXPORT",
+ /* 327 */ "EXTERN",
+ /* 328 */ "FLOAT",
+ /* 329 */ "FOR",
+ /* 330 */ "FRIEND",
+ /* 331 */ "GOTO",
+ /* 332 */ "IF",
+ /* 333 */ "INLINE",
+ /* 334 */ "INT",
+ /* 335 */ "LONG",
+ /* 336 */ "MUTABLE",
+ /* 337 */ "NAMESPACE",
+ /* 338 */ "NEW",
+ /* 339 */ "OPERATOR",
+ /* 340 */ "PRIVATE",
+ /* 341 */ "PROTECTED",
+ /* 342 */ "PUBLIC",
+ /* 343 */ "REGISTER",
+ /* 344 */ "REINTERPRETCAST",
+ /* 345 */ "RETURN",
+ /* 346 */ "SHORT",
+ /* 347 */ "SIGNED",
+ /* 348 */ "SIZEOF",
+ /* 349 */ "STATIC",
+ /* 350 */ "STATICCAST",
+ /* 351 */ "STRUCT",
+ /* 352 */ "SWITCH",
+ /* 353 */ "TEMPLATE",
+ /* 354 */ "THIS",
+ /* 355 */ "THROW",
+ /* 356 */ "TRY",
+ /* 357 */ "TYPEDEF",
+ /* 358 */ "TYPEID",
+ /* 359 */ "TYPENAME",
+ /* 360 */ "UNION",
+ /* 361 */ "UNSIGNED",
+ /* 362 */ "USING",
+ /* 363 */ "VIRTUAL",
+ /* 364 */ "VOID",
+ /* 365 */ "VOLATILE",
+ /* 366 */ "WCHART",
+ /* 367 */ "WHILE",
+ /* 368 */ "PP_DEFINE",
+ /* 369 */ "PP_IF",
+ /* 370 */ "PP_IFDEF",
+ /* 371 */ "PP_IFNDEF",
+ /* 372 */ "PP_ELSE",
+ /* 373 */ "PP_ELIF",
+ /* 374 */ "PP_ENDIF",
+ /* 375 */ "PP_ERROR",
+ /* 376 */ "PP_LINE",
+ /* 377 */ "PP_PRAGMA",
+ /* 378 */ "PP_UNDEF",
+ /* 379 */ "PP_WARNING",
+ /* 380 */ "IDENTIFIER",
+ /* 381 */ "OCTALINT",
+ /* 382 */ "DECIMALINT",
+ /* 383 */ "HEXAINT",
+ /* 384 */ "INTLIT",
+ /* 385 */ "LONGINTLIT",
+ /* 386 */ "FLOATLIT",
+ /* 387 */ "CCOMMENT",
+ /* 388 */ "CPPCOMMENT",
+ /* 389 */ "CHARLIT",
+ /* 390 */ "STRINGLIT",
+ /* 391 */ "CONTLINE",
+ /* 392 */ "SPACE",
+ /* 393 */ "SPACE2",
+ /* 394 */ "NEWLINE",
+ /* 395 */ "POUND_POUND",
+ /* 396 */ "POUND",
+ /* 397 */ "ANY",
+ /* 398 */ "PP_INCLUDE",
+ /* 399 */ "PP_QHEADER",
+ /* 400 */ "PP_HHEADER",
+ /* 401 */ "EOF",
+ /* 402 */ "EOI",
+ /* 403 */ "PP_NUMBER",

               // MS extensions
- /* 405 */ "MSEXT_INT8",
- /* 406 */ "MSEXT_INT16",
- /* 407 */ "MSEXT_INT32",
- /* 408 */ "MSEXT_INT64",
- /* 409 */ "MSEXT_BASED",
- /* 410 */ "MSEXT_DECLSPEC",
- /* 411 */ "MSEXT_CDECL",
- /* 412 */ "MSEXT_FASTCALL",
- /* 413 */ "MSEXT_STDCALL",
- /* 414 */ "MSEXT_TRY",
- /* 415 */ "MSEXT_EXCEPT",
- /* 416 */ "MSEXT_FINALLY",
- /* 417 */ "MSEXT_LEAVE",
- /* 418 */ "MSEXT_INLINE",
- /* 419 */ "MSEXT_ASM",
- /* 420 */ "MSEXT_REGION",
- /* 421 */ "MSEXT_ENDREGION",
+ /* 404 */ "MSEXT_INT8",
+ /* 405 */ "MSEXT_INT16",
+ /* 406 */ "MSEXT_INT32",
+ /* 407 */ "MSEXT_INT64",
+ /* 408 */ "MSEXT_BASED",
+ /* 409 */ "MSEXT_DECLSPEC",
+ /* 410 */ "MSEXT_CDECL",
+ /* 411 */ "MSEXT_FASTCALL",
+ /* 412 */ "MSEXT_STDCALL",
+ /* 413 */ "MSEXT_TRY",
+ /* 414 */ "MSEXT_EXCEPT",
+ /* 415 */ "MSEXT_FINALLY",
+ /* 416 */ "MSEXT_LEAVE",
+ /* 417 */ "MSEXT_INLINE",
+ /* 418 */ "MSEXT_ASM",
+ /* 419 */ "MSEXT_REGION",
+ /* 420 */ "MSEXT_ENDREGION",

- /* 422 */ "IMPORT",
+ /* 421 */ "IMPORT",
     };

     // make sure, I have not forgotten any commas (as I did more than once)
@@ -291,113 +290,112 @@
     /* 316 */ "const_cast",
     /* 317 */ "continue",
     /* 318 */ "default",
- /* 319 */ "defined",
- /* 320 */ "delete",
- /* 321 */ "do",
- /* 322 */ "double",
- /* 323 */ "dynamic_cast",
- /* 324 */ "else",
- /* 325 */ "enum",
- /* 326 */ "explicit",
- /* 327 */ "export",
- /* 328 */ "extern",
- /* 329 */ "float",
- /* 330 */ "for",
- /* 331 */ "friend",
- /* 332 */ "goto",
- /* 333 */ "if",
- /* 334 */ "inline",
- /* 335 */ "int",
- /* 336 */ "long",
- /* 337 */ "mutable",
- /* 338 */ "namespace",
- /* 339 */ "new",
- /* 340 */ "operator",
- /* 341 */ "private",
- /* 342 */ "protected",
- /* 343 */ "public",
- /* 344 */ "register",
- /* 345 */ "reinterpret_cast",
- /* 346 */ "return",
- /* 347 */ "short",
- /* 348 */ "signed",
- /* 349 */ "sizeof",
- /* 350 */ "static",
- /* 351 */ "static_cast",
- /* 352 */ "struct",
- /* 353 */ "switch",
- /* 354 */ "template",
- /* 355 */ "this",
- /* 356 */ "throw",
- /* 357 */ "try",
- /* 358 */ "typedef",
- /* 359 */ "typeid",
- /* 360 */ "typename",
- /* 361 */ "union",
- /* 362 */ "unsigned",
- /* 363 */ "using",
- /* 364 */ "virtual",
- /* 365 */ "void",
- /* 366 */ "volatile",
- /* 367 */ "wchar_t",
- /* 368 */ "while",
- /* 369 */ "#define",
- /* 370 */ "#if",
- /* 371 */ "#ifdef",
- /* 372 */ "#ifndef",
- /* 373 */ "#else",
- /* 374 */ "#elif",
- /* 375 */ "#endif",
- /* 376 */ "#error",
- /* 377 */ "#line",
- /* 378 */ "#pragma",
- /* 379 */ "#undef",
- /* 380 */ "#warning",
- /* 381 */ "", // identifier
- /* 382 */ "", // octalint
- /* 383 */ "", // decimalint
- /* 384 */ "", // hexlit
- /* 385 */ "", // intlit
- /* 386 */ "", // longintlit
- /* 387 */ "", // floatlit
- /* 388 */ "", // ccomment
- /* 389 */ "", // cppcomment
- /* 390 */ "", // charlit
- /* 391 */ "", // stringlit
- /* 392 */ "", // contline
- /* 393 */ "", // space
- /* 394 */ "", // space2
- /* 395 */ "\n",
- /* 396 */ "##",
- /* 397 */ "#",
- /* 398 */ "", // any
+ /* 319 */ "delete",
+ /* 320 */ "do",
+ /* 321 */ "double",
+ /* 322 */ "dynamic_cast",
+ /* 323 */ "else",
+ /* 324 */ "enum",
+ /* 325 */ "explicit",
+ /* 326 */ "export",
+ /* 327 */ "extern",
+ /* 328 */ "float",
+ /* 329 */ "for",
+ /* 330 */ "friend",
+ /* 331 */ "goto",
+ /* 332 */ "if",
+ /* 333 */ "inline",
+ /* 334 */ "int",
+ /* 335 */ "long",
+ /* 336 */ "mutable",
+ /* 337 */ "namespace",
+ /* 338 */ "new",
+ /* 339 */ "operator",
+ /* 340 */ "private",
+ /* 341 */ "protected",
+ /* 342 */ "public",
+ /* 343 */ "register",
+ /* 344 */ "reinterpret_cast",
+ /* 345 */ "return",
+ /* 346 */ "short",
+ /* 347 */ "signed",
+ /* 348 */ "sizeof",
+ /* 349 */ "static",
+ /* 350 */ "static_cast",
+ /* 351 */ "struct",
+ /* 352 */ "switch",
+ /* 353 */ "template",
+ /* 354 */ "this",
+ /* 355 */ "throw",
+ /* 356 */ "try",
+ /* 357 */ "typedef",
+ /* 358 */ "typeid",
+ /* 359 */ "typename",
+ /* 360 */ "union",
+ /* 361 */ "unsigned",
+ /* 362 */ "using",
+ /* 363 */ "virtual",
+ /* 364 */ "void",
+ /* 365 */ "volatile",
+ /* 366 */ "wchar_t",
+ /* 367 */ "while",
+ /* 368 */ "#define",
+ /* 369 */ "#if",
+ /* 370 */ "#ifdef",
+ /* 371 */ "#ifndef",
+ /* 372 */ "#else",
+ /* 373 */ "#elif",
+ /* 374 */ "#endif",
+ /* 375 */ "#error",
+ /* 376 */ "#line",
+ /* 377 */ "#pragma",
+ /* 378 */ "#undef",
+ /* 379 */ "#warning",
+ /* 380 */ "", // identifier
+ /* 381 */ "", // octalint
+ /* 382 */ "", // decimalint
+ /* 383 */ "", // hexlit
+ /* 384 */ "", // intlit
+ /* 385 */ "", // longintlit
+ /* 386 */ "", // floatlit
+ /* 387 */ "", // ccomment
+ /* 388 */ "", // cppcomment
+ /* 389 */ "", // charlit
+ /* 390 */ "", // stringlit
+ /* 391 */ "", // contline
+ /* 392 */ "", // space
+ /* 393 */ "", // space2
+ /* 394 */ "\n",
+ /* 395 */ "##",
+ /* 396 */ "#",
+ /* 397 */ "", // any
+ /* 398 */ "#include",
     /* 399 */ "#include",
     /* 400 */ "#include",
- /* 401 */ "#include",
- /* 402 */ "", // eof
- /* 403 */ "", // eoi
- /* 404 */ "", // pp-number
+ /* 401 */ "", // eof
+ /* 402 */ "", // eoi
+ /* 403 */ "", // pp-number

               // MS extensions
- /* 405 */ "__int8",
- /* 406 */ "__int16",
- /* 407 */ "__int32",
- /* 408 */ "__int64",
- /* 409 */ "__based",
- /* 410 */ "__declspec",
- /* 411 */ "__cdecl",
- /* 412 */ "__fastcall",
- /* 413 */ "__stdcall",
- /* 414 */ "__try",
- /* 415 */ "__except",
- /* 416 */ "__finally",
- /* 417 */ "__leave",
- /* 418 */ "__inline",
- /* 419 */ "__asm",
- /* 420 */ "#region",
- /* 421 */ "#endregion",
-
- /* 422 */ "import",
+ /* 404 */ "__int8",
+ /* 405 */ "__int16",
+ /* 406 */ "__int32",
+ /* 407 */ "__int64",
+ /* 408 */ "__based",
+ /* 409 */ "__declspec",
+ /* 410 */ "__cdecl",
+ /* 411 */ "__fastcall",
+ /* 412 */ "__stdcall",
+ /* 413 */ "__try",
+ /* 414 */ "__except",
+ /* 415 */ "__finally",
+ /* 416 */ "__leave",
+ /* 417 */ "__inline",
+ /* 418 */ "__asm",
+ /* 419 */ "#region",
+ /* 420 */ "#endregion",
+
+ /* 421 */ "import",
     };

     // make sure, I have not forgotten any commas (as I did more than once)

Next message: john_at_[hidden]: "[Boost-commit] svn:boost r42855 - trunk/boost/test/impl"
Previous message: hartmut.kaiser_at_[hidden]: "[Boost-commit] svn:boost r42853 - in trunk: boost/wave libs/wave/doc libs/wave/samples/cpp_tokens/slex libs/wave/src"

Date view	Thread view	Subject view	Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk