Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r67892 - in trunk/boost: . wave wave/cpplexer wave/cpplexer/re2clex wave/grammars wave/util
From: hartmut.kaiser_at_[hidden]
Date: 2011-01-09 16:47:32


Author: hkaiser
Date: 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
New Revision: 67892
URL: http://svn.boost.org/trac/boost/changeset/67892

Log:
Wave: updated copyrights, worked on whitespace skipping
Text files modified:
   trunk/boost/wave.hpp | 2
   trunk/boost/wave/cpp_context.hpp | 2
   trunk/boost/wave/cpp_exceptions.hpp | 2
   trunk/boost/wave/cpp_iteration_context.hpp | 2
   trunk/boost/wave/cpp_throw.hpp | 2
   trunk/boost/wave/cpplexer/convert_trigraphs.hpp | 2
   trunk/boost/wave/cpplexer/cpp_lex_interface.hpp | 2
   trunk/boost/wave/cpplexer/cpp_lex_interface_generator.hpp | 2
   trunk/boost/wave/cpplexer/cpp_lex_iterator.hpp | 2
   trunk/boost/wave/cpplexer/cpp_lex_token.hpp | 2
   trunk/boost/wave/cpplexer/cpplexer_exceptions.hpp | 2
   trunk/boost/wave/cpplexer/detect_include_guards.hpp | 2
   trunk/boost/wave/cpplexer/re2clex/aq.hpp | 2
   trunk/boost/wave/cpplexer/re2clex/cpp_re.hpp | 2
   trunk/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp | 2
   trunk/boost/wave/cpplexer/re2clex/scanner.hpp | 2
   trunk/boost/wave/cpplexer/token_cache.hpp | 2
   trunk/boost/wave/cpplexer/validate_universal_char.hpp | 2
   trunk/boost/wave/grammars/cpp_chlit_grammar.hpp | 2
   trunk/boost/wave/grammars/cpp_defined_grammar.hpp | 2
   trunk/boost/wave/grammars/cpp_defined_grammar_gen.hpp | 2
   trunk/boost/wave/grammars/cpp_expression_grammar.hpp | 2
   trunk/boost/wave/grammars/cpp_expression_grammar_gen.hpp | 2
   trunk/boost/wave/grammars/cpp_expression_value.hpp | 2
   trunk/boost/wave/grammars/cpp_grammar.hpp | 2
   trunk/boost/wave/grammars/cpp_grammar_gen.hpp | 2
   trunk/boost/wave/grammars/cpp_intlit_grammar.hpp | 2
   trunk/boost/wave/grammars/cpp_literal_grammar_gen.hpp | 2
   trunk/boost/wave/grammars/cpp_predef_macros_gen.hpp | 2
   trunk/boost/wave/grammars/cpp_predef_macros_grammar.hpp | 2
   trunk/boost/wave/grammars/cpp_value_error.hpp | 2
   trunk/boost/wave/language_support.hpp | 2
   trunk/boost/wave/preprocessing_hooks.hpp | 2
   trunk/boost/wave/token_ids.hpp | 2
   trunk/boost/wave/util/cpp_ifblock.hpp | 2
   trunk/boost/wave/util/cpp_include_paths.hpp | 2
   trunk/boost/wave/util/cpp_iterator.hpp | 2
   trunk/boost/wave/util/cpp_macromap.hpp | 2
   trunk/boost/wave/util/cpp_macromap_predef.hpp | 2
   trunk/boost/wave/util/cpp_macromap_utils.hpp | 2
   trunk/boost/wave/util/file_position.hpp | 2
   trunk/boost/wave/util/filesystem_compatibility.hpp | 2
   trunk/boost/wave/util/functor_input.hpp | 2
   trunk/boost/wave/util/insert_whitespace_detection.hpp | 2
   trunk/boost/wave/util/interpret_pragma.hpp | 2
   trunk/boost/wave/util/iteration_context.hpp | 2
   trunk/boost/wave/util/macro_definition.hpp | 2
   trunk/boost/wave/util/macro_helpers.hpp | 2
   trunk/boost/wave/util/pattern_parser.hpp | 2
   trunk/boost/wave/util/symbol_table.hpp | 2
   trunk/boost/wave/util/time_conversion_helper.hpp | 2
   trunk/boost/wave/util/transform_iterator.hpp | 2
   trunk/boost/wave/util/unput_queue_iterator.hpp | 2
   trunk/boost/wave/wave_config.hpp | 2
   trunk/boost/wave/wave_config_constant.hpp | 2
   trunk/boost/wave/wave_version.hpp | 2
   trunk/boost/wave/whitespace_handling.hpp | 61 ++++++++++++++++++++++++++++++++++-----
   57 files changed, 109 insertions(+), 64 deletions(-)

