Update of /cvsroot/boost/boost/boost/xpressive/detail/static
In directory
sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5561/boost/xpressive/detail/static
Modified Files:
as_xpr.hpp compile.hpp grammar.hpp is_pure.hpp modifier.hpp
regex_operators.hpp width_of.hpp
Log Message:
proto::meta namespace is dead
Index: as_xpr.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/static/as_xpr.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- as_xpr.hpp 21 Dec 2006 03:51:41 -0000 1.11
+++ as_xpr.hpp 3 Feb 2007 00:14:32 -0000 1.12
@@ -135,7 +135,7 @@
template<typename Xpr>
struct as_xpr_type<Xpr, false>
{
- typedef typename proto::meta::terminal<typename
as_matcher_type<Xpr>::type>::type type;
+ typedef typename proto::terminal<typename
as_matcher_type<Xpr>::type>::type type;
template<typename Xpr2>
static type call(Xpr2 const &xpr)
Index: compile.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/static/compile.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- compile.hpp 26 Jan 2007 03:06:15 -0000 1.9
+++ compile.hpp 3 Feb 2007 00:14:32 -0000 1.10
@@ -52,9 +52,9 @@
///////////////////////////////////////////////////////////////////////////////
// pattern for imbued regexes.
struct XpressiveLocaleModifier
- : proto::meta::binary_expr<
+ : proto::binary_expr<
modifier_tag
- , proto::meta::terminal<locale_modifier<proto::_> >
+ , proto::terminal<locale_modifier<proto::_> >
, proto::_
>
{};
@@ -79,7 +79,7 @@
static_compile_impl1(Xpr const &xpr, shared_ptr<regex_impl<BidiIter> >
const &impl)
{
// use specified traits
- typedef typename proto::meta::arg<typename
proto::meta::left<Xpr>::type>::type::locale_type locale_type;
+ typedef typename proto::result_of::arg<typename
proto::result_of::left<Xpr>::type>::type::locale_type locale_type;
typedef typename regex_traits_type<locale_type, BidiIter>::type
traits_type;
static_compile_impl2(proto::right(xpr), impl,
traits_type(proto::arg(proto::left(xpr)).getloc()));
}
Index: grammar.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/static/grammar.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- grammar.hpp 26 Jan 2007 03:06:15 -0000 1.12
+++ grammar.hpp 3 Feb 2007 00:14:32 -0000 1.13
@@ -181,75 +181,75 @@
template<typename Char>
struct XpressiveListSet
: proto::or_<
- proto::meta::comma< XpressiveListSet<Char>,
proto::meta::terminal<Char> >
- , proto::meta::comma< XpressiveListSet<Char>,
proto::meta::terminal<char> >
- , proto::meta::assign<detail::set_initializer_type,
proto::meta::terminal<Char> >
- , proto::meta::assign<detail::set_initializer_type,
proto::meta::terminal<char> >
+ proto::comma< XpressiveListSet<Char>, proto::terminal<Char> >
+ , proto::comma< XpressiveListSet<Char>, proto::terminal<char> >
+ , proto::assign<detail::set_initializer_type, proto::terminal<Char> >
+ , proto::assign<detail::set_initializer_type, proto::terminal<char> >
>
{};
template<>
struct XpressiveListSet<char>
: proto::or_<
- proto::meta::comma< XpressiveListSet<char>,
proto::meta::terminal<char> >
- , proto::meta::assign<detail::set_initializer_type,
proto::meta::terminal<char> >
+ proto::comma< XpressiveListSet<char>, proto::terminal<char> >
+ , proto::assign<detail::set_initializer_type, proto::terminal<char> >
>
{};
template<typename Char>
struct XpressiveSet
: proto::or_<
- proto::meta::subscript<detail::set_initializer_type,
XpressiveGrammar<Char> >
+ proto::subscript<detail::set_initializer_type,
XpressiveGrammar<Char> >
, XpressiveListSet<Char>
>
{};
template<typename Char>
struct XpressiveTaggedSubExpression
- : proto::meta::assign< detail::basic_mark_tag, XpressiveGrammar<Char> >
+ : proto::assign< detail::basic_mark_tag, XpressiveGrammar<Char> >
{};
template<typename Char>
struct XpressiveLookAroundAssertion
: proto::or_<
- proto::meta::unary_expr<detail::lookahead_tag<true>,
XpressiveGrammar<Char> >
- , proto::meta::unary_expr<detail::lookbehind_tag<true>,
XpressiveGrammar<Char> >
+ proto::unary_expr<detail::lookahead_tag<true>,
XpressiveGrammar<Char> >
+ , proto::unary_expr<detail::lookbehind_tag<true>,
XpressiveGrammar<Char> >
>
{};
template<typename Char>
struct XpressiveIndependentSubExpression
- : proto::meta::unary_expr<detail::keeper_tag, XpressiveGrammar<Char> >
+ : proto::unary_expr<detail::keeper_tag, XpressiveGrammar<Char> >
{};
template<typename Char>
struct XpressiveModifiedSubExpression
- : proto::meta::binary_expr<detail::modifier_tag, proto::_,
XpressiveGrammar<Char> >
+ : proto::binary_expr<detail::modifier_tag, proto::_,
XpressiveGrammar<Char> >
{};
template<typename Char>
struct XpressiveComplementedCharacterLiteral
: proto::or_<
-
proto::meta::complement<proto::meta::terminal<detail::literal_placeholder<Char,
proto::_> > >
- ,
proto::meta::complement<proto::meta::terminal<detail::literal_placeholder<char,
proto::_> > >
+
proto::complement<proto::terminal<detail::literal_placeholder<Char, proto::_> >
>
+ ,
proto::complement<proto::terminal<detail::literal_placeholder<char, proto::_> >
>
>
{};
template<>
struct XpressiveComplementedCharacterLiteral<char>
- :
proto::meta::complement<proto::meta::terminal<detail::literal_placeholder<char,
proto::_> > >
+ : proto::complement<proto::terminal<detail::literal_placeholder<char,
proto::_> > >
{};
template<typename Char>
struct XpressiveComplementedExpression
: proto::and_<
- proto::meta::complement<proto::_>
+ proto::complement<proto::_>
, proto::or_<
-
proto::meta::complement<proto::meta::terminal<detail::posix_charset_placeholder>
>
- ,
proto::meta::complement<proto::meta::terminal<detail::logical_newline_placeholder>
>
+
proto::complement<proto::terminal<detail::posix_charset_placeholder> >
+ ,
proto::complement<proto::terminal<detail::logical_newline_placeholder> >
, XpressiveComplementedCharacterLiteral<Char>
- , proto::meta::complement<XpressiveSet<Char> >
- , proto::meta::complement<XpressiveLookAroundAssertion<Char> >
+ , proto::complement<XpressiveSet<Char> >
+ , proto::complement<XpressiveLookAroundAssertion<Char> >
>
>
{};
@@ -258,8 +258,8 @@
struct XpressiveTerminal
: proto::or_<
proto::and_<
- proto::meta::terminal<proto::_>
- , proto::if_<detail::is_xpressive_terminal<Char,
proto::meta::arg<mpl::_> > >
+ proto::terminal<proto::_>
+ , proto::if_<detail::is_xpressive_terminal<Char,
proto::result_of::arg<mpl::_> > >
>
, XpressiveComplementedExpression<Char>
, proto::or_<
@@ -275,12 +275,12 @@
template<typename Char>
struct XpressiveQuantified
: proto::and_<
- proto::meta::unary_expr<proto::_, XpressiveGrammar<Char> >
+ proto::unary_expr<proto::_, XpressiveGrammar<Char> >
, proto::or_<
- proto::meta::unary_star< proto::_ >
- , proto::meta::unary_plus< proto::_ >
- , proto::meta::logical_not< proto::_ >
- , proto::if_<detail::is_generic_repeat<proto::meta::tag<mpl::_>
> >
+ proto::unary_star< proto::_ >
+ , proto::unary_plus< proto::_ >
+ , proto::logical_not< proto::_ >
+ , proto::if_<detail::is_generic_repeat<proto::tag_of<mpl::_> > >
>
>
{};
@@ -288,9 +288,9 @@
template<typename Char>
struct XpressiveGrammar
: proto::or_<
- proto::meta::right_shift< XpressiveGrammar<Char>,
XpressiveGrammar<Char> >
- , proto::meta::bitwise_or< XpressiveGrammar<Char>,
XpressiveGrammar<Char> >
- , proto::meta::unary_minus< XpressiveQuantified<Char> >
+ proto::right_shift< XpressiveGrammar<Char>, XpressiveGrammar<Char>
>
+ , proto::bitwise_or< XpressiveGrammar<Char>, XpressiveGrammar<Char> >
+ , proto::unary_minus< XpressiveQuantified<Char> >
, XpressiveQuantified<Char>
, XpressiveTerminal<Char>
>
Index: is_pure.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/static/is_pure.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- is_pure.hpp 28 Dec 2006 02:37:26 -0000 1.12
+++ is_pure.hpp 3 Feb 2007 00:14:32 -0000 1.13
@@ -41,22 +41,22 @@
template<typename Expr>
struct is_pure<Expr, proto::tag::terminal>
- : mpl::bool_<as_matcher_type<typename
proto::meta::arg<Expr>::type>::type::pure>
+ : mpl::bool_<as_matcher_type<typename
proto::result_of::arg<Expr>::type>::type::pure>
{};
template<typename Expr>
struct is_pure<Expr, proto::tag::right_shift>
: BOOST_XPR_AND_PURE_(
- is_pure<typename proto::meta::left<Expr>::type>
- , is_pure<typename proto::meta::right<Expr>::type>
+ is_pure<typename proto::result_of::left<Expr>::type>
+ , is_pure<typename proto::result_of::right<Expr>::type>
)
{};
template<typename Expr>
struct is_pure<Expr, proto::tag::bitwise_or>
: BOOST_XPR_AND_PURE_(
- is_pure<typename proto::meta::left<Expr>::type>
- , is_pure<typename proto::meta::right<Expr>::type>
+ is_pure<typename proto::result_of::left<Expr>::type>
+ , is_pure<typename proto::result_of::right<Expr>::type>
)
{};
@@ -76,33 +76,33 @@
// either (s1 = ...) or (set = ...)
template<typename Expr>
struct is_pure<Expr, proto::tag::assign>
- : is_pure_assign<typename proto::meta::left<Expr>::type>
+ : is_pure_assign<typename proto::result_of::left<Expr>::type>
{};
template<typename Expr>
struct is_pure<Expr, modifier_tag>
- : is_pure<typename proto::meta::arg<Expr>::type>
+ : is_pure<typename proto::result_of::arg<Expr>::type>
{};
template<typename Expr, bool Positive>
struct is_pure<Expr, lookahead_tag<Positive> >
- : is_pure<typename proto::meta::arg<Expr>::type>
+ : is_pure<typename proto::result_of::arg<Expr>::type>
{};
template<typename Expr, bool Positive>
struct is_pure<Expr, lookbehind_tag<Positive> >
- : is_pure<typename proto::meta::arg<Expr>::type>
+ : is_pure<typename proto::result_of::arg<Expr>::type>
{};
template<typename Expr>
struct is_pure<Expr, keeper_tag>
- : is_pure<typename proto::meta::arg<Expr>::type>
+ : is_pure<typename proto::result_of::arg<Expr>::type>
{};
// when complementing a set or an assertion, the purity is that of the set
(true) or the assertion
template<typename Expr>
struct is_pure<Expr, proto::tag::complement>
- : is_pure<typename proto::meta::arg<Expr>::type>
+ : is_pure<typename proto::result_of::arg<Expr>::type>
{};
// The comma is used in list-initialized sets, which are pure
@@ -126,38 +126,38 @@
: mpl::true_
{
// If Left is "set" then make sure that Right is pure
- BOOST_MPL_ASSERT((is_pure<typename proto::meta::right<Expr>::type>));
+ BOOST_MPL_ASSERT((is_pure<typename
proto::result_of::right<Expr>::type>));
};
template<typename Expr>
struct is_pure<Expr, proto::tag::subscript>
- : is_pure_subscript<Expr, typename proto::meta::left<Expr>::type>
+ : is_pure_subscript<Expr, typename proto::result_of::left<Expr>::type>
{};
// Quantified expressions are pure IFF they use the simple_repeat_matcher
template<typename Expr>
struct is_pure<Expr, proto::tag::unary_plus>
- : use_simple_repeat<typename proto::meta::arg<Expr>::type>
+ : use_simple_repeat<typename proto::result_of::arg<Expr>::type>
{};
template<typename Expr>
struct is_pure<Expr, proto::tag::unary_star>
- : use_simple_repeat<typename proto::meta::arg<Expr>::type>
+ : use_simple_repeat<typename proto::result_of::arg<Expr>::type>
{};
template<typename Expr>
struct is_pure<Expr, proto::tag::logical_not>
- : use_simple_repeat<typename proto::meta::arg<Expr>::type>
+ : use_simple_repeat<typename proto::result_of::arg<Expr>::type>
{};
template<typename Expr, uint_t Min, uint_t Max>
struct is_pure<Expr, generic_quant_tag<Min, Max> >
- : use_simple_repeat<typename proto::meta::arg<Expr>::type>
+ : use_simple_repeat<typename proto::result_of::arg<Expr>::type>
{};
template<typename Expr>
struct is_pure<Expr, proto::tag::unary_minus>
- : is_pure<typename proto::meta::arg<Expr>::type>
+ : is_pure<typename proto::result_of::arg<Expr>::type>
{};
// simple_repeat_helper
@@ -186,12 +186,12 @@
template<typename Expr>
struct use_simple_repeat<Expr, proto::tag::terminal>
: use_simple_repeat_helper<
- as_matcher_type<typename proto::meta::arg<Expr>::type>::type::pure
- , as_matcher_type<typename proto::meta::arg<Expr>::type>::type::quant
+ as_matcher_type<typename
proto::result_of::arg<Expr>::type>::type::pure
+ , as_matcher_type<typename
proto::result_of::arg<Expr>::type>::type::quant
>
{
- //BOOST_MPL_ASSERT_RELATION(0, !=, as_matcher_type<typename
proto::meta::arg<Expr>::type>::type::width);
- BOOST_STATIC_ASSERT(0 != as_matcher_type<typename
proto::meta::arg<Expr>::type>::type::width);
+ //BOOST_MPL_ASSERT_RELATION(0, !=, as_matcher_type<typename
proto::result_of::arg<Expr>::type>::type::width);
+ BOOST_STATIC_ASSERT(0 != as_matcher_type<typename
proto::result_of::arg<Expr>::type>::type::width);
};
}}} // namespace boost::xpressive::detail
Index: modifier.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/static/modifier.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- modifier.hpp 15 Nov 2006 06:35:30 -0000 1.6
+++ modifier.hpp 3 Feb 2007 00:14:32 -0000 1.7
@@ -33,9 +33,9 @@
template<typename Xpr>
struct apply
{
- typedef typename proto::meta::binary_expr<
+ typedef typename proto::binary_expr<
modifier_tag
- , typename proto::meta::terminal<Modifier>::type
+ , typename proto::terminal<Modifier>::type
, typename as_xpr_type<Xpr>::type
>::type type;
};
Index: regex_operators.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/boost/xpressive/detail/static/regex_operators.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- regex_operators.hpp 3 Nov 2006 02:47:44 -0000 1.6
+++ regex_operators.hpp 3 Feb 2007 00:14:32 -0000 1.7
@@ -25,13 +25,13 @@
///////////////////////////////////////////////////////////////////////////////
// operator +
template<typename BidiIter>
-inline typename proto::meta::unary_plus<
- typename proto::meta::terminal<basic_regex<BidiIter> >::type
+inline typename proto::unary_plus<
+ typename proto::terminal<basic_regex<BidiIter> >::type
>::type
operator +(basic_regex<BidiIter> const ®ex)
{
- typename proto::meta::unary_plus<
- typename proto::meta::terminal<basic_regex<BidiIter> >::type
+ typename proto::unary_plus<
+ typename proto::terminal<basic_regex<BidiIter> >::type
>::type that = {{regex}};
return that;
}
@@ -39,13 +39,13 @@
///////////////////////////////////////////////////////////////////////////////
// operator *
template<typename BidiIter>
-inline typename proto::meta::unary_star<
- typename proto::meta::terminal<basic_regex<BidiIter> >::type
+inline typename proto::unary_star<
+ typename proto::terminal<basic_regex<BidiIter> >::type
>::type
operator *(basic_regex<BidiIter> const ®ex)
{
- typename proto::meta::unary_star<
- typename proto::meta::terminal<basic_regex<BidiIter> >::type
+ typename proto::unary_star<
+ typename proto::terminal<basic_regex<BidiIter> >::type
>::type that = {{regex}};
return that;
}
@@ -53,13 +53,13 @@
///////////////////////////////////////////////////////////////////////////////
// operator !
template<typename BidiIter>
-inline typename proto::meta::logical_not<
- typename proto::meta::terminal<basic_regex<BidiIter> >::type
+inline typename proto::logical_not<
+ typename proto::terminal<basic_regex<BidiIter> >::type
>::type
operator !(basic_regex<BidiIter> const ®ex)
{
- typename proto::meta::logical_not<
- typename proto::meta::terminal<basic_regex<BidiIter> >::type
+ typename proto::logical_not<
+ typename proto::terminal<basic_regex<BidiIter> >::type
>::type that = {{regex}};
return that;
}
@@ -69,17 +69,17 @@
template<typename Right, typename BidiIter>
inline typename lazy_disable_if
<
- proto::meta::is_expr<Right>
- , proto::meta::right_shift<
- typename proto::meta::terminal<basic_regex<BidiIter> >::type
- , typename proto::meta::terminal<Right>::type
+ proto::is_expr<Right>
+ , proto::right_shift<
+ typename proto::terminal<basic_regex<BidiIter> >::type
+ , typename proto::terminal<Right>::type
>
>::type
operator >>(basic_regex<BidiIter> const ®ex, Right const &right)
{
- typename proto::meta::right_shift<
- typename proto::meta::terminal<basic_regex<BidiIter> >::type
- , typename proto::meta::terminal<Right>::type
+ typename proto::right_shift<
+ typename proto::terminal<basic_regex<BidiIter> >::type
+ , typename proto::terminal<Right>::type
>::type that = {{regex}, {right}};
return that;
}
@@ -89,17 +89,17 @@
template<typename BidiIter, typename Left>
inline typename lazy_disable_if
<
- proto::meta::is_expr<Left>
- , proto::meta::right_shift<
- typename proto::meta::terminal<Left>::type
- , typename proto::meta::terminal<basic_regex<BidiIter> >::type
+ proto::is_expr<Left>
+ , proto::right_shift<
+ typename proto::terminal<Left>::type
+ , typename proto::terminal<basic_regex<BidiIter> >::type
>
>::type
operator >>(Left const &left, basic_regex<BidiIter> const ®ex)
{
- typename proto::meta::right_shift<
- typename proto::meta::terminal<Left>::type
- , typename proto::meta::terminal<basic_regex<BidiIter> >::type
+ typename proto::right_shift<
+ typename proto::terminal<Left>::type
+ , typename proto::terminal<basic_regex<BidiIter> >::type
>::type that = {{left}, {regex}};
return that;
}
@@ -107,15 +107,15 @@
///////////////////////////////////////////////////////////////////////////////
// operator >>
template<typename BidiIter>
-inline typename proto::meta::right_shift<
- typename proto::meta::terminal<basic_regex<BidiIter> >::type
- , typename proto::meta::terminal<basic_regex<BidiIter> >::type
+inline typename proto::right_shift<
+ typename proto::terminal<basic_regex<BidiIter> >::type
+ , typename proto::terminal<basic_regex<BidiIter> >::type
>::type
operator >>(basic_regex<BidiIter> const &left, basic_regex<BidiIter> const
&right)
{
- typename proto::meta::right_shift<
- typename proto::meta::terminal<basic_regex<BidiIter> >::type
- , typename proto::meta::terminal<basic_regex<BidiIter> >::type
+ typename proto::right_shift<
+ typename proto::terminal<basic_regex<BidiIter> >::type
+ , typename proto::terminal<basic_regex<BidiIter> >::type
>::type that = {{left}, {right}};
return that;
}
@@ -125,17 +125,17 @@
template<typename Right, typename BidiIter>
inline typename lazy_disable_if
<
- proto::meta::is_expr<Right>
- , proto::meta::bitwise_or<
- typename proto::meta::terminal<basic_regex<BidiIter> >::type
- , typename proto::meta::terminal<Right>::type
+ proto::is_expr<Right>
+ , proto::bitwise_or<
+ typename proto::terminal<basic_regex<BidiIter> >::type
+ , typename proto::terminal<Right>::type
>
>::type
operator |(basic_regex<BidiIter> const ®ex, Right const &right)
{
- typename proto::meta::bitwise_or<
- typename proto::meta::terminal<basic_regex<BidiIter> >::type
- , typename proto::meta::terminal<Right>::type
+ typename proto::bitwise_or<
+ typename proto::terminal<basic_regex<BidiIter> >::type
+ , typename proto::terminal<Right>::type
>::type that = {{regex}, {right}};
return that;
}
@@ -145,17 +145,17 @@
template<typename BidiIter, typename Left>
inline typename lazy_disable_if
<
- proto::meta::is_expr<Left>
- , proto::meta::bitwise_or<
- typename proto::meta::terminal<Left>::type
- , typename proto::meta::terminal<basic_regex<BidiIter> >::type
+ proto::is_expr<Left>
+ , proto::bitwise_or<
+ typename proto::terminal<Left>::type
+ , typename proto::terminal<basic_regex<BidiIter> >::type
>
>::type
operator |(Left const &left, basic_regex<BidiIter> const ®ex)
{
- typename proto::meta::bitwise_or<
- typename proto::meta::terminal<Left>::type
- , typename proto::meta::terminal<basic_regex<BidiIter> >::type
+ typename proto::bitwise_or<
+ typename proto::terminal<Left>::type
+ , typename proto::terminal<basic_regex<BidiIter> >::type
>::type that = {{left}, {regex}};
return that;
}
@@ -163,15 +163,15 @@
///////////////////////////////////////////////////////////////////////////////
// operator |
template<typename BidiIter>
-inline typename proto::meta::bitwise_or<
- typename proto::meta::terminal<basic_regex<BidiIter> >::type
- , typename proto::meta::terminal<basic_regex<BidiIter> >::type
+inline typename proto::bitwise_or<
+ typename proto::terminal<basic_regex<BidiIter> >::type
+ , typename proto::terminal<basic_regex<BidiIter> >::type
>::type
operator |(basic_regex<BidiIter> const &left, basic_regex<BidiIter> const
&right)
{
- typename proto::meta::bitwise_or<
- typename proto::meta::terminal<basic_regex<BidiIter> >::type
- , typename proto::meta::terminal<basic_regex<BidiIter> >::type
+ typename proto::bitwise_or<
+ typename proto::terminal<basic_regex<BidiIter> >::type
+ , typename proto::terminal<basic_regex<BidiIter> >::type
>::type that = {{left}, {right}};
return that;
}
Index: width_of.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/static/width_of.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- width_of.hpp 28 Dec 2006 02:37:26 -0000 1.12
+++ width_of.hpp 3 Feb 2007 00:14:32 -0000 1.13
@@ -59,22 +59,22 @@
template<typename Expr>
struct width_of<Expr, proto::tag::terminal>
- : mpl::size_t<as_matcher_type<typename
proto::meta::arg<Expr>::type>::type::width>
+ : mpl::size_t<as_matcher_type<typename
proto::result_of::arg<Expr>::type>::type::width>
{};
template<typename Expr>
struct width_of<Expr, proto::tag::right_shift>
: BOOST_XPR_ADD_WIDTH_(
- width_of<typename proto::meta::left<Expr>::type>
- , width_of<typename proto::meta::right<Expr>::type>
+ width_of<typename proto::result_of::left<Expr>::type>
+ , width_of<typename proto::result_of::right<Expr>::type>
)
{};
template<typename Expr>
struct width_of<Expr, proto::tag::bitwise_or>
: BOOST_XPR_EQUAL_WIDTH_(
- width_of<typename proto::meta::left<Expr>::type>
- , width_of<typename proto::meta::right<Expr>::type>
+ width_of<typename proto::result_of::left<Expr>::type>
+ , width_of<typename proto::result_of::right<Expr>::type>
)
{};
@@ -83,7 +83,7 @@
template<typename Expr>
struct width_of_assign<Expr, basic_mark_tag>
- : width_of<typename proto::meta::right<Expr>::type>
+ : width_of<typename proto::result_of::right<Expr>::type>
{};
template<typename Expr>
@@ -93,12 +93,12 @@
template<typename Expr>
struct width_of<Expr, proto::tag::assign>
- : width_of_assign<Expr, typename proto::meta::left<Expr>::type>
+ : width_of_assign<Expr, typename proto::result_of::left<Expr>::type>
{};
template<typename Expr>
struct width_of<Expr, modifier_tag>
- : width_of<typename proto::meta::right<Expr>::type>
+ : width_of<typename proto::result_of::right<Expr>::type>
{};
template<typename Expr, bool Positive>
@@ -120,7 +120,7 @@
// If this assert fires, you put something that doesn't require
backtracking
// in a keep(). In that case, the keep() is not necessary and you
should just
// remove it.
- BOOST_MPL_ASSERT_RELATION(width_of<typename
proto::meta::arg<Expr>::type>::value, ==, unknown_width::value);
+ BOOST_MPL_ASSERT_RELATION(width_of<typename
proto::result_of::arg<Expr>::type>::value, ==, unknown_width::value);
};
template<typename Expr>
@@ -145,18 +145,18 @@
template<typename Expr, uint_t Count>
struct width_of<Expr, generic_quant_tag<Count, Count> >
- : BOOST_XPR_MULT_WIDTH_(width_of<typename proto::meta::arg<Expr>::type>,
mpl::size_t<Count>)
+ : BOOST_XPR_MULT_WIDTH_(width_of<typename
proto::result_of::arg<Expr>::type>, mpl::size_t<Count>)
{};
template<typename Expr>
struct width_of<Expr, proto::tag::unary_minus>
- : width_of<typename proto::meta::arg<Expr>::type>
+ : width_of<typename proto::result_of::arg<Expr>::type>
{};
// when complementing a set or an assertion, the width is that of the set
(1) or the assertion (0)
template<typename Expr>
struct width_of<Expr, proto::tag::complement>
- : width_of<typename proto::meta::arg<Expr>::type>
+ : width_of<typename proto::result_of::arg<Expr>::type>
{};
// The comma is used in list-initialized sets, and the width of sets are 1
@@ -177,12 +177,12 @@
: mpl::size_t<1>
{
// If Left is "set" then make sure that Right has a width_of 1
- BOOST_MPL_ASSERT_RELATION(1, ==, width_of<typename
proto::meta::right<Expr>::type>::value);
+ BOOST_MPL_ASSERT_RELATION(1, ==, width_of<typename
proto::result_of::right<Expr>::type>::value);
};
template<typename Expr>
struct width_of<Expr, proto::tag::subscript>
- : width_of_subscript<Expr, typename proto::meta::left<Expr>::type>
+ : width_of_subscript<Expr, typename proto::result_of::left<Expr>::type>
{};
}}} // namespace boost::xpressive::detail
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
