Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r49305 - in branches/release: boost/wave/cpplexer libs/wave/doc libs/wave/samples/cpp_tokens libs/wave/samples/cpp_tokens/slex libs/wave/samples/list_includes libs/wave/samples/list_includes/lexertl
From: hartmut.kaiser_at_[hidden]
Date: 2008-10-12 21:24:35

Next message: hartmut.kaiser_at_[hidden]: "[Boost-commit] svn:boost r49306 - branches/release/libs/wave/samples/waveidl/idllexer"
Previous message: hartmut.kaiser_at_[hidden]: "[Boost-commit] svn:boost r49304 - in trunk/libs/wave: . samples/waveidl/idllexer"

Author: hkaiser
Date: 2008-10-12 21:24:34 EDT (Sun, 12 Oct 2008)
New Revision: 49305
URL: http://svn.boost.org/trac/boost/changeset/49305

Log:
Wave: merging fixes to release branch
Text files modified:
   branches/release/boost/wave/cpplexer/cpp_lex_iterator.hpp | 20
   branches/release/libs/wave/doc/class_reference_context.html | 4
   branches/release/libs/wave/doc/class_reference_ctxpolicy.html | 590 +++++++++------------------------------
   branches/release/libs/wave/doc/class_reference_filepos.html | 4
   branches/release/libs/wave/doc/class_reference_inptpolcy.html | 4
   branches/release/libs/wave/doc/class_reference_lexer.html | 6
   branches/release/libs/wave/doc/class_reference_tokentype.html | 4
   branches/release/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp | 6
   branches/release/libs/wave/samples/cpp_tokens/slex_iterator.hpp | 30 +-
   branches/release/libs/wave/samples/list_includes/lexertl/lexertl_lexer.hpp | 14
   branches/release/libs/wave/samples/list_includes/lexertl_iterator.hpp | 115 +++++--
   11 files changed, 265 insertions(+), 532 deletions(-)

Modified: branches/release/boost/wave/cpplexer/cpp_lex_iterator.hpp
==============================================================================
--- branches/release/boost/wave/cpplexer/cpp_lex_iterator.hpp (original)
+++ branches/release/boost/wave/cpplexer/cpp_lex_iterator.hpp 2008-10-12 21:24:34 EDT (Sun, 12 Oct 2008)
@@ -99,7 +99,7 @@
 {
 return mp.shared->ftor->has_include_guards(guard_name);
 }
-#endif
+#endif
};

///////////////////////////////////////////////////////////////////////////////
@@ -156,7 +156,7 @@
 typedef boost::spirit::multi_pass_policies::no_check check_policy;
#endif
 typedef boost::spirit::multi_pass_policies::split_std_deque storage_policy;
-
+
 typedef boost::spirit::multi_pass_policies::default_policy<
 ownership_policy, check_policy, input_policy, storage_policy>
 policy_type;
@@ -169,20 +169,20 @@
: public make_multi_pass<impl::lex_iterator_functor_shim<TokenT> >::type
{
 typedef impl::lex_iterator_functor_shim<TokenT> input_policy_type;
-
+
 typedef typename make_multi_pass<input_policy_type>::type base_type;
 typedef typename make_multi_pass<input_policy_type>::functor_data_type
 functor_data_type;

 typedef typename input_policy_type::unique unique_functor_type;
 typedef typename input_policy_type::shared shared_functor_type;
-
+
public:
 typedef TokenT token_type;
-
+
 lex_iterator()
 {}
-
+
 template <typename IteratorT>
 lex_iterator(IteratorT const &first, IteratorT const &last,
 typename TokenT::position_type const &pos,
@@ -199,7 +199,7 @@
 void set_position(typename TokenT::position_type const &pos)
 {
 typedef typename TokenT::position_type position_type;
-
+
 // set the new position in the current token
 token_type& currtoken = this->base_type::dereference(*this);
 position_type currpos = currtoken.get_position();
@@ -207,7 +207,7 @@
 currpos.set_file(pos.get_file());
 currpos.set_line(pos.get_line());
 currtoken.set_position(currpos);
-
+
 // set the new position for future tokens as well
 if (token_type::string_type::npos !=
 currtoken.get_value().find_first_of('\n'))
@@ -216,7 +216,7 @@
 }
 unique_functor_type::set_position(*this, currpos);
 }
-
+
#if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
 // return, whether the current file has include guards
 // this function returns meaningful results only if the file was scanned
@@ -225,7 +225,7 @@
 {
 return unique_functor_type::has_include_guards(*this, guard_name);
 }
-#endif
+#endif
};

///////////////////////////////////////////////////////////////////////////////

Modified: branches/release/libs/wave/doc/class_reference_context.html
==============================================================================
--- branches/release/libs/wave/doc/class_reference_context.html (original)
+++ branches/release/libs/wave/doc/class_reference_context.html 2008-10-12 21:24:34 EDT (Sun, 12 Oct 2008)
@@ -51,7 +51,7 @@
 for instance to control, whether to enable several extensions to the
 C++ Standard (as for instance variadics and placemarkers) or not.
