Subject: [Boost-commit] svn:boost r71192 - in trunk/boost/spirit: home/lex home/lex/lexer home/support home/support/auto home/support/detail include
From: hartmut.kaiser_at_[hidden]
Date: 2011-04-11 14:49:23
Author: hkaiser
Date: 2011-04-11 14:49:21 EDT (Mon, 11 Apr 2011)
New Revision: 71192
URL: http://svn.boost.org/trac/boost/changeset/71192
Log:
Spirit: adding Phoenix V3 limits.hpp to allow for flawless definition of all required LIMITS
Added:
trunk/boost/spirit/include/phoenix_limits.hpp (contents, props changed)
Text files modified:
trunk/boost/spirit/home/lex/argument_phoenix.hpp | 12 ++++++------
trunk/boost/spirit/home/lex/lexer/support_functions_expression.hpp | 16 ++--------------
trunk/boost/spirit/home/support/auto/meta_create.hpp | 1 +
trunk/boost/spirit/home/support/char_class.hpp | 1 +
trunk/boost/spirit/home/support/detail/make_cons.hpp | 1 +
trunk/boost/spirit/home/support/meta_compiler.hpp | 1 +
trunk/boost/spirit/home/support/modify.hpp | 1 +
7 files changed, 13 insertions(+), 20 deletions(-)
Modified: trunk/boost/spirit/home/lex/argument_phoenix.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/argument_phoenix.hpp (original)
+++ trunk/boost/spirit/home/lex/argument_phoenix.hpp 2011-04-11 14:49:21 EDT (Mon, 11 Apr 2011)
@@ -100,7 +100,7 @@
{
template <>
struct is_nullary<custom_terminal<boost::spirit::lex::value_context> >
- : mpl::false_
+ : mpl::false_
{};
}
@@ -109,7 +109,7 @@
template <typename Dummy>
struct custom_terminal<boost::spirit::lex::value_context, Dummy>
- : proto::call<
+ : proto::call<
v2_eval(
proto::make<boost::spirit::lex::value_getter()>
, proto::call<functional::env(proto::_state)>
@@ -164,7 +164,7 @@
{
template <>
struct is_nullary<custom_terminal<boost::spirit::lex::state_context> >
- : mpl::false_
+ : mpl::false_
{};
}
@@ -173,7 +173,7 @@
template <typename Dummy>
struct custom_terminal<boost::spirit::lex::state_context, Dummy>
- : proto::call<
+ : proto::call<
v2_eval(
proto::make<boost::spirit::lex::state_getter()>
, proto::call<functional::env(proto::_state)>
@@ -228,7 +228,7 @@
{
template <>
struct is_nullary<custom_terminal<boost::spirit::lex::eoi_getter> >
- : mpl::false_
+ : mpl::false_
{};
}
@@ -237,7 +237,7 @@
template <typename Dummy>
struct custom_terminal<boost::spirit::lex::eoi_getter, Dummy>
- : proto::call<
+ : proto::call<
v2_eval(
proto::make<boost::spirit::lex::eoi_getter()>
, proto::call<functional::env(proto::_state)>
Modified: trunk/boost/spirit/home/lex/lexer/support_functions_expression.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/lexer/support_functions_expression.hpp (original)
+++ trunk/boost/spirit/home/lex/lexer/support_functions_expression.hpp 2011-04-11 14:49:21 EDT (Mon, 11 Apr 2011)
@@ -20,18 +20,6 @@
template <typename, typename> struct lookahead_type;
}}}
-/*
-BOOST_PHOENIX_DEFINE_CUSTOM_TERMINAL(
- template <>
- , boost::spirit::lex::more_type
- , mpl::false_
- , v2_eval(
- proto::make<boost::spirit::lex::more_type()>
- , proto::call<functional::env(proto::_state)>
- )
-)
-*/
-
///////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_SPIRIT_USE_PHOENIX_V3
@@ -83,12 +71,12 @@
{
template <>
struct is_nullary<custom_terminal<boost::spirit::lex::more_type> >
- : mpl::false_
+ : mpl::false_
{};
}
template <typename Dummy>
- struct is_custom_terminal<boost::spirit::lex::more_type, Dummy>: mpl::true_ {};
+ struct is_custom_terminal<boost::spirit::lex::more_type, Dummy> : mpl::true_ {};
template <typename Dummy>
struct custom_terminal<boost::spirit::lex::more_type, Dummy>
Modified: trunk/boost/spirit/home/support/auto/meta_create.hpp
==============================================================================
--- trunk/boost/spirit/home/support/auto/meta_create.hpp (original)
+++ trunk/boost/spirit/home/support/auto/meta_create.hpp 2011-04-11 14:49:21 EDT (Mon, 11 Apr 2011)
@@ -13,6 +13,7 @@
#include <boost/spirit/home/support/unused.hpp>
#include <boost/version.hpp>
+#include <boost/spirit/include/phoenix_limits.hpp> // needs to be included before proto
#include <boost/proto/proto.hpp>
#include <boost/utility/result_of.hpp>
#include <boost/type_traits/add_const.hpp>
Modified: trunk/boost/spirit/home/support/char_class.hpp
==============================================================================
--- trunk/boost/spirit/home/support/char_class.hpp (original)
+++ trunk/boost/spirit/home/support/char_class.hpp 2011-04-11 14:49:21 EDT (Mon, 11 Apr 2011)
@@ -14,6 +14,7 @@
#include <string>
+#include <boost/spirit/include/phoenix_limits.hpp> // needs to be included before proto
#include <boost/proto/proto.hpp>
#include <boost/config.hpp>
#include <boost/mpl/bool.hpp>
Modified: trunk/boost/spirit/home/support/detail/make_cons.hpp
==============================================================================
--- trunk/boost/spirit/home/support/detail/make_cons.hpp (original)
+++ trunk/boost/spirit/home/support/detail/make_cons.hpp 2011-04-11 14:49:21 EDT (Mon, 11 Apr 2011)
@@ -12,6 +12,7 @@
#pragma once
#endif
+#include <boost/spirit/include/phoenix_limits.hpp> // needs to be included before proto
#include <boost/proto/proto.hpp>
#include <boost/mpl/eval_if.hpp>
#include <boost/fusion/include/cons.hpp>
Modified: trunk/boost/spirit/home/support/meta_compiler.hpp
==============================================================================
--- trunk/boost/spirit/home/support/meta_compiler.hpp (original)
+++ trunk/boost/spirit/home/support/meta_compiler.hpp 2011-04-11 14:49:21 EDT (Mon, 11 Apr 2011)
@@ -14,6 +14,7 @@
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
+#include <boost/spirit/include/phoenix_limits.hpp> // needs to be included before proto
#include <boost/proto/proto.hpp>
#include <boost/spirit/home/support/make_component.hpp>
#include <boost/spirit/home/support/modify.hpp>
Modified: trunk/boost/spirit/home/support/modify.hpp
==============================================================================
--- trunk/boost/spirit/home/support/modify.hpp (original)
+++ trunk/boost/spirit/home/support/modify.hpp 2011-04-11 14:49:21 EDT (Mon, 11 Apr 2011)
@@ -12,6 +12,7 @@
#pragma once
#endif
+#include <boost/spirit/include/phoenix_limits.hpp> // needs to be included before proto
#include <boost/proto/proto.hpp>
#include <boost/mpl/if.hpp>
#include <boost/type_traits/is_base_of.hpp>
Added: trunk/boost/spirit/include/phoenix_limits.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/spirit/include/phoenix_limits.hpp 2011-04-11 14:49:21 EDT (Mon, 11 Apr 2011)
@@ -0,0 +1,16 @@
+/*=============================================================================
+ Copyright (c) 2001-2011 Joel de Guzman
+ Copyright (c) 2001-2011 Hartmut Kaiser
+ http://spirit.sourceforge.net/
+
+ 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)
+=============================================================================*/
+#ifndef BOOST_SPIRIT_INCLUDE_PHOENIX_LIMITS
+#define BOOST_SPIRIT_INCLUDE_PHOENIX_LIMITS
+
+#ifdef BOOST_SPIRIT_USE_PHOENIX_V3
+#include <boost/phoenix/core/limits.hpp>
+#endif
+
+#endif