Modified: trunk/boost/wave.hpp
==============================================================================
--- trunk/boost/wave.hpp (original)
+++ trunk/boost/wave.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
 
     See http://www.boost.org/libs/wave for documentation
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/cpp_context.hpp
==============================================================================
--- trunk/boost/wave/cpp_context.hpp (original)
+++ trunk/boost/wave/cpp_context.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/cpp_exceptions.hpp
==============================================================================
--- trunk/boost/wave/cpp_exceptions.hpp (original)
+++ trunk/boost/wave/cpp_exceptions.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/cpp_iteration_context.hpp
==============================================================================
--- trunk/boost/wave/cpp_iteration_context.hpp (original)
+++ trunk/boost/wave/cpp_iteration_context.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/cpp_throw.hpp
==============================================================================
--- trunk/boost/wave/cpp_throw.hpp (original)
+++ trunk/boost/wave/cpp_throw.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/cpplexer/convert_trigraphs.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/convert_trigraphs.hpp (original)
+++ trunk/boost/wave/cpplexer/convert_trigraphs.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/cpplexer/cpp_lex_interface.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/cpp_lex_interface.hpp (original)
+++ trunk/boost/wave/cpplexer/cpp_lex_interface.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/cpplexer/cpp_lex_interface_generator.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/cpp_lex_interface_generator.hpp (original)
+++ trunk/boost/wave/cpplexer/cpp_lex_interface_generator.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/cpplexer/cpp_lex_iterator.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/cpp_lex_iterator.hpp (original)
+++ trunk/boost/wave/cpplexer/cpp_lex_iterator.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/cpplexer/cpp_lex_token.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/cpp_lex_token.hpp (original)
+++ trunk/boost/wave/cpplexer/cpp_lex_token.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/cpplexer/cpplexer_exceptions.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/cpplexer_exceptions.hpp (original)
+++ trunk/boost/wave/cpplexer/cpplexer_exceptions.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/cpplexer/detect_include_guards.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/detect_include_guards.hpp (original)
+++ trunk/boost/wave/cpplexer/detect_include_guards.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -22,7 +22,7 @@
     will work as well). The code allows for any whitespace, newline and single
     '#' tokens before the #if/#ifndef and after the final #endif.
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/cpplexer/re2clex/aq.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/re2clex/aq.hpp (original)
+++ trunk/boost/wave/cpplexer/re2clex/aq.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -4,7 +4,7 @@
     http://www.boost.org/
     
     Copyright (c) 2001 Daniel C. Nuffer.
- Copyright (c) 2001-2010 Hartmut Kaiser.
+ Copyright (c) 2001-2011 Hartmut Kaiser.
     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)
 =============================================================================*/

Modified: trunk/boost/wave/cpplexer/re2clex/cpp_re.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/re2clex/cpp_re.hpp (original)
+++ trunk/boost/wave/cpplexer/re2clex/cpp_re.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp (original)
+++ trunk/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/cpplexer/re2clex/scanner.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/re2clex/scanner.hpp (original)
+++ trunk/boost/wave/cpplexer/re2clex/scanner.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -4,7 +4,7 @@
     http://www.boost.org/
 
     Copyright (c) 2001 Daniel C. Nuffer.
