[Boost-commit] svn:boost r72199 - in branches/release: . libs libs/wave libs/wave/samples/cpp_tokens libs/wave/samples/cpp_tokens/slex

Subject: [Boost-commit] svn:boost r72199 - in branches/release: . libs libs/wave libs/wave/samples/cpp_tokens libs/wave/samples/cpp_tokens/slex
From: hartmut.kaiser_at_[hidden]
Date: 2011-05-26 18:27:40

Author: hkaiser
Date: 2011-05-26 18:27:39 EDT (Thu, 26 May 2011)
New Revision: 72199
URL: http://svn.boost.org/trac/boost/changeset/72199

Log:
Wave merging from trunk
Properties modified: 
   branches/release/   (props changed)
   branches/release/libs/   (props changed)
   branches/release/libs/wave/   (props changed)
Text files modified: 
   branches/release/libs/wave/ChangeLog                                  |     1 +                                       
   branches/release/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp |     2 +-                                      
   branches/release/libs/wave/samples/cpp_tokens/slex_token.hpp          |     2 +-                                      
   3 files changed, 3 insertions(+), 2 deletions(-)

Modified: branches/release/libs/wave/ChangeLog
==============================================================================
--- branches/release/libs/wave/ChangeLog	(original)
+++ branches/release/libs/wave/ChangeLog	2011-05-26 18:27:39 EDT (Thu, 26 May 2011)
@@ -37,6 +37,7 @@
   later on.
 - Fixed problem #5554: wave slex parser eof without eol skips the last line.
   interactive mode.
+- Fixed #5569: slex CONTLINE token works only for LF line endings
 
 Boost V1.46.0
 - V2.2.0

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	2011-05-26 18:27:39 EDT (Thu, 26 May 2011)
@@ -382,7 +382,7 @@
 #endif
     TOKEN_DATA(SPACE, "[ \t\v\f]+"),
 //    TOKEN_DATA(SPACE2, "[\\v\\f]+"),
-    TOKEN_DATA(CONTLINE, "\\" "\\n"), 
+    TOKEN_DATA(CONTLINE, Q("\\") "\n"), 
     TOKEN_DATA(NEWLINE, NEWLINEDEF),
     TOKEN_DATA(POUND_POUND, "##"),
     TOKEN_DATA(POUND_POUND_ALT, Q("%:") Q("%:")),

Modified: branches/release/libs/wave/samples/cpp_tokens/slex_token.hpp
==============================================================================
--- branches/release/libs/wave/samples/cpp_tokens/slex_token.hpp	(original)
+++ branches/release/libs/wave/samples/cpp_tokens/slex_token.hpp	2011-05-26 18:27:39 EDT (Thu, 26 May 2011)
@@ -92,7 +92,7 @@
         
         stream << std::setw(16) 
             << std::left << boost::wave::get_token_name(id) << " ("
-            << "#" << token_id(ID_FROM_TOKEN(*this)) 
+            << "#" << token_id(BASEID_FROM_TOKEN(*this)) 
             << ") at " << get_position().get_file() << " (" 
             << std::setw(3) << std::right << get_position().get_line() << "/" 
             << std::setw(2) << std::right << get_position().get_column()