</blockquote>
-<h2><a name="header_synopsis"></a>Header wave/cpp_context.hpp synopsis</h2>
+<h2><a name="header_synopsis"></a>Header wave/cpp_context.hpp synopsis</h2>
<pre>namespace boost { namespace wave { struct this_type {}; template < typename Iterator, typename LexIterator, typename InputPolicy, typename ContextPolicy, typename Derived = this_type > class context : public InputPolicy { typedef <unspecified> token_sequence_type; public: typedef pp_iterator<context> iterator_type; typedef Token token_
type; typedef typename token_type::position_type position_type; typedef std::list<token_type> token_sequence_type; // constructor context(Iterator const &first_, Iterator const &last_, char const *fname = "<Unknown>", ContextPolicy const& ctx_policy = ContextPolicy()) // iterator interface iterator_type begin() const; iterator_type begin(Iterator const &first, Iterator const &last) const; iterator_type end() const; // maintain include paths bool add_include_path(char const *path_); bool add_sysinclude_path(char const *path_); void set_sysinclude_delimiter(); size_t get_iteration_depth() const; // maintain defined m
acros template <typename String> bool add_macro_definition(String macrostring, bool is_predefined = false); template <typename String> bool add_macro_definition(StringT const &name, position_type const& pos, bool has_params, std::vector<token_type> &parameters, token_sequence_type &definition, bool is_predefined = false) template <typename String> bool is_defined_macro(String const &name) const; template <typename String> bool remove_macro_definition(String const &name, bool even_predefined = false); void reset_macro_definitions(); template <typename String> bool <a href="class_reference_context.html#get_macro_definition">
get_macro_definition</a>( String const &name, bool &is_function_style, bool &is_predefined, position_type &pos, std::vector<token_type> &parameters, token_sequence_type &definition) const; typedef <unspecified> macromap_type; typedef typename macromap_type::name_iterator name_iterator; typedef typename macromap_type::const_name_iterator const_name_iterator; name_iterator macro_names_begin(); name_iterator macro_names_end(); const_name_iterator <a href="class_reference_context.html#m
acro_names_iterators">macro_names_begin</a>() const; const_name_iterator macro_names_end() const; // other options void set_language(language_support enable); language_support get_language() const; void set_max_include_nesting_depth(std::size_t new_depth); size_t get_max_include_nesting_depth() const; // get the Wave version information static
std::string get_version(); static std::string get_version_string(); }; } // namespace wave } // namespace boost</pre>
<h2><a name="template_parameters"></a>Template
 parameters</h2>
@@ -477,7 +477,7 @@

Last
 updated:
- Tuesday, July 29, 2008 20:30
+ Sunday, October 12, 2008 20:14
 
 
</body>

Modified: branches/release/libs/wave/doc/class_reference_ctxpolicy.html
==============================================================================
--- branches/release/libs/wave/doc/class_reference_ctxpolicy.html (original)
+++ branches/release/libs/wave/doc/class_reference_ctxpolicy.html 2008-10-12 21:24:34 EDT (Sun, 12 Oct 2008)
@@ -1,102 +1,56 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
-
-
- <title>The Context Policy</title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
- <link href="theme/style.css" rel="stylesheet" type="text/css">
+<title>The Context Policy</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link href="theme/style.css" rel="stylesheet" type="text/css">
</head>
-
-
<body>
-
<table background="theme/bkd2.gif" border="0" cellspacing="2" width="100%">
-
 <tbody>
 <tr>
-
- <td width="21">
- <h1></h1>
- </td>
-
- <td width="885"> The
- Context Policy </td>
-
- <td width="96"></td>
-
- </tr>
-
+ <td width="21"> </td>
+ <td width="885">The
+ Context Policy </td>
+ <td width="96"></td>
+ </tr>
 </tbody>
</table>
-
 
-
<table border="0">
-
 <tbody>
 <tr>
-
- <td width="10"></td>
-
- <td width="30"></td>
-
- <td width="30"></td>
-
- <td width="30"></td>
-
- </tr>
-
+ <td width="10"></td>
+ <td width="30"></td>
+ <td width="30"></td>
+ <td width="30"></td>
+ </tr>
 </tbody>
</table>
-
-<blockquote>
-
+<blockquote>
 Introduction 
-
 <a href="class_reference_ctxpolicy.html#header_synopsis">Header 'wave/preprocessing_hooks.hpp'
 synopsis</a> 
-
 <a href="class_reference_ctxpolicy.html#member_functions">Member functions</a>
-
</blockquote>
-
<h2><a name="introduction"></a>Introduction</h2>
-
Please note that the following description relates to the new
-preprocessing hooks interface used by default starting with the Boost
-V1.35.0 release. If you are interested in the older interface please
-look here. 
-
+ preprocessing hooks interface used by default starting with the Boost
+ V1.35.0 release. If you are interested in the older interface please
+ look here. 
The context policy is used to provide callback hooks, which are called from inside the library into the user code, whenever
-
<ul>
-
 <li>a preprocessor directive has been recognized, </li>
-
 <li>a token is about to be returned from the preprocessor, </li>
-
 <li>a macro get's defined or undefined, </li>
-
 <li>a macro has been expanded or rescanned,</li>
-
 <li>an include file has been opened or closed, </li>
-
 <li>a conditional expression was evaluated,</li>
-
 <li>a token has to be skipped because it is contained in a non-evaluated conditional block, </li>
-
 <li> a pragma of the form <tt>'wave option[(value)]'</tt> has been recognized. </li>
-
</ul>
-
-This policy type is used as a template parameter to the boost::wave::context<>
- object, where the default policy provides empty hook functions only.
-
-<h2><a name="header_synopsis"></a>Header wave/preprocessing_hooks.hpp
- synopsis</h2>
-
+This policy type is used as a template parameter to the boost::wave::context<> object, where the default policy provides empty hook functions only.
+<h2><a name="header_synopsis"></a>Header wave/preprocessing_hooks.hpp synopsis</h2>
<pre>namespace boost { namespace wave { namespace context_policies { struct default_preprocessing_hooks { // general hook functions
 template <typename ContextT, typename TokenT> bool found_directive(ContextT const &ctx, TokenT const &directive); template <typename ContextT, typename ExceptionT> void throw_exception(ContextT const &ctx, ExceptionT const& e); // test, whether a given token may be skipped template <typename ContextT> bool <a href="c
lass_reference_ctxpolicy.html#may_skip_whitespace">may_skip_whitespace</a> (ContextT const& ctx, TokenT &token, bool &skipped_newline); 
 // Conditional compilation
@@ -112,573 +66,313 @@
 bool is_functionlike, ParametersT const &parameters, DefinitionT const &definition, bool is_predefined); template <typename ContextT, typename TokenT> void undefined_macro(ContextT const &ctx, TokenT const &name); // #error and #warning directive hooks
 template <typename ContextT, typename ContainerT> bool found_warning_directive(ContextT const &ctx, ContainerT const &message); template <typename ContextT, typename ContainerT> bool found_error_directive(ContextT const &ctx, ContainerT const &message); // #line directive hook
 template <typename ContextT, typename ContainerT> void found_line_directive(ContextT const &ctx, ContainerT const &arguments, unsigned int line, std::string const& filename); }; }}} // namespace boost::wave::context_policies</pre>
