Update of /cvsroot/boost/boost/libs/wave/samples/cpp_tokens/slex
In directory
sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21471/libs/wave/samples/cpp_tokens/slex
Modified Files:
cpp_slex_lexer.hpp
Log Message:
Wave: Fixed a problem in the SLex C++ lexer (cpp_tokens example).
Index: cpp_slex_lexer.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- cpp_slex_lexer.hpp 20 Dec 2006 16:55:54 -0000 1.35
+++ cpp_slex_lexer.hpp 23 Mar 2007 19:28:15 -0000 1.36
@@ -151,21 +151,21 @@
#define FLOAT_SUFFIX "(" "[fF][lL]?" OR "[lL][fF]?" ")"
#define CHAR_SPEC "L?"
-#define BACKSLASH "(" Q("\\") OR TRI(Q("/")) ")"
-#define ESCAPESEQ BACKSLASH "(" \
+#define BACKSLASH "(" "\\" OR TRI(Q("/")) ")"
+#define ESCAPESEQ "(" BACKSLASH "(" \
"[abfnrtv?'\"]" OR \
BACKSLASH OR \
"x" HEXDIGIT "+" OR \
OCTALDIGIT OCTALDIGIT "?" OCTALDIGIT "?" \
- ")"
+ "))"
#define HEXQUAD HEXDIGIT HEXDIGIT HEXDIGIT HEXDIGIT
-#define UNIVERSALCHAR BACKSLASH "(" \
+#define UNIVERSALCHAR "(" BACKSLASH "(" \
"u" HEXQUAD OR \
"U" HEXQUAD HEXQUAD \
- ")"
+ "))"
#define POUNDDEF "(" "#" OR TRI("=") OR Q("%:") ")"
-#define NEWLINEDEF "(" "\\n" OR "\\r" OR "\\r\\n" ")"
+#define NEWLINEDEF "(" "\n" OR "\r" OR "\r\n" ")"
#if BOOST_WAVE_SUPPORT_INCLUDE_NEXT != 0
#define INCLUDEDEF "(include|include_next)"
@@ -380,7 +380,7 @@
"(" ESCAPESEQ OR "[^\\n\\r\"]" OR UNIVERSALCHAR ")*" Q("\"")),
TOKEN_DATA(SPACE, "[ \t\v\f]+"),
// TOKEN_DATA(SPACE2, "[\\v\\f]+"),
- TOKEN_DATA(CONTLINE, Q("\\") "\\n"),
+ TOKEN_DATA(CONTLINE, "\\" "\\n"),
TOKEN_DATA(NEWLINE, NEWLINEDEF),
TOKEN_DATA(POUND_POUND, "##"),
TOKEN_DATA(POUND_POUND_ALT, Q("%:") Q("%:")),
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
