Update of /cvsroot/boost/boost/libs/xpressive/proto/test
In directory
sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5561/libs/xpressive/proto/test
Modified Files:
calculator.cpp lambda.cpp proto_fusion.cpp proto_fusion_s.cpp
toy_spirit.cpp toy_spirit2.cpp
Log Message:
proto::meta namespace is dead
Index: calculator.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/proto/test/calculator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- calculator.cpp 5 Jan 2007 07:31:33 -0000 1.1
+++ calculator.cpp 3 Feb 2007 00:14:33 -0000 1.2
@@ -11,7 +11,7 @@
using namespace boost;
struct placeholder {};
-proto::meta::terminal<placeholder>::type const _1 = {{}};
+proto::terminal<placeholder>::type const _1 = {{}};
struct calculator
{
@@ -62,7 +62,7 @@
template<typename Fun, typename Expr>
struct functor
{
- typedef typename proto::meta::eval<Expr, Fun>::type result_type;
+ typedef typename proto::result_of::eval<Expr, Fun>::type result_type;
functor(Expr const &expr)
: expr_(expr)
Index: lambda.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/proto/test/lambda.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- lambda.cpp 1 Feb 2007 01:23:56 -0000 1.5
+++ lambda.cpp 3 Feb 2007 00:14:33 -0000 1.6
@@ -45,7 +45,7 @@
{
template<typename Expr, typename, typename>
struct apply
- : mpl::next<typename proto::meta::arg<Expr>::type::arity>
+ : mpl::next<typename proto::result_of::arg<Expr>::type::arity>
{};
};
@@ -54,10 +54,10 @@
// The lambda grammar, with the transforms for calculating the max arity
struct LambdaGrammar
: proto::or_<
- placeholder_arity< proto::meta::terminal< placeholder<_> > >
- , proto::trans::always< proto::meta::terminal<_>, mpl::int_<0> >
+ placeholder_arity< proto::terminal< placeholder<_> > >
+ , proto::trans::always< proto::terminal<_>, mpl::int_<0> >
, proto::trans::fold<
- proto::meta::nary_expr<_, proto::vararg< max_arity< LambdaGrammar
> > >
+ proto::nary_expr<_, proto::vararg< max_arity< LambdaGrammar > > >
>
>
{};
@@ -129,7 +129,7 @@
typedef typename mpl::eval_if<
typename lambda_arity<T>::type
, mpl::identity<void>
- , proto::meta::eval<T, lambda_context<fusion::tuple<> > >
+ , proto::result_of::eval<T, lambda_context<fusion::tuple<> > >
>::type nullary_type;
nullary_type operator()() const
@@ -142,7 +142,7 @@
// hide base_type::operator() by defining our own which
// evaluates the lambda expression.
template<typename A0>
- typename proto::meta::eval<T, lambda_context<fusion::tuple<A0 const &> >
>::type
+ typename proto::result_of::eval<T, lambda_context<fusion::tuple<A0 const
&> > >::type
operator()(A0 const &a0) const
{
fusion::tuple<A0 const &> args(a0);
@@ -151,7 +151,7 @@
}
template<typename A0, typename A1>
- typename proto::meta::eval<T, lambda_context<fusion::tuple<A0 const &, A1
const &> > >::type
+ typename proto::result_of::eval<T, lambda_context<fusion::tuple<A0 const
&, A1 const &> > >::type
operator()(A0 const &a0, A1 const &a1) const
{
fusion::tuple<A0 const &, A1 const &> args(a0, a1);
@@ -160,7 +160,7 @@
}
};
-namespace boost { namespace proto { namespace meta
+namespace boost { namespace proto
{
// This causes expressions in the lambda domain to
// be wrapped in a lambda<> expression wrapper.
@@ -174,22 +174,22 @@
return lambda<Expr>(expr);
}
};
-}}}
+}}
// Define some lambda placeholders
-lambda<proto::meta::terminal<placeholder<mpl::int_<0> > >::type> const _1;
-lambda<proto::meta::terminal<placeholder<mpl::int_<1> > >::type> const _2;
+lambda<proto::terminal<placeholder<mpl::int_<0> > >::type> const _1;
+lambda<proto::terminal<placeholder<mpl::int_<1> > >::type> const _2;
template<typename T>
-lambda<typename proto::meta::terminal<T>::type> const val(T const &t)
+lambda<typename proto::terminal<T>::type> const val(T const &t)
{
- return proto::meta::terminal<T>::type::make(t);
+ return proto::terminal<T>::type::make(t);
}
template<typename T>
-lambda<typename proto::meta::terminal<T &>::type> const var(T &t)
+lambda<typename proto::terminal<T &>::type> const var(T &t)
{
- return proto::meta::terminal<T &>::type::make(t);
+ return proto::terminal<T &>::type::make(t);
}
void test_lambda()
Index: proto_fusion.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/proto/test/proto_fusion.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- proto_fusion.cpp 5 Jan 2007 07:31:34 -0000 1.1
+++ proto_fusion.cpp 3 Feb 2007 00:14:33 -0000 1.2
@@ -11,15 +11,15 @@
#include <boost/test/unit_test.hpp>
#include <sstream>
-boost::proto::meta::terminal<char>::type a_ = {'a'};
-boost::proto::meta::terminal<char>::type b_ = {'b'};
-boost::proto::meta::terminal<char>::type c_ = {'c'};
-boost::proto::meta::terminal<char>::type d_ = {'d'};
-boost::proto::meta::terminal<char>::type e_ = {'e'};
-boost::proto::meta::terminal<char>::type f_ = {'f'};
-boost::proto::meta::terminal<char>::type g_ = {'g'};
-boost::proto::meta::terminal<char>::type h_ = {'h'};
-boost::proto::meta::terminal<char>::type i_ = {'i'};
+boost::proto::terminal<char>::type a_ = {'a'};
+boost::proto::terminal<char>::type b_ = {'b'};
+boost::proto::terminal<char>::type c_ = {'c'};
+boost::proto::terminal<char>::type d_ = {'d'};
+boost::proto::terminal<char>::type e_ = {'e'};
+boost::proto::terminal<char>::type f_ = {'f'};
+boost::proto::terminal<char>::type g_ = {'g'};
+boost::proto::terminal<char>::type h_ = {'h'};
+boost::proto::terminal<char>::type i_ = {'i'};
std::ostream &operator <<(std::ostream &sout, boost::proto::tag::terminal)
{
Index: proto_fusion_s.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/proto/test/proto_fusion_s.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- proto_fusion_s.cpp 5 Jan 2007 07:31:34 -0000 1.1
+++ proto_fusion_s.cpp 3 Feb 2007 00:14:33 -0000 1.2
@@ -11,15 +11,15 @@
#include <boost/test/unit_test.hpp>
#include <sstream>
-boost::proto::meta::terminal<char>::type a_ = {'a'};
-boost::proto::meta::terminal<char>::type b_ = {'b'};
-boost::proto::meta::terminal<char>::type c_ = {'c'};
-boost::proto::meta::terminal<char>::type d_ = {'d'};
-boost::proto::meta::terminal<char>::type e_ = {'e'};
-boost::proto::meta::terminal<char>::type f_ = {'f'};
-boost::proto::meta::terminal<char>::type g_ = {'g'};
-boost::proto::meta::terminal<char>::type h_ = {'h'};
-boost::proto::meta::terminal<char>::type i_ = {'i'};
+boost::proto::terminal<char>::type a_ = {'a'};
+boost::proto::terminal<char>::type b_ = {'b'};
+boost::proto::terminal<char>::type c_ = {'c'};
+boost::proto::terminal<char>::type d_ = {'d'};
+boost::proto::terminal<char>::type e_ = {'e'};
+boost::proto::terminal<char>::type f_ = {'f'};
+boost::proto::terminal<char>::type g_ = {'g'};
+boost::proto::terminal<char>::type h_ = {'h'};
+boost::proto::terminal<char>::type i_ = {'i'};
std::ostream &operator <<(std::ostream &sout, boost::proto::tag::terminal)
{
Index: toy_spirit.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/proto/test/toy_spirit.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- toy_spirit.cpp 31 Jan 2007 20:18:13 -0000 1.3
+++ toy_spirit.cpp 3 Feb 2007 00:14:33 -0000 1.4
@@ -25,8 +25,8 @@
struct space_tag {};
// global primitives
- proto::meta::terminal<char_tag>::type const char_ = {{}};
- proto::meta::terminal<space_tag>::type const space = {{}};
+ proto::terminal<char_tag>::type const char_ = {{}};
+ proto::terminal<space_tag>::type const space = {{}};
using proto::lit;
using proto::literal;
@@ -36,12 +36,12 @@
{
// handy typedefs
- typedef proto::meta::terminal<char_tag>::type anychar_p;
- typedef proto::meta::terminal<ichar_tag>::type ianychar_p;
- typedef proto::meta::terminal<istring_tag>::type ianystr_p;
- typedef proto::meta::terminal<ichar_range_tag>::type ianychar_range_p;
- typedef proto::meta::terminal<never_tag>::type never_p;
- typedef proto::meta::terminal<space_tag>::type space_p;
+ typedef proto::terminal<char_tag>::type anychar_p;
+ typedef proto::terminal<ichar_tag>::type ianychar_p;
+ typedef proto::terminal<istring_tag>::type ianystr_p;
+ typedef proto::terminal<ichar_range_tag>::type ianychar_range_p;
+ typedef proto::terminal<never_tag>::type never_p;
+ typedef proto::terminal<space_tag>::type space_p;
struct SpiritGrammar;
struct SkipperGrammar;
@@ -50,35 +50,35 @@
struct SpiritComposites;
struct CharLiteral
- : proto::meta::terminal<char>
+ : proto::terminal<char>
{};
struct NTBSLiteral
- : proto::meta::terminal<char const *>
+ : proto::terminal<char const *>
{};
struct StdStringLiteral
- : proto::meta::terminal<std::string>
+ : proto::terminal<std::string>
{};
struct CharParser
- : proto::meta::function<anychar_p, CharLiteral>
+ : proto::function<anychar_p, CharLiteral>
{};
struct ICharParser
- : proto::meta::function<ianychar_p, CharLiteral, CharLiteral>
+ : proto::function<ianychar_p, CharLiteral, CharLiteral>
{};
struct CharRangeParser
- : proto::meta::function<anychar_p, CharLiteral, CharLiteral>
+ : proto::function<anychar_p, CharLiteral, CharLiteral>
{};
struct IStrParser
- : proto::meta::function<ianystr_p, StdStringLiteral>
+ : proto::function<ianystr_p, StdStringLiteral>
{};
struct ICharRangeParser
- : proto::meta::function<ianychar_range_p, CharLiteral, CharLiteral>
+ : proto::function<ianychar_range_p, CharLiteral, CharLiteral>
{};
ianychar_p const ichar_ = {{}};
@@ -344,10 +344,10 @@
template<>
struct remove_case<CharParser>
{
- typedef proto::meta::function<
+ typedef proto::function<
ianychar_p
- , proto::meta::terminal<char>::type
- , proto::meta::terminal<char>::type
+ , proto::terminal<char>::type
+ , proto::terminal<char>::type
>::type type;
template<typename Expr>
@@ -363,10 +363,10 @@
template<>
struct remove_case<CharRangeParser>
{
- typedef proto::meta::function<
+ typedef proto::function<
ianychar_range_p
- , proto::meta::terminal<char>::type
- , proto::meta::terminal<char>::type
+ , proto::terminal<char>::type
+ , proto::terminal<char>::type
>::type type;
template<typename Expr>
@@ -382,10 +382,10 @@
template<>
struct remove_case<CharLiteral>
{
- typedef proto::meta::function<
+ typedef proto::function<
ianychar_p
- , proto::meta::terminal<char>::type
- , proto::meta::terminal<char>::type
+ , proto::terminal<char>::type
+ , proto::terminal<char>::type
>::type type;
template<typename Expr>
@@ -401,9 +401,9 @@
template<>
struct remove_case<NTBSLiteral>
{
- typedef proto::meta::function<
+ typedef proto::function<
ianystr_p
- , proto::meta::terminal<std::string>::type
+ , proto::terminal<std::string>::type
>::type type;
template<typename Expr>
@@ -417,9 +417,9 @@
template<>
struct remove_case<StdStringLiteral>
{
- typedef proto::meta::function<
+ typedef proto::function<
ianystr_p
- , proto::meta::terminal<std::string>::type
+ , proto::terminal<std::string>::type
>::type type;
template<typename Expr>
@@ -460,8 +460,8 @@
template<typename Expr, typename State, typename Visitor>
struct apply
{
- typedef typename proto::meta::right_shift<
- typename proto::meta::unary_star<State>::type
+ typedef typename proto::right_shift<
+ typename proto::unary_star<State>::type
, Expr
>::type type;
};
@@ -498,7 +498,7 @@
, IStrParser
, ICharParser
, ICharRangeParser
- , proto::meta::complement<SpiritPrimitives>
+ , proto::complement<SpiritPrimitives>
>
{};
@@ -512,13 +512,13 @@
template<typename Grammar>
struct SpiritComposites
: proto::or_<
- proto::meta::bitwise_or< Grammar, Grammar >
- , proto::meta::right_shift< Grammar, Grammar >
- , proto::meta::subtract< Grammar, Grammar >
+ proto::bitwise_or< Grammar, Grammar >
+ , proto::right_shift< Grammar, Grammar >
+ , proto::subtract< Grammar, Grammar >
, proto::or_<
- proto::meta::unary_star< Grammar >
- , proto::meta::unary_plus< Grammar >
- , proto::meta::logical_not< Grammar >
+ proto::unary_star< Grammar >
+ , proto::unary_plus< Grammar >
+ , proto::logical_not< Grammar >
>
>
{};
Index: toy_spirit2.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/proto/test/toy_spirit2.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- toy_spirit2.cpp 25 Jan 2007 02:23:23 -0000 1.6
+++ toy_spirit2.cpp 3 Feb 2007 00:14:33 -0000 1.7
@@ -30,8 +30,8 @@
struct space_tag {};
// global primitives
- proto::meta::terminal<char_tag>::type const char_ = {{}};
- proto::meta::terminal<space_tag>::type const space = {{}};
+ proto::terminal<char_tag>::type const char_ = {{}};
+ proto::terminal<space_tag>::type const space = {{}};
using proto::lit;
using proto::literal;
@@ -272,27 +272,27 @@
struct ToySpiritGrammar;
struct AnyChar
- : proto::meta::terminal<char_tag>
+ : proto::terminal<char_tag>
{};
struct CharLiteral
- : proto::meta::terminal<char>
+ : proto::terminal<char>
{};
struct NTBSLiteral
- : proto::meta::terminal<char const *>
+ : proto::terminal<char const *>
{};
struct CharParser
- : proto::meta::function<AnyChar, CharLiteral>
+ : proto::function<AnyChar, CharLiteral>
{};
struct CharRangeParser
- : proto::meta::function<AnyChar, CharLiteral, CharLiteral>
+ : proto::function<AnyChar, CharLiteral, CharLiteral>
{};
struct NoCase
- : proto::meta::terminal<no_case_tag>
+ : proto::terminal<no_case_tag>
{};
// Extract the arg from terminals
@@ -320,7 +320,7 @@
: as_composite<
proto::tag::right_shift
, proto::trans::reverse_fold_to_list<
- proto::meta::right_shift<ToySpiritGrammar, ToySpiritGrammar>
+ proto::right_shift<ToySpiritGrammar, ToySpiritGrammar>
>
>
{};
@@ -331,7 +331,7 @@
: as_composite<
proto::tag::bitwise_or
, proto::trans::reverse_fold_to_list<
- proto::meta::bitwise_or<ToySpiritGrammar, ToySpiritGrammar>
+ proto::bitwise_or<ToySpiritGrammar, ToySpiritGrammar>
>
>
{};
@@ -340,7 +340,7 @@
struct ToySpiritDirective
: no_case_transform<
proto::trans::arg_c<
- proto::meta::subscript< NoCase, ToySpiritGrammar >
+ proto::subscript< NoCase, ToySpiritGrammar >
, 1
>
>
-------------------------------------------------------------------------
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