-
<h2><a name="member_functions"></a>Member functions</h2>
-
<h3>General hook functions </h3>
-
<a name="found_directive"></a>found_directive
-
-<pre> template <typename ContextT, typename TokenT> bool found_directive(ContextT const& ctx, TokenT const &directive); </pre>
-
+<pre> template <typename ContextT, typename TokenT> bool found_directive(ContextT const& ctx, TokenT const &directive); 
+</pre>
<blockquote>
-
 The function <tt>found_directive</tt> is called, whenever the preprocessor has detected one of the preprocessing directives (#define, #undef, #if, #idef, #ifndef, #elif, #endif, #error, #include, #pragma or #warning) .
-
-
- The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt>
-used during instantiation of the preprocessing iterators by the user.
-Note, this parameter was added for the Boost V1.35.0 release. 
-
-
+ The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user.
+ Note, this parameter was added for the Boost V1.35.0 release. 
 The parameter <tt>directive</tt> refers to the token containing the detected preprocessing directive. 
-
-
 If the return value is <tt>true</tt>, the directive will be
-skipped altogether, i.e. no preprocessing is done. The overall
-directive is replaced by a single newline character. If the return
-value is <tt>false</tt>, the directive is processed in the normal manner. 
-
+ skipped altogether, i.e. no preprocessing is done. The overall
+ directive is replaced by a single newline character. If the return
+ value is <tt>false</tt>, the directive is processed in the normal manner. 
</blockquote>
-
<a name="throw_exception"></a>throw_exception
-
<pre> template <typename ContextT, typename ExceptionT> void throw_exception(ContextT const &ctx, ExceptionT const& e);</pre>
-
<blockquote>
-
 he function <tt>throw_exception</tt> is called, whenever a preprocessing exception occurs .
-
-
- The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt>
-used during instantiation of the preprocessing iterators by the user.  
-
-
+ The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user.  
 The parameter <tt>e</tt> is the exception object containing detailed error information. 
-
-
</blockquote>
-
<a name="may_skip_whitespace" id="may_skip"></a>may_skipwhitespace
-
-<pre> template <typename ContextT, typename TokenT> bool may_skip_whitespace(ContextT const& ctx, TokenT &token, bool& skipped_newline); </pre>
-
+<pre> template <typename ContextT, typename TokenT> bool may_skip_whitespace(ContextT const& ctx, TokenT &token, bool& skipped_newline); 
+</pre>
<blockquote>
-
 The function <tt>may_skipwhitespace</tt> will be called by the library, whenever a token is about to be returned to the calling application. 
-
-
- The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt>
-used during instantiation of the preprocessing iterators by the user.
-Note, this parameter was added for the Wave V1.2.4 release. 
-
-
+ The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user.
+ Note, this parameter was added for the Wave V1.2.4 release. 
 The <tt>token</tt> parameter holds a reference to the current token. The policy is free to change this token if needed.
-
-
 The <tt>skipped_newline</tt> parameter holds a reference to a
-boolean value which should be set to true by the policy function
-whenever a newline is going to be skipped. 
-
-
+ boolean value which should be set to true by the policy function
+ whenever a newline is going to be skipped. 
 If the return value is <tt>true</tt>, the given token is skipped and the preprocessing continues to the next token. If the return value is <tt>false</tt>, the given token is returned to the calling application. Caution has to be used, because by returning true the policy function is able to force skipping even significant tokens not only whitespace. 
-
</blockquote>
-
<h3>Conditional compilation hook functions </h3>
-
<a name="evaluated_conditional_expression"></a>evaluated_conditional_expression
-
-<pre> template <typename ContextT, typename TokenT, typename ContainerT> bool evaluated_conditional_expression(ContextT const& ctx, TokenT const& directive, ContainerT const& expression, bool expression_value); </pre>
-
-<blockquote>
-
- The function <tt>evaluated_conditional_expression</tt> is called, whenever the preprocessor has encountered a #if, #elif, #ifdef or #ifndef
-directive. This hook gets passed the non-expanded conditional
-expression (as it was given in the analysed source file) and the result
-of the evaluation of this expression in the current preprocessing
-context.
-
-
- The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt>
-used during instantiation of the preprocessing iterators by the user.
-Note, this parameter was added for the Boost V1.35.0 release. 
-
-
+<pre> template <typename ContextT, typename TokenT, typename ContainerT> bool evaluated_conditional_expression(ContextT const& ctx, TokenT const& directive, ContainerT const& expression, bool expression_value); 
+</pre>
+<blockquote>
+ The function <tt>evaluated_conditional_expression</tt> is called, whenever the preprocessor has encountered a #if, #elif, #ifdef or #ifndef directive. This hook gets passed the non-expanded conditional
+ expression (as it was given in the analysed source file) and the result
+ of the evaluation of this expression in the current preprocessing
+ context.
+ The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user.
+ Note, this parameter was added for the Boost V1.35.0 release. 
 The <tt>token</tt> parameter holds a reference to the evaluated directive token. 
-
-
 The parameter <tt>expression</tt> holds the non-expanded token sequence
 comprising the evaluated expression.
-
-
 The parameter <tt>expression_value</tt> contains the result of the evaluation of
 the expression in the current preprocessing context. 
-
-
 The return value defines, whether the given expression has to be
-evaluated again, allowing to decide which of the conditional branches
-should be expanded. You need to return 'true' from this hook function to force the expression to be re-evaluated. Note, this was changed from a 'void' for the Boost V1.35.0 release. 
-
+ evaluated again, allowing to decide which of the conditional branches
+ should be expanded. You need to return 'true' from this hook function to force the expression to be re-evaluated. Note, this was changed from a 'void' for the Boost V1.35.0 release. 
 
-
</blockquote>
-
<a name="skipped_token"></a>skipped_token
-
-<pre> template <typename ContextT, typename TokenT> void skipped_token(ContextT const& ctx, TokenT const& token); </pre>
-
+<pre> template <typename ContextT, typename TokenT> void skipped_token(ContextT const& ctx, TokenT const& token); 
+</pre>
<blockquote>
-
 The function <tt>skipped_token</tt> is called, whenever a token is about to be skipped due to a false preprocessor condition (code fragments to be
- skipped inside the not evaluated conditional #if/#else/#endif branches).
-
-
- The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt>
-used during instantiation of the preprocessing iterators by the user.
-Note, this parameter was added for the Boost V1.35.0 release. 
-
-
+ skipped inside the not evaluated conditional #if/#else/#endif branches).
+ The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user.
+ Note, this parameter was added for the Boost V1.35.0 release. 
 The parameter <tt>token</tt> refers to the token to be skipped.
-
</blockquote>
-
<a name="generated_token"></a>generated_token
-
-<pre> template <typename ContextT, typename TokenT> TokenT const& generated_token(ContextT const& ctx, TokenT const& token); </pre>
-
+<pre> template <typename ContextT, typename TokenT> TokenT const& generated_token(ContextT const& ctx, TokenT const& token); 
+</pre>
<blockquote>
-
 The function <tt>generated_token</tt> is called, whenever a token is about to be returned from the library.
-
-
- The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt>
-used during instantiation of the preprocessing iterators by the user.
-Note, this parameter was added for the Boost V1.35.0 release. 
-
-
+ The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user.
+ Note, this parameter was added for the Boost V1.35.0 release. 
 The parameter <tt>token</tt> refers to the token about to be
-returned from the library. This function may alter the token, but in
-this case it must be implemented with a non-const reference for the
-token parameter, allowing to modify the token in place.
+ returned from the library. This function may alter the token, but in
+ this case it must be implemented with a non-const reference for the
+ token parameter, allowing to modify the token in place.
 The default behavior is to return the passed token reference unchanged to the caller.
-
</blockquote>
-
<h3>Macro expansion tracking functions</h3>
-
<a name="expanding_function_like_macro"></a>expanding_function_like_macro
-
<pre> template <typename ContextT, typename TokenT, typename ContainerT> bool expanding_function_like_macro( ContextT const& ctx, TokenT const &macrodef, std::vector<TokenT> const &formal_args, ContainerT const &definition, TokenT const &macrocall, std::vector<ContainerT> const &arguments, IteratorT const &seqstart, Iterator const &seqend);</pre>
-
-<blockquote>
-
+<blockquote>
 The function <tt>expanding_function_like_macro</tt> is called, whenever a
 function-like macro is to be expanded, i.e. before the actual expansion
 starts.
-
-
- The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt>
-used during instantiation of the preprocessing iterators by the user.
-Note, this parameter was added for the Boost V1.35.0 release. 
-
-
+ The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user.
+ Note, this parameter was added for the Boost V1.35.0 release. 
 The <tt>macroname</tt> parameter marks the position where the macro to expand
 is defined. It contains the token which identifies the macro name used inside
 the corresponding macro definition.
-
-
 The <tt>formal_args</tt> parameter holds the formal arguments used during
 the definition of the macro. 
-
-
 The <tt>definition</tt> parameter holds the macro definition for the macro
 to trace. This is a standard STL container which holds the token sequence
 identified during the macro definition as the macro replacement list.
-
-
 The <tt>macrocall</tt> parameter marks the position where this macro is invoked.
 It contains the token, which identifies the macro call inside the preprocessed
 input stream. 
-
-
 The <tt>arguments</tt> parameter holds the macro arguments used during the
 invocation of the macro. This is a vector of standard STL containers which
 contain the token sequences identified at the position of the macro call as
 the arguments to be used during the macro expansion. 
-
-
 The parameters <tt>seqstart</tt> and <tt>seqend</tt> point into the input token
 stream allowing to access the whole token sequence comprising the macro
 invocation (starting with the opening parenthesis and ending after the
- closing one).
-
-
+ closing one).
 If the return value is <tt>true</tt>, the macro is not expanded,
-i.e. the overall macro invocation sequence, including the parameters
-are copied to the output without further processing . If the return
-value is <tt>false</tt>, the macro is expanded as expected. 
-
+ i.e. the overall macro invocation sequence, including the parameters
+ are copied to the output without further processing . If the return
+ value is <tt>false</tt>, the macro is expanded as expected. 
 
-
</blockquote>
-
<a name="expanding_object_like_macro"></a>expanding_object_like_macro
-
-<pre> template <typename ContextT, typename TokenT, typename ContainerT> bool expanding_object_like_macro( ContextT const& ctx, TokenT const &macro, ContainerT const &definition, TokenT const &macrocall); </pre>
-
-<blockquote>
-
+<pre> template <typename ContextT, typename TokenT, typename ContainerT> bool expanding_object_like_macro( ContextT const& ctx, TokenT const &macro, ContainerT const &definition, TokenT const &macrocall); 
+</pre>
+<blockquote>
 The function <tt>expanding_object_like_macro</tt> is called, whenever a object-like
 macro is to be expanded, i.e. before the actual expansion starts.
-
-
- The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt>
-used during instantiation of the preprocessing iterators by the user.
-Note, this parameter was added for the Boost V1.35.0 release. 
-
-
+ The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user.
+ Note, this parameter was added for the Boost V1.35.0 release. 
 The <tt>macroname</tt> parameter marks the position where the macro to expand
 is defined. It contains the token which identifies the macro name used inside
 the corresponding macro definition.
-
-
 The <tt>definition</tt> parameter holds the macro definition for the macro
 to trace. This is a standard STL container which holds the token sequence
 identified during the macro definition as the macro replacement list.
-
-
 The <tt>macrocall</tt> parameter marks the position where this macro is invoked.
 It contains the token which identifies the macro call inside the preprocessed
 input stream. 
-
-
 If the return value is <tt>true</tt>, the macro is not expanded, i.e. the macro symbol is copied to the output without further processing. If the return value is <tt>false</tt>, the macro is expanded as expected. 
-
 
-
</blockquote>
-
<a name="expanded_macro"></a>expanded_macro
-
-<pre> template <typename ContextT, typename ContainerT> void expanded_macro(ContextT const& ctx, ContainerT const &result); </pre>
-
-<blockquote>
-
+<pre> template <typename ContextT, typename ContainerT> void expanded_macro(ContextT const& ctx, ContainerT const &result); 
+</pre>
+<blockquote>
 The function <tt>expanded_macro</tt> is called whenever the expansion of
 a macro is finished, the replacement list is completely scanned and the identified
- macros herein are replaced by its corresponding expansion results, but before
- the rescanning process starts.
-
-
- The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt>
-used during instantiation of the preprocessing iterators by the user.
-Note, this parameter was added for the Boost V1.35.0 release. 
-
-
+ macros herein are replaced by its corresponding expansion results, but before the rescanning process starts.
+ The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user.
+ Note, this parameter was added for the Boost V1.35.0 release. 
 The parameter <tt>result</tt> contains the the result of the macro expansion
 so far. This is a standard STL container containing the generated token sequence.
-
</blockquote>
-
<a name="rescanned_macro"></a>rescanned_macro
-
-<pre> template <typename ContextT, typename ContainerT> void rescanned_macro(ContextT const& ctx, ContainerT const &result); </pre>
-
-<blockquote>
-
+<pre> template <typename ContextT, typename ContainerT> void rescanned_macro(ContextT const& ctx, ContainerT const &result); 
+</pre>
+<blockquote>
 The function <tt>rescanned_macro</tt> is called whenever the rescanning
 of a macro is finished, i.e. the macro expansion is complete.
-
-
- The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt>
-used during instantiation of the preprocessing iterators by the user.
-Note, this parameter was added for the Boost V1.35.0 release. 
-
-
+ The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user.
+ Note, this parameter was added for the Boost V1.35.0 release. 
 The parameter <tt>result</tt> contains the the result of the whole macro
 expansion. This is a standard STL container containing the generated token
 sequence.
-
</blockquote>
-
<h3>Include file tracing functions</h3>
-
<a name="opened_include_file" id="found_include_directive"></a>found_include_directive
-
-<pre> template <typename ContextT> bool found_include_directive(ContextT const& ctx, std::string const &filename, bool include_next); </pre>
-
+<pre> template <typename ContextT> bool found_include_directive(ContextT const& ctx, std::string const &filename, bool include_next); 
+</pre>
<blockquote>
-
 The function <tt>found_include_directive</tt> is called whenever whenever a #include directive was located..
-
-
- The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt>
-used during instantiation of the preprocessing iterators by the user.
-Note, this parameter was added for the Boost V1.35.0 release. 
-
-
+ The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user.
+ Note, this parameter was added for the Boost V1.35.0 release. 
 The parameter <tt>filename</tt> contains the (expanded) file name found after
 the #include directive. This has the format <tt><file></tt>, <tt>"file"</tt> or <tt>file</tt>.
 The formats <tt><file></tt> or <tt>"file"</tt> are used for #include directives found
 in the preprocessed token stream, the format <tt>file</tt> is used for files
 specified through the --force_include command line argument.
-
-
 The parameter <tt>include_next</tt> is set to true if the found directive was
- a #include_next directive and the <tt>BOOST_WAVE_SUPPORT_INCLUDE_NEXT</tt> preprocessing constant was defined to something != 0.
-
-
+ a #include_next directive and the <tt>BOOST_WAVE_SUPPORT_INCLUDE_NEXT</tt> preprocessing constant was defined to something != 0.
 If the return value is <tt>true</tt>, the include directive is not
-executed, i.e. the file to include is not loaded nor processed. The
-overall directive is replaced by a single newline character. If the
-return value is <tt>false</tt>, the directive is executed in a normal manner. 
-
+ executed, i.e. the file to include is not loaded nor processed. The
+ overall directive is replaced by a single newline character. If the
+ return value is <tt>false</tt>, the directive is executed in a normal manner. 
 
-
</blockquote>
-
<a name="opened_include_file" id="opened_include_file"></a>opened_include_file
-
-<pre> template <typename ContextT> void opened_include_file(ContextT const& ctx, std::string const &rel_filename, std::string const &abs_filename, bool is_system_include); </pre>
-
-<blockquote>
-
+<pre> template <typename ContextT> void opened_include_file(ContextT const& ctx, std::string const &rel_filename, std::string const &abs_filename, bool is_system_include); 
+</pre>
+<blockquote>
 The function <tt>opened_include_file</tt> is called whenever a file referred
 by an #include directive was successfully located and opened.
-
-
- The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt>
-used during instantiation of the preprocessing iterators by the user.
-Note, this parameter was added for the Boost V1.35.0 release. 
-
-
+ The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user.
+ Note, this parameter was added for the Boost V1.35.0 release. 
 The parameter <tt>rel_filename</tt> contains the (normalised)
-probably relative file system path of the opened file. The concrete
-format of this file name depends on the format of the include search
-path given to the library beforehand.
-
-
+ probably relative file system path of the opened file. The concrete
+ format of this file name depends on the format of the include search
+ path given to the library beforehand.
 The parameter <tt>abs_filename</tt> contains the (normalised) full file system path of the
- opened file.
+ opened file.
 The <tt>is_system_include</tt> parameter denotes, if the given file was found
 as a result of a <tt>#include <...></tt> directive.
-
</blockquote>
-
<a name="returning_from_include_file" id="returning_from_include_file"></a>returning_from_include_file
-
-<pre> template <typename ContextT> void returning_from_include_file(ContextT const& ctx); </pre>
-
-<blockquote>
-
+<pre> template <typename ContextT> void returning_from_include_file(ContextT const& ctx); 
+</pre>
+<blockquote>
 The function <tt>returning_from_include_file</tt> is called whenever an
 included file is about to be closed after it's processing is complete.
-
-
- The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt>
-used during instantiation of the preprocessing iterators by the user.
-Note, this parameter was added for the Boost V1.35.0 release. 
-
+ The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user.
+ Note, this parameter was added for the Boost V1.35.0 release. 
</blockquote>
-
<h3>Interpretation of #pragma's</h3>
-
<a name="interpret_pragma"></a>interpret_pragma
-
-<pre> template <typename ContextT, typename ContextT, typename ContainerT> bool interpret_pragma(ContextT const &ctx, ContainerT &pending, typename ContextT::token_type const &option, ContainerT const &values, typename ContextT::token_type const &pragma_token); </pre>
-
-<blockquote>
-
- The function <tt>interpret_pragma</tt> is called whenever an unrecognized
- <tt>#pragma wave ...</tt> or operator <tt>_Pragma("wave ...")</tt>
- is found in the input stream.
-
-
+<pre> template <typename ContextT, typename ContextT, typename ContainerT> bool interpret_pragma(ContextT const &ctx, ContainerT &pending, typename ContextT::token_type const &option, ContainerT const &values, typename ContextT::token_type const &pragma_token); 
+</pre>
+<blockquote>
+ The function <tt>interpret_pragma</tt> is called whenever an unrecognized <tt>#pragma wave ...</tt> or operator <tt>_Pragma("wave ...")</tt> is found in the input stream.
 The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user. 
-
-
 The <tt>pending</tt> parameter may be used to push tokens back into the input
- stream which are to be used as the replacement text for the whole <tt>#pragma wave()</tt>
- directive. If this sequence is left empty, no replacement takes place, i.e.
+ stream which are to be used as the replacement text for the whole <tt>#pragma wave()</tt> directive. If this sequence is left empty, no replacement takes place, i.e.
 the interpreted directive is removed from the generated token stream.
-
-
 The <tt>option</tt> parameter contains the name of the interpreted pragma.
-
-
 The <tt>values</tt> parameter holds the value of the parameter provided to
 the pragma operator.
-
-
 The <tt>pragma_token</tt> parameter contains the actual #pragma token which
 may be used for extraction of the location information for some error output.
-
-
 If the return value is 'false', the whole #pragma directive is interpreted
 as unknown and a corresponding error message is issued. A return value of
 'true' signs a successful interpretation of the given #pragma. 
-
 
-
</blockquote>
-
<h3>Macro definition </h3>
-
<a name="defined_macro" id="defined_macro"></a>defined_macro
-
<pre> template < typename ContextT, typename TokenT, typename ParametersT, 
- typename DefinitionT > void defined_macro(ContextT const& ctx, TokenT const &name, bool is_functionlike, ParametersT const &parameters, DefinitionT const &definition, bool is_predefined); </pre>
-
-<blockquote>
+ typename DefinitionT > void defined_macro(ContextT const& ctx, TokenT const &name, bool is_functionlike, ParametersT const &parameters, DefinitionT const &definition, bool is_predefined); 
+</pre>
+<blockquote>
 The function <tt>defined_macro</tt> is called whenever a macro was defined successfully.
-
-
- The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt>
-used during instantiation of the preprocessing iterators by the user.
-Note, this parameter was added for the Boost V1.35.0 release. 
-
-
+ The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user.
+ Note, this parameter was added for the Boost V1.35.0 release. 
 The parameter <tt>name</tt> is a reference to the token holding the macro name.
-
-
 The parameter <tt>is_functionlike</tt> is set to true whenever the newly
 defined macro is defined as a function like macro.
-
-
 The parameter <tt>parameters</tt> holds the parameter tokens for the macro
- definition. If the macro has no parameters or if it is a object like
- macro, then this container is empty.
-
-
+ definition. If the macro has no parameters or if it is a object like
+ macro, then this container is empty.
 The parameter <tt>definition</tt> contains the token sequence given as the
- replacement sequence (definition part) of the newly defined macro.
-
-
+ replacement sequence (definition part) of the newly defined macro.
 The parameter <tt>is_predefined</tt> is set to true for all macros predefined
- during the initialisation pahase of the library. 
-
+ during the initialisation pahase of the library. 
 
-
</blockquote>
-
<a name="undefined_macro" id="undefined_macro"></a>undefined_macro
-
-<pre> template <typename ContextT, typename TokenT> void undefined_macro(ContextT const& ctx, TokenT const &name); </pre>
-
+<pre> template <typename ContextT, typename TokenT> void undefined_macro(ContextT const& ctx, TokenT const &name); 
+</pre>
<blockquote>
-
 The function <tt>undefined_macro</tt> is called whenever a macro definition
 was removed successfully.
-
-
- The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt>
-used during instantiation of the preprocessing iterators by the user.
-Note, this parameter was added for the Boost V1.35.0 release. 
-
-
+ The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user.
+ Note, this parameter was added for the Boost V1.35.0 release. 
 The parameter <tt>name</tt> holds the token of the macro which definition was removed. 
-
 
-
</blockquote>
-
<a name="found_warning_directive" id="found_warning_directive"></a>found_warning_drective
-
-<pre> template <typename ContextT, typename ContainerT> bool found_warning_directive(ContextT const& ctx, ContainerT const &message); </pre>
-
+<pre> template <typename ContextT, typename ContainerT> bool found_warning_directive(ContextT const& ctx, ContainerT const &message); 
+</pre>
<blockquote>
-
 The function <tt>found_warning_directive </tt> is called whenever a #warning directive
-has been encountered. Note, this function was added for the Boost
-V1.35.0 release. This function will be called only if the <tt>BOOST_WAVE_SUPPORT_WARNING_DIRECTIVE</tt> compile time constant was defined to something not equal to zero (see the Compile Time Configuration for more information). 
-
-
+ has been encountered. Note, this function was added for the Boost
+ V1.35.0 release. This function will be called only if the <tt>BOOST_WAVE_SUPPORT_WARNING_DIRECTIVE</tt> compile time constant was defined to something not equal to zero (see the Compile Time Configuration for more information). 
 The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user. 
-
-
 The parameter <tt>message</tt> references the argument token sequence of the encountered #warning directive.
-
-
 If the return value is <tt>false</tt>, the library throws a preprocessor
- exception of the type <code>warning_directive</code> (normal execution continues), if the return value is <tt>true</tt> the execution continues as if no #warning directive has been found and the overall directive is replaced by a single newline. 
-
+ exception of the type <code>warning_directive</code> (normal execution continues), if the return value is <tt>true</tt> the execution continues as if no #warning directive has been found and the overall directive is replaced by a single newline. 
</blockquote>
-
<a name="found_error_directive" id="found_error_directive"></a>found_error_drective
-
-<pre> template <typename ContextT, typename ContainerT> bool found_error_directive(ContextT const& ctx, ContainerT const &message); </pre>
-
+<pre> template <typename ContextT, typename ContainerT> bool found_error_directive(ContextT const& ctx, ContainerT const &message); 
+</pre>
<blockquote>
-
 The function <tt>found_error_directive </tt> is called whenever a #error directive has been encountered. Note, this function was added for the Boost V1.35.0 release. 
-
-
 The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user. 
-
-
 The parameter <tt>message</tt> references the argument token sequence of the encountered #error directive.
-
-
 If the return value is <tt>false</tt>, the library throws a preprocessor
- exception of the type <code>error_directive</code> (normal execution continues), if the return value is <tt>true</tt> the execution continues as if no #error directive has been found and the overall directive is replaced by a single newline. 
-
+ exception of the type <code>error_directive</code> (normal execution continues), if the return value is <tt>true</tt> the execution continues as if no #error directive has been found and the overall directive is replaced by a single newline. 
</blockquote>
-
<a name="found_line_directive" id="found_line_directive"></a>found_line_drective
-
-<pre> template <typename ContextT, typename ContainerT> void found_line_drective(ContextT const& ctx, ContainerT const &arguments, unsigned int line, std::string const& filename); </pre>
-
+<pre> template <typename ContextT, typename ContainerT> void found_line_drective(ContextT const& ctx, ContainerT const &arguments, unsigned int line, std::string const& filename); 
+</pre>
<blockquote>
-
 The function <tt>found_line_directive </tt> is called whenever a #line directive has been encountered. Note, this function was added for the Boost V1.35.0 release. 
-
-
 The <tt>ctx</tt> parameter provides a reference to the <tt>context_type</tt> used during instantiation of the preprocessing iterators by the user. 
-
-
 The parameter <tt>arguments</tt> references the argument token sequence of the encountered #line directive.
-
-
- The parameter <tt>line</tt> contains the recognized line number from the #line directive.
-
-
- The parameter <tt>filename</tt> references the recognized file name from the #line directive (if there was one given). 
-
+ The parameter <tt>line</tt> contains the recognized line number from the #line directive.
+ The parameter <tt>filename</tt> references the recognized file name from the #line directive (if there was one given). 
 
-
</blockquote>
-
<table border="0">
-
 <tbody>
 <tr>
-
- <td width="10"></td>
-
- <td width="30"></td>
-
- <td width="30"></td>
-
- <td width="30"></td>
-
- </tr>
-
+ <td width="10"></td>
+ <td width="30"></td>
+ <td width="30"></td>
+ <td width="30"></td>
+ </tr>
 </tbody>
</table>
-
<hr size="1">
Copyright © 2003-2008 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) 
-
-Last updated:
- Tuesday, July 29, 2008 20:31
-
-
+ 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, October 12, 2008 20:13
+ 
</body>
</html>