- Copyright (c) 2001-2010 Hartmut Kaiser.
+ Copyright (c) 2001-2011 Hartmut Kaiser.
     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)
 =============================================================================*/

Modified: trunk/boost/wave/cpplexer/token_cache.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/token_cache.hpp (original)
+++ trunk/boost/wave/cpplexer/token_cache.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/cpplexer/validate_universal_char.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/validate_universal_char.hpp (original)
+++ trunk/boost/wave/cpplexer/validate_universal_char.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/grammars/cpp_chlit_grammar.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_chlit_grammar.hpp (original)
+++ trunk/boost/wave/grammars/cpp_chlit_grammar.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/grammars/cpp_defined_grammar.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_defined_grammar.hpp (original)
+++ trunk/boost/wave/grammars/cpp_defined_grammar.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/grammars/cpp_defined_grammar_gen.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_defined_grammar_gen.hpp (original)
+++ trunk/boost/wave/grammars/cpp_defined_grammar_gen.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/grammars/cpp_expression_grammar.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_expression_grammar.hpp (original)
+++ trunk/boost/wave/grammars/cpp_expression_grammar.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/grammars/cpp_expression_grammar_gen.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_expression_grammar_gen.hpp (original)
+++ trunk/boost/wave/grammars/cpp_expression_grammar_gen.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/grammars/cpp_expression_value.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_expression_value.hpp (original)
+++ trunk/boost/wave/grammars/cpp_expression_value.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/grammars/cpp_grammar.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_grammar.hpp (original)
+++ trunk/boost/wave/grammars/cpp_grammar.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/grammars/cpp_grammar_gen.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_grammar_gen.hpp (original)
+++ trunk/boost/wave/grammars/cpp_grammar_gen.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/grammars/cpp_intlit_grammar.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_intlit_grammar.hpp (original)
+++ trunk/boost/wave/grammars/cpp_intlit_grammar.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/grammars/cpp_literal_grammar_gen.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_literal_grammar_gen.hpp (original)
+++ trunk/boost/wave/grammars/cpp_literal_grammar_gen.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/grammars/cpp_predef_macros_gen.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_predef_macros_gen.hpp (original)
+++ trunk/boost/wave/grammars/cpp_predef_macros_gen.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/grammars/cpp_predef_macros_grammar.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_predef_macros_grammar.hpp (original)
+++ trunk/boost/wave/grammars/cpp_predef_macros_grammar.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/grammars/cpp_value_error.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_value_error.hpp (original)
+++ trunk/boost/wave/grammars/cpp_value_error.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/language_support.hpp
==============================================================================
--- trunk/boost/wave/language_support.hpp (original)
+++ trunk/boost/wave/language_support.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/preprocessing_hooks.hpp
==============================================================================
--- trunk/boost/wave/preprocessing_hooks.hpp (original)
+++ trunk/boost/wave/preprocessing_hooks.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/token_ids.hpp
==============================================================================
--- trunk/boost/wave/token_ids.hpp (original)
+++ trunk/boost/wave/token_ids.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/cpp_ifblock.hpp
==============================================================================
--- trunk/boost/wave/util/cpp_ifblock.hpp (original)
+++ trunk/boost/wave/util/cpp_ifblock.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/cpp_include_paths.hpp
==============================================================================
--- trunk/boost/wave/util/cpp_include_paths.hpp (original)
+++ trunk/boost/wave/util/cpp_include_paths.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/cpp_iterator.hpp
==============================================================================
--- trunk/boost/wave/util/cpp_iterator.hpp (original)
+++ trunk/boost/wave/util/cpp_iterator.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/cpp_macromap.hpp
==============================================================================
--- trunk/boost/wave/util/cpp_macromap.hpp (original)
+++ trunk/boost/wave/util/cpp_macromap.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/cpp_macromap_predef.hpp
==============================================================================
--- trunk/boost/wave/util/cpp_macromap_predef.hpp (original)
+++ trunk/boost/wave/util/cpp_macromap_predef.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/cpp_macromap_utils.hpp
==============================================================================
--- trunk/boost/wave/util/cpp_macromap_utils.hpp (original)
+++ trunk/boost/wave/util/cpp_macromap_utils.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/file_position.hpp
==============================================================================
--- trunk/boost/wave/util/file_position.hpp (original)
+++ trunk/boost/wave/util/file_position.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/filesystem_compatibility.hpp
==============================================================================
--- trunk/boost/wave/util/filesystem_compatibility.hpp (original)
+++ trunk/boost/wave/util/filesystem_compatibility.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/functor_input.hpp
==============================================================================
--- trunk/boost/wave/util/functor_input.hpp (original)
+++ trunk/boost/wave/util/functor_input.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/insert_whitespace_detection.hpp
==============================================================================
--- trunk/boost/wave/util/insert_whitespace_detection.hpp (original)
+++ trunk/boost/wave/util/insert_whitespace_detection.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/interpret_pragma.hpp
==============================================================================
--- trunk/boost/wave/util/interpret_pragma.hpp (original)
+++ trunk/boost/wave/util/interpret_pragma.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/iteration_context.hpp
==============================================================================
--- trunk/boost/wave/util/iteration_context.hpp (original)
+++ trunk/boost/wave/util/iteration_context.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/macro_definition.hpp
==============================================================================
--- trunk/boost/wave/util/macro_definition.hpp (original)
+++ trunk/boost/wave/util/macro_definition.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/macro_helpers.hpp
==============================================================================
--- trunk/boost/wave/util/macro_helpers.hpp (original)
+++ trunk/boost/wave/util/macro_helpers.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/pattern_parser.hpp
==============================================================================
--- trunk/boost/wave/util/pattern_parser.hpp (original)
+++ trunk/boost/wave/util/pattern_parser.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/symbol_table.hpp
==============================================================================
--- trunk/boost/wave/util/symbol_table.hpp (original)
+++ trunk/boost/wave/util/symbol_table.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/time_conversion_helper.hpp
==============================================================================
--- trunk/boost/wave/util/time_conversion_helper.hpp (original)
+++ trunk/boost/wave/util/time_conversion_helper.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/transform_iterator.hpp
==============================================================================
--- trunk/boost/wave/util/transform_iterator.hpp (original)
+++ trunk/boost/wave/util/transform_iterator.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/util/unput_queue_iterator.hpp
==============================================================================
--- trunk/boost/wave/util/unput_queue_iterator.hpp (original)
+++ trunk/boost/wave/util/unput_queue_iterator.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/wave_config.hpp
==============================================================================
--- trunk/boost/wave/wave_config.hpp (original)
+++ trunk/boost/wave/wave_config.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/wave_config_constant.hpp
==============================================================================
--- trunk/boost/wave/wave_config_constant.hpp (original)
+++ trunk/boost/wave/wave_config_constant.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/wave_version.hpp
==============================================================================
--- trunk/boost/wave/wave_version.hpp (original)
+++ trunk/boost/wave/wave_version.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: trunk/boost/wave/whitespace_handling.hpp
==============================================================================
--- trunk/boost/wave/whitespace_handling.hpp (original)
+++ trunk/boost/wave/whitespace_handling.hpp 2011-01-09 16:47:21 EST (Sun, 09 Jan 2011)
@@ -5,7 +5,7 @@
     http://www.boost.org/
 
     Copyright (c) 2003 Paul Mensonides
