Update of /cvsroot/boost/boost/boost/xpressive/proto
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20337/proto
Modified Files:
expr.hpp extends.hpp proto_fwd.hpp traits.hpp
Log Message:
rename as_expr_ref to as_arg
Index: expr.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/expr.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- expr.hpp 31 Jan 2007 08:39:08 -0000 1.17
+++ expr.hpp 2 Feb 2007 22:11:25 -0000 1.18
@@ -16,7 +16,6 @@
#include <boost/preprocessor/dec.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/iteration/iterate.hpp>
- #include <boost/preprocessor/punctuation/comma.hpp>
#include <boost/preprocessor/facilities/intercept.hpp>
#include <boost/preprocessor/repetition/repeat.hpp>
#include <boost/preprocessor/repetition/repeat_from_to.hpp>
@@ -45,7 +44,7 @@
/**/
#define BOOST_PROTO_AS_OP(z, n, data)\
- proto::as_expr_ref(BOOST_PP_CAT(a,n))\
+ proto::as_arg(BOOST_PP_CAT(a,n))\
/**/
#define BOOST_PROTO_UNREF_ARG_TYPE(z, n, data)\
@@ -56,7 +55,7 @@
proto::unref(this->BOOST_PP_CAT(arg, n))\
/**/
- namespace detail
+ namespace aux_
{
#define BOOST_PP_ITERATION_PARAMS_1 (3, (1,
BOOST_PP_DEC(BOOST_PROTO_MAX_ARITY), <boost/xpressive/proto/detail/funop.hpp>))
#include BOOST_PP_ITERATE()
@@ -130,18 +129,18 @@
}
template<typename A>
- expr<tag::assign, args2<ref<expr>, typename
meta::as_expr_ref<A>::type> > const
+ expr<tag::assign, args2<ref<expr>, typename meta::as_arg<A>::type>
> const
operator =(A const &a) const
{
- expr<tag::assign, args2<ref<expr>, typename
meta::as_expr_ref<A>::type> > that = {{*this}, proto::as_expr_ref(a)};
+ expr<tag::assign, args2<ref<expr>, typename
meta::as_arg<A>::type> > that = {{*this}, proto::as_arg(a)};
return that;
}
template<typename A>
- expr<tag::subscript, args2<ref<expr>, typename
meta::as_expr_ref<A>::type> > const
+ expr<tag::subscript, args2<ref<expr>, typename
meta::as_arg<A>::type> > const
operator [](A const &a) const
{
- expr<tag::subscript, args2<ref<expr>, typename
meta::as_expr_ref<A>::type> > that = {{*this}, proto::as_expr_ref(a)};
+ expr<tag::subscript, args2<ref<expr>, typename
meta::as_arg<A>::type> > that = {{*this}, proto::as_arg(a)};
return that;
}
@@ -171,14 +170,14 @@
template<typename This BOOST_PP_ENUM_TRAILING_PARAMS(N, typename A)>
struct result<This(BOOST_PP_ENUM_PARAMS(N, A))>
- : detail::BOOST_PP_CAT(funop, N)<expr
BOOST_PP_ENUM_TRAILING_PARAMS(N, A)>
+ : aux_::BOOST_PP_CAT(funop, N)<expr BOOST_PP_ENUM_TRAILING_PARAMS(N,
A)>
{};
template<BOOST_PP_ENUM_PARAMS(N, typename A)>
- typename detail::BOOST_PP_CAT(funop, N)<expr
BOOST_PP_ENUM_TRAILING_PARAMS(N, A)>::type const
+ typename aux_::BOOST_PP_CAT(funop, N)<expr
BOOST_PP_ENUM_TRAILING_PARAMS(N, A)>::type const
operator ()(BOOST_PP_ENUM_BINARY_PARAMS(N, A, const &a)) const
{
- return detail::BOOST_PP_CAT(funop, N)<expr
BOOST_PP_ENUM_TRAILING_PARAMS(N, A)>
+ return aux_::BOOST_PP_CAT(funop, N)<expr
BOOST_PP_ENUM_TRAILING_PARAMS(N, A)>
::call(*this BOOST_PP_ENUM_TRAILING_PARAMS(N, a));
}
Index: extends.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/extends.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- extends.hpp 13 Jan 2007 18:09:21 -0000 1.15
+++ extends.hpp 2 Feb 2007 22:11:25 -0000 1.16
@@ -55,19 +55,19 @@
}
template<typename A>
- typename meta::generate<Domain, expr<tag::assign, args2<ref<Derived>,
typename meta::as_expr_ref<A>::type> >, tag::assign>::type const
+ typename meta::generate<Domain, expr<tag::assign, args2<ref<Derived>,
typename meta::as_arg<A>::type> >, tag::assign>::type const
operator =(A const &a) const
{
- expr<tag::assign, args2<ref<Derived>, typename
meta::as_expr_ref<A>::type> > that = {{this->derived()}, proto::as_expr_ref(a)};
- return meta::generate<Domain, expr<tag::assign,
args2<ref<Derived>, typename meta::as_expr_ref<A>::type> >,
tag::assign>::make(that);
+ expr<tag::assign, args2<ref<Derived>, typename
meta::as_arg<A>::type> > that = {{this->derived()}, proto::as_arg(a)};
+ return meta::generate<Domain, expr<tag::assign,
args2<ref<Derived>, typename meta::as_arg<A>::type> >, tag::assign>::make(that);
}
template<typename A>
- typename meta::generate<Domain, expr<tag::subscript,
args2<ref<Derived>, typename meta::as_expr_ref<A>::type> >,
tag::subscript>::type const
+ typename meta::generate<Domain, expr<tag::subscript,
args2<ref<Derived>, typename meta::as_arg<A>::type> >, tag::subscript>::type
const
operator [](A const &a) const
{
- expr<tag::subscript, args2<ref<Derived>, typename
meta::as_expr_ref<A>::type> > that = {{this->derived()}, proto::as_expr_ref(a)};
- return meta::generate<Domain, expr<tag::subscript,
args2<ref<Derived>, typename meta::as_expr_ref<A>::type> >,
tag::subscript>::make(that);
+ expr<tag::subscript, args2<ref<Derived>, typename
meta::as_arg<A>::type> > that = {{this->derived()}, proto::as_arg(a)};
+ return meta::generate<Domain, expr<tag::subscript,
args2<ref<Derived>, typename meta::as_arg<A>::type> >,
tag::subscript>::make(that);
}
template<typename Sig>
@@ -87,21 +87,21 @@
}
#define BOOST_PROTO_AS_OP(z, n, data)\
- proto::as_expr_ref(BOOST_PP_CAT(a,n))\
+ proto::as_arg(BOOST_PP_CAT(a,n))\
/**/
#define BOOST_PP_LOCAL_MACRO(N) \
template<typename This BOOST_PP_ENUM_TRAILING_PARAMS(N, typename A)>\
struct result<This(BOOST_PP_ENUM_PARAMS(N, A))>\
{\
- typedef typename meta::generate<Domain, expr<tag::function,
BOOST_PP_CAT(args, BOOST_PP_INC(N))<ref<Derived>
BOOST_PP_ENUM_TRAILING_BINARY_PARAMS(N, typename meta::as_expr_ref<A, >::type
BOOST_PP_INTERCEPT)> >, tag::function>::type type;\
+ typedef typename meta::generate<Domain, expr<tag::function,
BOOST_PP_CAT(args, BOOST_PP_INC(N))<ref<Derived>
BOOST_PP_ENUM_TRAILING_BINARY_PARAMS(N, typename meta::as_arg<A, >::type
BOOST_PP_INTERCEPT)> >, tag::function>::type type;\
};\
template<BOOST_PP_ENUM_PARAMS(N, typename A)>\
- typename meta::generate<Domain, expr<tag::function, BOOST_PP_CAT(args,
BOOST_PP_INC(N))<ref<Derived> BOOST_PP_ENUM_TRAILING_BINARY_PARAMS(N, typename
meta::as_expr_ref<A, >::type BOOST_PP_INTERCEPT)> > >::type const\
+ typename meta::generate<Domain, expr<tag::function, BOOST_PP_CAT(args,
BOOST_PP_INC(N))<ref<Derived> BOOST_PP_ENUM_TRAILING_BINARY_PARAMS(N, typename
meta::as_arg<A, >::type BOOST_PP_INTERCEPT)> > >::type const\
operator ()(BOOST_PP_ENUM_BINARY_PARAMS(N, A, const &a)) const\
{\
- expr<tag::function, BOOST_PP_CAT(args,
BOOST_PP_INC(N))<ref<Derived> BOOST_PP_ENUM_TRAILING_BINARY_PARAMS(N, typename
meta::as_expr_ref<A, >::type BOOST_PP_INTERCEPT)> > that = {{this->derived()}
BOOST_PP_ENUM_TRAILING(N, BOOST_PROTO_AS_OP, _)};\
- return meta::generate<Domain, expr<tag::function,
BOOST_PP_CAT(args, BOOST_PP_INC(N))<ref<Derived>
BOOST_PP_ENUM_TRAILING_BINARY_PARAMS(N, typename meta::as_expr_ref<A, >::type
BOOST_PP_INTERCEPT)> >, tag::function>::make(that);\
+ expr<tag::function, BOOST_PP_CAT(args,
BOOST_PP_INC(N))<ref<Derived> BOOST_PP_ENUM_TRAILING_BINARY_PARAMS(N, typename
meta::as_arg<A, >::type BOOST_PP_INTERCEPT)> > that = {{this->derived()}
BOOST_PP_ENUM_TRAILING(N, BOOST_PROTO_AS_OP, _)};\
+ return meta::generate<Domain, expr<tag::function,
BOOST_PP_CAT(args, BOOST_PP_INC(N))<ref<Derived>
BOOST_PP_ENUM_TRAILING_BINARY_PARAMS(N, typename meta::as_arg<A, >::type
BOOST_PP_INTERCEPT)> >, tag::function>::make(that);\
}\
/**/
Index: proto_fwd.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/proto_fwd.hpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- proto_fwd.hpp 29 Jan 2007 21:30:05 -0000 1.45
+++ proto_fwd.hpp 2 Feb 2007 22:11:25 -0000 1.46
@@ -246,7 +246,7 @@
struct as_expr;
template<typename T, typename EnableIf = void>
- struct as_expr_ref;
+ struct as_arg;
template<typename Expr, typename State, typename Visitor, typename
DomainTag>
struct compile;
@@ -350,7 +350,7 @@
struct left;
struct right;
struct as_expr;
- struct as_expr_ref;
+ struct as_arg;
struct unref;
struct deep_copy;
Index: traits.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/traits.hpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- traits.hpp 30 Jan 2007 21:51:58 -0000 1.35
+++ traits.hpp 2 Feb 2007 22:11:25 -0000 1.36
@@ -120,15 +120,15 @@
}
};
- // as_expr_ref
+ // as_arg
template<typename T, typename EnableIf>
- struct as_expr_ref
+ struct as_arg
{
typedef expr<proto::tag::terminal, args1<T const &> > type;
};
template<typename T>
- struct as_expr_ref<T, typename T::is_boost_proto_expr_>
+ struct as_arg<T, typename T::is_boost_proto_expr_>
{
typedef ref<T> type;
};
@@ -317,14 +317,14 @@
}
};
- struct as_expr_ref
+ struct as_arg
{
template<typename Sig>
struct result;
template<typename This, typename T>
struct result<This(T)>
- : meta::as_expr_ref<typename meta::value_type<T>::type>
+ : meta::as_arg<typename meta::value_type<T>::type>
{};
template<typename T>
@@ -334,10 +334,10 @@
}
template<typename T>
- typename meta::as_expr_ref<T>::type
+ typename meta::as_arg<T>::type
operator()(T const &t) const
{
- typename meta::as_expr_ref<T>::type that = {t};
+ typename meta::as_arg<T>::type that = {t};
return that;
}
};
@@ -433,7 +433,7 @@
}
op::as_expr const as_expr = {};
- op::as_expr_ref const as_expr_ref = {};
+ op::as_arg const as_arg = {};
op::make_terminal const make_terminal = {};
op::left const left = {};
op::right const right = {};
-------------------------------------------------------------------------
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