Modified: branches/release/libs/wave/doc/class_reference_filepos.html
==============================================================================
--- branches/release/libs/wave/doc/class_reference_filepos.html (original)
+++ branches/release/libs/wave/doc/class_reference_filepos.html 2008-10-12 21:24:34 EDT (Sun, 12 Oct 2008)
@@ -35,7 +35,7 @@
The file position template is used to represent a concrete token position inside
 the underlying input stream. This token position contains the corresponding
 filename, the line number and the column number, where the token was recognized.
-<h2><a name="header_synopsis"></a>Header wave/util/file_position.hpp
+<h2><a name="header_synopsis"></a>Header wave/util/file_position.hpp
 synopsis</h2>
<pre>namespace boost {
namespace wave {
@@ -113,7 +113,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:
- Thursday, December 1, 2005 11:52
+ Sunday, October 12, 2008 20:14

</body>
</html>

Modified: branches/release/libs/wave/doc/class_reference_inptpolcy.html
==============================================================================
--- branches/release/libs/wave/doc/class_reference_inptpolcy.html (original)
+++ branches/release/libs/wave/doc/class_reference_inptpolcy.html 2008-10-12 21:24:34 EDT (Sun, 12 Oct 2008)
@@ -39,7 +39,7 @@
 input sequence. If this template parameter is not given while instantiating
 the context object, it defaults to the <tt>iteration_context_policies::load_file_to_string</tt>
 type. 
-<h2><a name="header_synopsis"></a>Header wave/iteration_context.hpp
+<h2><a name="header_synopsis"></a>Header wave/iteration_context.hpp
 synopsis</h2>
The following code listing does not show the required interface only, but for
 brevity reasons the whole implementation of an input policy, which loads the
@@ -126,7 +126,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
+ Sunday, October 12, 2008 20:14
 
</body>
</html>

Modified: branches/release/libs/wave/doc/class_reference_lexer.html
==============================================================================
--- branches/release/libs/wave/doc/class_reference_lexer.html (original)
+++ branches/release/libs/wave/doc/class_reference_lexer.html 2008-10-12 21:24:34 EDT (Sun, 12 Oct 2008)
@@ -34,7 +34,7 @@
<h2><a name="introduction"></a>Introduction</h2>
Every lexer, which should be used in conjunction with the <tt>Wave</tt> library, has to return tokens formed from the input stream. These tokens should conform to the synopsis described in the topic The Token Type. The lexer type should expose an interface which conforms at least to a <tt>forward_iterator</tt> (in the sense defined by the the C++ Standard) returning the token type. The code sample below does not show the definition of this forward iterator interface because this is highly implementation defined.
<h2><a name="header_synopsis"></a>Wave lexer
- synopsis (header: wave/cpplexer/cpp_lexer_interface.hpp)</h2>
+ synopsis (header: wave/cpplexer/cpp_lexer_interface.hpp)</h2>
<pre> struct lex_iterator
 {
 typedef boost::wave::lex_token<> token_type;
@@ -53,7 +53,7 @@
 };

</pre>
-Please note, that the <tt>lex_iterator</tt> defined in the library header wave/cpplexer/cpp_lexer_interface.hpp actually is a template class taking the token type to use as its template parameter. This is omitted in the synopsis above because it is an implementation detail of the Re2C lexer provided as part of the Wave library.
+Please note, that the <tt>lex_iterator</tt> defined in the library header wave/cpplexer/cpp_lexer_interface.hpp actually is a template class taking the token type to use as its template parameter. This is omitted in the synopsis above because it is an implementation detail of the Re2C lexer provided as part of the Wave library.
If you want to use Wave in conjunction with your own lexing component this will have to conform to the interface described above only. 
<h2><a name="public_typedefs" id="public_typedefs"></a>Public Typedefs</h2>
Besides the typedefs mandated for a <tt>forward_iterator</tt> by the C++ standard every lexer to be used with the <tt>Wave</tt> library should define the following typedefs: 
@@ -97,7 +97,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:
- Thursday, December 1, 2005 11:53
+ Sunday, October 12, 2008 20:15
 

</body>

Modified: branches/release/libs/wave/doc/class_reference_tokentype.html
==============================================================================
--- branches/release/libs/wave/doc/class_reference_tokentype.html (original)
+++ branches/release/libs/wave/doc/class_reference_tokentype.html 2008-10-12 21:24:34 EDT (Sun, 12 Oct 2008)
@@ -50,7 +50,7 @@
 library, which is used in conjunction with the two predefined C++ lexers contained
 in the <tt>Wave</tt> library too. If you need to use your own token type, it
 is required to implement the interafce described below.
-<h2><a name="header_synopsis"></a>Header wave/cpplexer/cpp_lex_token.hpp
+<h2><a name="header_synopsis"></a>Header wave/cpplexer/cpp_lex_token.hpp
 synopsis</h2>
<pre>namespace boost {
namespace wave {
@@ -170,7 +170,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:
- Thursday, December 1, 2005 11:48
+ Sunday, October 12, 2008 20:15
 
</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-10-12 21:24:34 EDT (Sun, 12 Oct 2008)
@@ -670,7 +670,7 @@
                         }
                         break;
                     }
-
+
                     result = token_type(id, token_val, pos);
#if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
                     return guards.detect_guard(result);
@@ -678,13 +678,13 @@
                     return result;
#endif
                 }
-
+
             // skip the T_CONTLINE token
             } while (true);
         }
         return result = token_type(); // return T_EOI
     }