- Copyright (c) 2001-2010 Hartmut Kaiser.
+ Copyright (c) 2001-2011 Hartmut Kaiser.
     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)
 =============================================================================*/
@@ -99,6 +99,10 @@
     template <typename ContextT>
     bool may_skip_whitespace(ContextT const& ctx, TokenT &token,
         bool &skipped_newline);
+ template <typename ContextT>
+ bool may_skip_whitespace(ContextT const& ctx, TokenT &token,
+ bool preserve_comments_, bool preserve_bol_whitespace_,
+ bool &skipped_newline);
 
 protected:
     bool skip_cppcomment(boost::wave::token_id id)
@@ -109,14 +113,16 @@
 private:
     typedef bool state_t(TokenT &token, bool &skipped_newline);
     state_t eat_whitespace::* state;
- state_t general, newline, newline_2nd, whitespace;
+ state_t general, newline, newline_2nd, whitespace, bol_whitespace;
     bool preserve_comments;
+ bool preserve_bol_whitespace;
 };
 
 template <typename TokenT>
 inline
 eat_whitespace<TokenT>::eat_whitespace()
-: state(&eat_whitespace::newline), preserve_comments(false)
+: state(&eat_whitespace::newline), preserve_comments(false),
+ preserve_bol_whitespace(false)
 {
 }
 
