From: hartmut.kaiser_at_[hidden]
Date: 2008-04-16 21:04:19
Author: hkaiser
Date: 2008-04-16 21:04:19 EDT (Wed, 16 Apr 2008)
New Revision: 44482
URL: http://svn.boost.org/trac/boost/changeset/44482
Log:
Wave: minor edits...
Text files modified:
trunk/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp | 2
trunk/boost/wave/cpp_context.hpp | 18 ++++----
trunk/boost/wave/cpplexer/cpp_lex_iterator.hpp | 4
trunk/boost/wave/util/cpp_iterator.hpp | 89 +++++++++++++++++++--------------------
trunk/libs/wave/ChangeLog | 2
5 files changed, 57 insertions(+), 58 deletions(-)
Modified: trunk/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp (original)
+++ trunk/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp 2008-04-16 21:04:19 EDT (Wed, 16 Apr 2008)
@@ -103,7 +103,7 @@
template <typename MultiPass>
static void destroy(MultiPass& mp)
{
- functor_type::destroy(mp.shared);
+ functor_type::destroy(mp);
}
};
Modified: trunk/boost/wave/cpp_context.hpp
==============================================================================
--- trunk/boost/wave/cpp_context.hpp (original)
+++ trunk/boost/wave/cpp_context.hpp 2008-04-16 21:04:19 EDT (Wed, 16 Apr 2008)
@@ -104,7 +104,7 @@
// public typedefs
typedef typename LexIteratorT::token_type token_type;
typedef typename token_type::string_type string_type;
-
+
typedef IteratorT target_iterator_type;
typedef LexIteratorT lexer_type;
typedef pp_iterator<context> iterator_type;
@@ -220,25 +220,25 @@
}
template <typename StringT>
bool get_macro_definition(StringT const &name,
- bool &has_params, bool &is_predefined, position_type &pos,
- std::vector<token_type> ¶meters,
- token_sequence_type &definition) const
- {
+ bool &has_params, bool &is_predefined, position_type &pos,
+ std::vector<token_type> ¶meters,
+ token_sequence_type &definition) const
+ {
return macros.get_macro(util::to_string<string_type>(name),
has_params, is_predefined, pos, parameters, definition);
- }
+ }
template <typename StringT>
bool remove_macro_definition(StringT const &name,
bool even_predefined = false)
- {
+ {
#if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
- // ensure this gets removed from the list of include guards as well
+ // ensure this gets removed from the list of include guards as well
includes.remove_pragma_once_header(
util::to_string<std::string>(name));
#endif
return macros.remove_macro(util::to_string<string_type>(name),
macros.get_main_pos(), even_predefined);
- }
+ }
void reset_macro_definitions()
{ macros.reset_macromap(); macros.init_predefined_macros(); }
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 2008-04-16 21:04:19 EDT (Wed, 16 Apr 2008)
@@ -78,9 +78,9 @@
// this will be called whenever the last reference to a multi_pass will
// be released
template <typename MultiPass>
- static void destroy(MultiPass& mp_shared)
+ static void destroy(MultiPass& mp)
{
- delete mp_shared->ftor;
+ delete mp.shared->ftor;
}
template <typename MultiPass>
Modified: trunk/boost/wave/util/cpp_iterator.hpp
==============================================================================
--- trunk/boost/wave/util/cpp_iterator.hpp (original)
+++ trunk/boost/wave/util/cpp_iterator.hpp 2008-04-16 21:04:19 EDT (Wed, 16 Apr 2008)
@@ -913,7 +913,7 @@
call_skipped_token_hook(ctx, *it);
for (++it; it != end; ++it) {
- token_id id = token_id(*it);
+ token_id id = token_id(*it);
if (T_CPPCOMMENT == id || T_NEWLINE == id ||
context_policies::util::ccomment_has_newline(*it))
@@ -984,9 +984,9 @@
}
///////////////////////////////////////////////////////////////////////////////
-template <typename ContextT>
+template <typename ContextT>
template <typename IteratorT>
-inline bool
+inline bool
pp_iterator_functor<ContextT>::ensure_is_last_on_line(IteratorT& it)
{
if (!impl::pp_is_last_on_line(ctx, it, iter_ctx->last, false))
@@ -1057,37 +1057,37 @@
token_id id = token_id(*it);
bool can_exit = true;
if (!ctx.get_if_block_status()) {
- if (IS_EXTCATEGORY(*it, PPConditionalTokenType)) {
- // simulate the if block hierarchy
+ if (IS_EXTCATEGORY(*it, PPConditionalTokenType)) {
+ // simulate the if block hierarchy
switch (static_cast<unsigned int>(id)) {
- case T_PP_IFDEF: // #ifdef
- case T_PP_IFNDEF: // #ifndef
- case T_PP_IF: // #if
- ctx.enter_if_block(false);
- break;
+ case T_PP_IFDEF: // #ifdef
+ case T_PP_IFNDEF: // #ifndef
+ case T_PP_IF: // #if
+ ctx.enter_if_block(false);
+ break;
- case T_PP_ELIF: // #elif
- if (!ctx.get_enclosing_if_block_status()) {
- if (!ctx.enter_elif_block(false)) {
- // #else without matching #if
- BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
- missing_matching_if, "#elif", act_pos);
- return true; // do not analyze this directive any further
+ case T_PP_ELIF: // #elif
+ if (!ctx.get_enclosing_if_block_status()) {
+ if (!ctx.enter_elif_block(false)) {
+ // #else without matching #if
+ BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
+ missing_matching_if, "#elif", act_pos);
+ return true; // do not analyze this directive any further
+ }
}
- }
- else {
- can_exit = false; // #elif is not always safe to skip
- }
- break;
+ else {
+ can_exit = false; // #elif is not always safe to skip
+ }
+ break;
- case T_PP_ELSE: // #else
- case T_PP_ENDIF: // #endif
- {
- // handle this directive
- if (T_PP_ELSE == token_id(*it))
- on_else();
- else
- on_endif();
+ case T_PP_ELSE: // #else
+ case T_PP_ENDIF: // #endif
+ {
+ // handle this directive
+ if (T_PP_ELSE == token_id(*it))
+ on_else();
+ else
+ on_endif();
// make sure, there are no (non-whitespace) tokens left on
// this line
@@ -1098,11 +1098,11 @@
iter_ctx->first = it;
}
return true;
-
+
default: // #something else
on_illformed((*it).get_value());
- break;
- }
+ break;
+ }
}
}
else {
@@ -1144,11 +1144,11 @@
// this line
if (ensure_is_last_on_line(it))
{
- seen_newline = true;
- iter_ctx->first = it;
+ seen_newline = true;
+ iter_ctx->first = it;
on_include (dir, true, include_next);
- }
- return true;
+ }
+ return true;
}
break;
@@ -1165,7 +1165,7 @@
// make sure, there are no (non-whitespace) tokens left on
// this line
ensure_is_last_on_line(it);
-
+
// we skipped to the end of this line already
seen_newline = true;
iter_ctx->first = it;
@@ -1188,7 +1188,7 @@
extract_identifier(it))
{
on_undefine(it);
- }
+ }
break;
case T_PP_IFDEF: // #ifdef
@@ -1196,13 +1196,13 @@
extract_identifier(it))
{
on_ifdef(directive, it);
- }
+ }
break;
case T_PP_IFNDEF: // #ifndef
if (!impl::call_found_directive_hook(ctx, *it) &&
extract_identifier(it))
- {
+ {
on_ifndef(directive, it);
}
break;
@@ -1214,12 +1214,12 @@
// case T_MSEXT_PP_ENDREGION: // #endregion
// break;
#endif
-
+
default:
can_exit = false;
break;
}
- }
+ }
// start over with the next line, if only possible
if (can_exit) {
@@ -1345,7 +1345,7 @@
// call preprocessing hook
if (impl::call_found_directive_hook(ctx, found_directive))
return true; // skip this directive and return newline only
-
+
switch (static_cast<unsigned int>(id)) {
// case T_PP_QHEADER: // #include "..."
// #if BOOST_WAVE_SUPPORT_INCLUDE_NEXT != 0
@@ -1805,7 +1805,6 @@
// make_ref_transform_iterator((*begin).children.end(), get_value),
// std::inserter(toexpand, toexpand.end()));
-
bool is_defined = false;
token_sequence_type directive;
Modified: trunk/libs/wave/ChangeLog
==============================================================================
--- trunk/libs/wave/ChangeLog (original)
+++ trunk/libs/wave/ChangeLog 2008-04-16 21:04:19 EDT (Wed, 16 Apr 2008)
@@ -47,7 +47,7 @@
preprocessing two consecutive tokens.
- Adjusted Spirit header includes to point to conform to the new directory
structure, removed support for Spirit versions earlier than V1.7.
-
+
Boost V1.35.0
- Wave Version 1.3
- Changed the return value of the 'evaluated_conditional_expression()' pp hook