-
+
     void set_position(PositionT const &pos)
     {
         // set position has to change the file name and line number only

Modified: branches/release/libs/wave/samples/cpp_tokens/slex_iterator.hpp
==============================================================================
--- branches/release/libs/wave/samples/cpp_tokens/slex_iterator.hpp (original)
+++ branches/release/libs/wave/samples/cpp_tokens/slex_iterator.hpp 2008-10-12 21:24:34 EDT (Sun, 12 Oct 2008)
@@ -64,7 +64,7 @@
 typedef lex_input_interface<TokenT>* shared;

 BOOST_WAVE_EOF_PREFIX result_type const eof;
-
+
 template <typename MultiPass>
 static result_type& get_next(MultiPass& mp, result_type& result)
 {
@@ -84,14 +84,14 @@
 {
 mp.shared->ftor->set_position(pos);
 }
-
+
#if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
 template <typename MultiPass>
 static bool has_include_guards(MultiPass& mp, std::string& guard_name)
 {
 return mp.shared->ftor->has_include_guards(guard_name);
 }
-#endif
+#endif

private:
 boost::shared_ptr<lex_input_interface<TokenT> > functor_ptr;
@@ -149,7 +149,7 @@
 typedef boost::spirit::multi_pass_policies::no_check check_policy;
#endif
 typedef boost::spirit::multi_pass_policies::split_std_deque storage_policy;
-
+
 typedef boost::spirit::multi_pass_policies::default_policy<
 ownership_policy, check_policy, input_policy, storage_policy>
 policy_type;
@@ -169,13 +169,13 @@

 typedef typename input_policy_type::unique unique_functor_type;
 typedef typename input_policy_type::shared shared_functor_type;
-
+
public:
 typedef TokenT token_type;
-
+
 slex_iterator()
 {}
-
+
 template <typename IteratorT>
 slex_iterator(IteratorT const &first, IteratorT const &last,
 typename TokenT::position_type const &pos,
@@ -192,22 +192,22 @@
 void set_position(typename TokenT::position_type const &pos)
 {
 typedef typename token_type::position_type position_type;
-
+
 // set the new position in the current token
- token_type const& currtoken = base_type::get_input();
+ token_type& currtoken = this->base_type::dereference(*this);
 position_type currpos = currtoken.get_position();
-
+
 currpos.set_file(pos.get_file());
 currpos.set_line(pos.get_line());
- base_type::get_input().set_position(currpos);
-
+ currtoken.set_position(currpos);
+
 // set the new position for future tokens as well
 if (token_type::string_type::npos !=
 currtoken.get_value().find_first_of('\n'))
 {
 currpos.set_line(pos.get_line() + 1);
 }
- unique_functor_type::get_functor().set_position(currpos);
+ unique_functor_type::set_position(*this, currpos);
 }

#if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
@@ -216,9 +216,9 @@
 // completely
 bool has_include_guards(std::string& guard_name) const
 {
- return unique_functor_type::has_include_guards(guard_name);
+ return unique_functor_type::has_include_guards(*this, guard_name);
 }
-#endif
+#endif
};

///////////////////////////////////////////////////////////////////////////////

Modified: branches/release/libs/wave/samples/list_includes/lexertl/lexertl_lexer.hpp
==============================================================================
--- branches/release/libs/wave/samples/list_includes/lexertl/lexertl_lexer.hpp (original)
+++ branches/release/libs/wave/samples/list_includes/lexertl/lexertl_lexer.hpp 2008-10-12 21:24:34 EDT (Sun, 12 Oct 2008)
@@ -602,9 +602,8 @@
     ~lexertl_functor() {}

// get the next token from the input stream
- token_type get()
+ token_type& get(token_type& result)
     {
- token_type token;
         if (lexer_.is_initialized() && !at_eof) {
             do {
             // generate and return the next token
@@ -710,18 +709,19 @@
                         }
                         break;
                     }
-
+
+ result = token_type(id, token_val, pos);
#if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
- return guards.detect_guard(token_type(id, token_val, pos));
+ return guards.detect_guard(result);
#else
- return token_type(id, token_val, pos);
+ return result;
#endif
                 }
             } while (true); // skip the T_CONTLINE token
         }