@@ -132,6 +138,19 @@
 }
 
 template <typename TokenT>
+template <typename ContextT>
+inline bool
+eat_whitespace<TokenT>::may_skip_whitespace(ContextT const& ctx, TokenT &token,
+ bool preserve_comments_, bool preserve_bol_whitespace_,
+ bool &skipped_newline)
+{
+ // re-initialize the preserve comments state
+ preserve_comments = preserve_comments_;
+ preserve_bol_whitespace = preserve_bol_whitespace_;
+ return (this->*state)(token, skipped_newline);
+}
+
+template <typename TokenT>
 inline bool
 eat_whitespace<TokenT>::general(TokenT &token, bool &skipped_newline)
 {
@@ -164,16 +183,16 @@
 eat_whitespace<TokenT>::newline(TokenT &token, bool &skipped_newline)
 {
     using namespace boost::wave;
-
+
     token_id id = token_id(token);
     if (T_NEWLINE == id || T_CPPCOMMENT == id) {
         skipped_newline = true;
         state = &eat_whitespace::newline_2nd;
         return T_NEWLINE == id || skip_cppcomment(id);
     }
- else if (T_SPACE != id && T_SPACE2 != id && T_CCOMMENT != id) {
+
+ if (T_SPACE != id && T_SPACE2 != id && T_CCOMMENT != id)
         return general(token, skipped_newline);
- }
 
     if (T_CCOMMENT == id) {
         if (util::ccomment_has_newline(token)) {
@@ -184,8 +203,14 @@
             state = &eat_whitespace::general;
             return false;
         }
- // fall through...
+ return true;
     }
+
+ if (preserve_bol_whitespace) {
+ state = &eat_whitespace::bol_whitespace;
+ return false;
+ }
+
     return true;
 }
 
@@ -196,8 +221,14 @@
     using namespace boost::wave;
 
     token_id id = token_id(token);
- if (T_SPACE == id || T_SPACE2 == id)
+ if (T_SPACE == id || T_SPACE2 == id) {
+ if (preserve_bol_whitespace) {
+ state = &eat_whitespace::bol_whitespace;
+ return false;
+ }
         return true;
+ }
+
     if (T_CCOMMENT == id) {
         if (util::ccomment_has_newline(token))
             skipped_newline = true;
@@ -208,6 +239,7 @@
         }
         return true;
     }
+
     if (T_NEWLINE != id && T_CPPCOMMENT != id)
         return general(token, skipped_newline);
 
@@ -217,6 +249,19 @@
 
 template <typename TokenT>
 inline bool
+eat_whitespace<TokenT>::bol_whitespace(TokenT &token, bool &skipped_newline)
+{
+ using namespace boost::wave;
+
+ token_id id = token_id(token);
+ if (T_SPACE == id || T_SPACE2 == id)
+ return !preserve_bol_whitespace;
+
+ return general(token, skipped_newline);
+}
+
+template <typename TokenT>
+inline bool
 eat_whitespace<TokenT>::whitespace(TokenT &token, bool &skipped_newline)
 {
     using namespace boost::wave;


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