- return token; // return T_EOI
+ return result = token_type(); // return T_EOI
     }
-
+
     void set_position(Position const &pos)
     {
         // set position has to change the file name and line number only

Modified: branches/release/libs/wave/samples/list_includes/lexertl_iterator.hpp
==============================================================================
--- branches/release/libs/wave/samples/list_includes/lexertl_iterator.hpp (original)
+++ branches/release/libs/wave/samples/list_includes/lexertl_iterator.hpp 2008-10-12 21:24:34 EDT (Sun, 12 Oct 2008)
@@ -17,7 +17,7 @@

#include <boost/assert.hpp>
#include <boost/shared_ptr.hpp>
-#include <boost/spirit/include/classic_multi_pass.hpp>
+#include <boost/spirit/include/support_multi_pass.hpp>

#include <boost/wave/language_support.hpp>
#include <boost/wave/util/file_position.hpp>
@@ -47,14 +47,11 @@
template <typename TokenT>
class iterator_functor_shim
{
+ typedef typename TokenT::position_type position_type;
+
public:
- template <typename IteratorT>
- iterator_functor_shim(IteratorT const &first, IteratorT const &last,
- typename TokenT::position_type const &pos,
- wave::language_support language)
- : functor_ptr(lexertl_input_interface<TokenT>
- ::new_lexer(first, last, pos, language))
-#if 0 != __DECCXX_VER || defined(__PGI)
+ iterator_functor_shim()
+#if /*0 != __DECCXX_VER || */defined(__PGI)
 , eof()
#endif // 0 != __DECCXX_VER
 {}
@@ -62,27 +59,38 @@
// interface to the boost::spirit::classic::multi_pass_policies::functor_input
// policy
 typedef TokenT result_type;
+ typedef iterator_functor_shim unique;
+ typedef lex_input_interface<TokenT>* shared;

 BOOST_WAVE_EOF_PREFIX result_type const eof;
-
- result_type operator()()
+
+ template <typename MultiPass>
+ static result_type& get_next(MultiPass& mp, result_type& result)
 {
- BOOST_ASSERT(0 != functor_ptr.get());
- return functor_ptr->get();
+ return mp.shared->ftor->get(result);
 }
- void set_position(typename TokenT::position_type const &pos)
+
+ // this will be called whenever the last reference to a multi_pass will
+ // be released
+ template <typename MultiPass>
+ static void destroy(MultiPass& mp)
+ {
+ delete mp.shared->ftor;
+ }
+
+ template <typename MultiPass>
+ static void set_position(MultiPass& mp, position_type const &pos)
 {
- BOOST_ASSERT(0 != functor_ptr.get());
- functor_ptr->set_position(pos);
+ mp.shared->ftor->set_position(pos);
 }
-
+
#if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
- bool has_include_guards(std::string& guard_name) const
+ template <typename MultiPass>
+ static bool has_include_guards(MultiPass& mp, std::string& guard_name)
 {
- BOOST_ASSERT(0 != functor_ptr.get());
- return functor_ptr->has_include_guards(guard_name);
+ return mp.shared->ftor->has_include_guards(guard_name);
 }
-#endif
+#endif

private:
 boost::shared_ptr<lex_input_interface<TokenT> > functor_ptr;
@@ -121,31 +129,62 @@
//
///////////////////////////////////////////////////////////////////////////////

+///////////////////////////////////////////////////////////////////////////////
+// Divide the given functor type into its components (unique and shared)
+// and build a std::pair from these parts
+template <typename FunctorData>
+struct make_multi_pass
+{
+ typedef
+ std::pair<typename FunctorData::unique, typename FunctorData::shared>
+ functor_data_type;
+ typedef typename FunctorData::result_type result_type;
+
+ typedef boost::spirit::multi_pass_policies::split_functor_input input_policy;
+ typedef boost::spirit::multi_pass_policies::ref_counted ownership_policy;
+#if defined(BOOST_WAVE_DEBUG)
+ typedef boost::spirit::multi_pass_policies::buf_id_check check_policy;
+#else
+ typedef boost::spirit::multi_pass_policies::no_check check_policy;
+#endif
+ typedef boost::spirit::multi_pass_policies::split_std_deque storage_policy;
+
+ typedef boost::spirit::multi_pass_policies::default_policy<
+ ownership_policy, check_policy, input_policy, storage_policy>
+ policy_type;
+ typedef boost::spirit::multi_pass<functor_data_type, policy_type> type;
+};
+
template <typename TokenT>
class lex_iterator
-: public boost::spirit::classic::multi_pass<
- impl::iterator_functor_shim<TokenT>,
- boost::wave::util::functor_input
- >
+: public make_multi_pass<impl::iterator_functor_shim<TokenT> >::type
{
 typedef impl::iterator_functor_shim<TokenT> input_policy_type;
- typedef
- boost::spirit::classic::multi_pass<input_policy_type,
- boost::wave::util::functor_input>
- base_type;
- typedef lex_iterator<TokenT> self_type;
-
+
+ typedef typename make_multi_pass<input_policy_type>::type base_type;
+ typedef typename make_multi_pass<input_policy_type>::functor_data_type
+ functor_data_type;
+
+ typedef typename input_policy_type::unique unique_functor_type;
+ typedef typename input_policy_type::shared shared_functor_type;
+
public:
 typedef TokenT token_type;
-
+
 lex_iterator()
 {}
-
+
 template <typename IteratorT>
 lex_iterator(IteratorT const &first, IteratorT const &last,
 typename TokenT::position_type const &pos,
 boost::wave::language_support language)
- : base_type(input_policy_type(first, last, pos, language))
+ : base_type(
+ functor_data_type(
+ unique_functor_type(),
+ lexertl_input_interface<TokenT>
+ ::new_lexer(first, last, pos, language)
+ )
+ )
 {}

 void set_position(typename TokenT::position_type const &pos)
@@ -153,7 +192,7 @@
 typedef typename TokenT::position_type position_type;

 // set the new position in the current token
- token_type& currtoken = base_type::get_input();
+ token_type& currtoken = this->base_type::dereference(*this);
 position_type currpos = currtoken.get_position();

 currpos.set_file(pos.get_file());
@@ -166,18 +205,18 @@
 {
 currpos.set_line(pos.get_line() + 1);
 }
- base_type::get_functor().set_position(currpos);
+ unique_functor_type::set_position(*this, currpos);
 }
-
+
#if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
 // Return, whether the current file has include guards. This function
 // returns meaningful results only if the file was scanned completely.
 // For now we always return false, but this can be fixed easily later on.
 bool has_include_guards(std::string& guard_name) const
 {
- return base_type::get_functor().has_include_guards(guard_name);
+ return base_type::get_functor().has_include_guards(*this, guard_name);
 }
-#endif
+#endif
};

///////////////////////////////////////////////////////////////////////////////

Next message: hartmut.kaiser_at_[hidden]: "[Boost-commit] svn:boost r49306 - branches/release/libs/wave/samples/waveidl/idllexer"
Previous message: hartmut.kaiser_at_[hidden]: "[Boost-commit] svn:boost r49304 - in trunk/libs/wave: . samples/waveidl/idllexer"

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