Boost logo

Boost-Commit :

From: eric_at_[hidden]
Date: 2007-12-09 21:16:16


Author: eric_niebler
Date: 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
New Revision: 41947
URL: http://svn.boost.org/trac/boost/changeset/41947

Log:
s/transform_base/callable/
Text files modified:
   branches/proto/v3/boost/xpressive/detail/core/matcher/action_matcher.hpp | 4 ++--
   branches/proto/v3/boost/xpressive/detail/static/grammar.hpp | 35 +++++++++++++++++------------------
   branches/proto/v3/boost/xpressive/proto/fusion.hpp | 6 +++---
   branches/proto/v3/boost/xpressive/proto/make_expr.hpp | 6 +++---
   branches/proto/v3/boost/xpressive/proto/matches.hpp | 18 +++++++++---------
   branches/proto/v3/boost/xpressive/proto/proto_fwd.hpp | 8 ++++----
   branches/proto/v3/boost/xpressive/proto/traits.hpp | 22 +++++++++++-----------
   branches/proto/v3/boost/xpressive/proto/transform/arg.hpp | 14 +++++++-------
   branches/proto/v3/boost/xpressive/proto/transform/bind.hpp | 4 ++--
   branches/proto/v3/boost/xpressive/proto/transform/call.hpp | 12 ++++++------
   branches/proto/v3/boost/xpressive/proto/transform/fold.hpp | 8 ++++----
   branches/proto/v3/boost/xpressive/proto/transform/fold_tree.hpp | 12 ++++++------
   branches/proto/v3/boost/xpressive/proto/transform/make.hpp | 8 ++++----
   branches/proto/v3/boost/xpressive/proto/transform/when.hpp | 6 +++---
   branches/proto/v3/boost/xpressive/regex_primitives.hpp | 6 +++---
   branches/proto/v3/libs/xpressive/proto/example/mixed.cpp | 2 +-
   branches/proto/v3/libs/xpressive/proto/example/vec3.cpp | 2 +-
   branches/proto/v3/libs/xpressive/proto/test/examples.cpp | 12 ++++++------
   branches/proto/v3/libs/xpressive/proto/test/main.cpp | 4 ++--
   19 files changed, 94 insertions(+), 95 deletions(-)

Modified: branches/proto/v3/boost/xpressive/detail/core/matcher/action_matcher.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/detail/core/matcher/action_matcher.hpp (original)
+++ branches/proto/v3/boost/xpressive/detail/core/matcher/action_matcher.hpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -263,7 +263,7 @@
         Actor actor_;
     };
 
- struct get_sub_match : proto::transform_base
+ struct get_sub_match : proto::callable
     {
         template<typename Sig>
         struct result;
@@ -281,7 +281,7 @@
         }
     };
 
- struct get_attr_slot : proto::transform_base
+ struct get_attr_slot : proto::callable
     {
         template<typename Sig>
         struct result;

Modified: branches/proto/v3/boost/xpressive/detail/static/grammar.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/detail/static/grammar.hpp (original)
+++ branches/proto/v3/boost/xpressive/detail/static/grammar.hpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -179,7 +179,7 @@
           : mpl::true_
         {};
 
- struct as_matcher : transform_base
+ struct as_matcher : callable
         {
             template<typename Sig>
             struct result;
@@ -197,7 +197,7 @@
             }
         };
 
- struct get_width : transform_base
+ struct get_width : callable
         {
             typedef std::size_t result_type;
 
@@ -208,7 +208,7 @@
             }
         };
 
- struct mark_number : transform_base
+ struct mark_number : callable
         {
             typedef int result_type;
 
@@ -219,7 +219,7 @@
             }
         };
 
- struct get_hidden_mark : transform_base
+ struct get_hidden_mark : callable
         {
             typedef int result_type;
 
@@ -230,7 +230,7 @@
             }
         };
 
- struct traits : transform_base
+ struct traits : callable
         {
             template<typename Sig>
             struct result;
@@ -249,7 +249,7 @@
             }
         };
 
- struct newline : transform_base
+ struct newline : callable
         {
             template<typename Sig>
             struct result;
@@ -268,7 +268,7 @@
             }
         };
 
- struct as_posix_charset : transform_base
+ struct as_posix_charset : callable
         {
             template<typename Sig>
             struct result;
@@ -329,8 +329,7 @@
         // ListSet
         // matches expressions like (set= 'a','b','c')
         // calculates the size of the set
- // populates an array of characters
- template<typename Char, typename Dummy = transform_base>
+ template<typename Char, typename Dummy = callable>
         struct ListSet
           : or_<
                 when<
@@ -344,7 +343,7 @@
>
         {};
 
- struct fill_list_set : transform_base
+ struct fill_list_set : callable
         {
             template<typename Sig>
             struct result;
@@ -384,7 +383,7 @@
             return const_cast<T &>(t);
         }
 
- struct merge_charset : transform_base
+ struct merge_charset : callable
         {
             template<typename Sig>
             struct result;
@@ -434,7 +433,7 @@
             }
         };
 
- struct invert : transform_base
+ struct invert : callable
         {
             template<typename Sig>
             struct result;
@@ -453,7 +452,7 @@
             }
         };
 
- struct modify : transform_base
+ struct modify : callable
         {
             template<typename Sig>
             struct result;
@@ -660,7 +659,7 @@
>
             {};
 
- template<typename Greedy, typename Tag, typename Base = transform_base>
+ template<typename Greedy, typename Tag, typename Base = callable>
             struct as_repeater
               : call<
                     _make_shift_right(
@@ -700,12 +699,12 @@
>
             {};
 
- template<typename Greedy, typename Tag , typename Base = transform_base >
+ template<typename Greedy, typename Tag , typename Base = callable >
             struct as_default_repeat
               : as_default_repeat_impl<Greedy, Tag>
             {};
 
- template<typename Greedy , typename Base = transform_base >
+ template<typename Greedy , typename Base = callable >
             struct as_simple_repeat
               : make<
                     simple_repeat_matcher<as_independent(_arg), Greedy>(
@@ -717,7 +716,7 @@
>
             {};
 
- template<typename Greedy, typename Base = transform_base>
+ template<typename Greedy, typename Base = callable>
             struct as_repeat
               : if_<
                     use_simple_repeat<_arg, Char>()
@@ -726,7 +725,7 @@
>
             {};
 
- template<typename Greedy, typename Base = transform_base>
+ template<typename Greedy, typename Base = callable>
             struct as_optional
                 // BUGBUG if_< matches<_, Foo>() ... Foo can be treated as a transform!
               : or_<

Modified: branches/proto/v3/boost/xpressive/proto/fusion.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/fusion.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/fusion.hpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -135,17 +135,17 @@
     }
 
     template<>
- struct is_transform<functional::flatten>
+ struct is_callable<functional::flatten>
       : mpl::true_
     {};
 
     template<>
- struct is_transform<functional::pop_front>
+ struct is_callable<functional::pop_front>
       : mpl::true_
     {};
 
     template<>
- struct is_transform<functional::reverse>
+ struct is_callable<functional::reverse>
       : mpl::true_
     {};
 

Modified: branches/proto/v3/boost/xpressive/proto/make_expr.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/make_expr.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/make_expr.hpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -574,17 +574,17 @@
 
 
     template<typename Tag, typename Domain>
- struct is_transform<functional::make_expr<Tag, Domain> >
+ struct is_callable<functional::make_expr<Tag, Domain> >
       : mpl::true_
     {};
 
     template<typename Tag, typename Domain>
- struct is_transform<functional::unpack_expr<Tag, Domain> >
+ struct is_callable<functional::unpack_expr<Tag, Domain> >
       : mpl::true_
     {};
 
     template<typename Tag, typename Domain>
- struct is_transform<functional::unfused_expr<Tag, Domain> >
+ struct is_callable<functional::unfused_expr<Tag, Domain> >
       : mpl::true_
     {};
 

Modified: branches/proto/v3/boost/xpressive/proto/matches.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/matches.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/matches.hpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -437,7 +437,7 @@
         } // namespace detail
 
         template<typename... Alts>
- struct or_ : transform_base
+ struct or_ : callable
         {
             typedef or_ proto_base_expr;
 
@@ -469,7 +469,7 @@
 
         // if_
         template<typename If, typename Then, typename Else>
- struct if_ : transform_base
+ struct if_ : callable
         {
             typedef if_ proto_base_expr;
 
@@ -508,7 +508,7 @@
         };
 
         template<typename Cases>
- struct switch_ : transform_base
+ struct switch_ : callable
         {
             typedef switch_ proto_base_expr;
 
@@ -547,32 +547,32 @@
     }
 
     template<typename... Args>
- struct is_transform<or_<Args...> >
+ struct is_callable<or_<Args...> >
       : mpl::true_
     {};
 
     template<typename... Args>
- struct is_transform<and_<Args...> >
+ struct is_callable<and_<Args...> >
       : mpl::true_
     {};
 
     template<typename Grammar>
- struct is_transform<not_<Grammar> >
+ struct is_callable<not_<Grammar> >
       : mpl::true_
     {};
 
     template<typename If, typename Then, typename Else>
- struct is_transform<if_<If, Then, Else> >
+ struct is_callable<if_<If, Then, Else> >
       : mpl::true_
     {};
 
     template<typename Grammar>
- struct is_transform<vararg<Grammar> >
+ struct is_callable<vararg<Grammar> >
       : mpl::true_
     {};
 
     template<>
- struct is_transform<_>
+ struct is_callable<_>
       : mpl::true_
     {};
 

Modified: branches/proto/v3/boost/xpressive/proto/proto_fwd.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/proto_fwd.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/proto_fwd.hpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -324,16 +324,16 @@
     using control::N;
 
     template<typename T>
- struct is_transform;
+ struct is_callable;
 
     template<typename T>
     struct is_aggregate;
 
     namespace transform
     {
- struct transform_base
+ struct callable
         {
- typedef void proto_is_transform_;
+ typedef void proto_is_callable_;
         };
 
         template<typename Grammar, typename Fun = Grammar>
@@ -417,7 +417,7 @@
     using transform::reverse_fold;
     using transform::fold_tree;
     using transform::reverse_fold_tree;
- using transform::transform_base;
+ using transform::callable;
 
     namespace context
     {

Modified: branches/proto/v3/boost/xpressive/proto/traits.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/traits.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/traits.hpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -705,44 +705,44 @@
         {};
 
         template<typename T, typename EnableIf = void>
- struct is_transform2_
+ struct is_callable2_
           : mpl::false_
         {};
 
         template<typename T>
- struct is_transform2_<T, typename T::proto_is_transform_>
+ struct is_callable2_<T, typename T::proto_is_callable_>
           : mpl::true_
         {};
 
         template<typename T>
- struct is_transform_
- : is_transform2_<T>
+ struct is_callable_
+ : is_callable2_<T>
         {};
 
         // TODO when gcc #33965 is fixed, change the idiom to
         // template<typename X, bool IsTransform = true> struct my_transform {...};
         template<template<typename...> class T, typename... Args>
- struct is_transform_<T<Args...> >
- : is_same<typename back<Args...>::type, transform_base>
+ struct is_callable_<T<Args...> >
+ : is_same<typename back<Args...>::type, callable>
         {};
 
     } // namespace detail
 
- /// is_transform
+ /// is_callable
     ///
     template<typename T>
- struct is_transform
- : proto::detail::is_transform_<T>
+ struct is_callable
+ : proto::detail::is_callable_<T>
     {};
 
     // work around GCC bug
     template<typename Tag, typename Args, long N>
- struct is_transform<expr<Tag, Args, N> >
+ struct is_callable<expr<Tag, Args, N> >
       : mpl::false_
     {};
 
     template<>
- struct is_transform<transform_base>
+ struct is_callable<callable>
       : mpl::false_
     {};
 

Modified: branches/proto/v3/boost/xpressive/proto/transform/arg.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/transform/arg.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/transform/arg.hpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -36,7 +36,7 @@
     namespace transform
     {
 
- struct _expr : transform_base
+ struct _expr : callable
         {
             template<typename Sig>
             struct result;
@@ -61,7 +61,7 @@
             }
         };
 
- struct _state : transform_base
+ struct _state : callable
         {
             template<typename Sig>
             struct result;
@@ -86,7 +86,7 @@
             }
         };
 
- struct _visitor : transform_base
+ struct _visitor : callable
         {
             template<typename Sig>
             struct result;
@@ -106,7 +106,7 @@
         };
 
         template<int I>
- struct _arg_c : transform_base
+ struct _arg_c : callable
         {
             template<typename Sig>
             struct result;
@@ -145,7 +145,7 @@
         typedef _arg1 _right;
 
         template<typename T>
- struct always : transform_base
+ struct always : callable
         {
             template<typename Sig>
             struct result;
@@ -165,12 +165,12 @@
     }
 
     template<typename T>
- struct is_transform<transform::always<T> >
+ struct is_callable<transform::always<T> >
       : mpl::true_
     {};
 
     template<int I>
- struct is_transform<transform::_arg_c<I> >
+ struct is_callable<transform::_arg_c<I> >
       : mpl::true_
     {};
 

Modified: branches/proto/v3/boost/xpressive/proto/transform/bind.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/transform/bind.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/transform/bind.hpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -20,7 +20,7 @@
     namespace transform
     {
         template<typename Return, typename... Args>
- struct bind : transform_base
+ struct bind : callable
         {
             template<typename Sig>
             struct result;
@@ -54,7 +54,7 @@
     }
 
     template<typename Fun, typename... Args>
- struct is_transform<transform::bind<Fun, Args...> >
+ struct is_callable<transform::bind<Fun, Args...> >
       : mpl::true_
     {};
 

Modified: branches/proto/v3/boost/xpressive/proto/transform/call.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/transform/call.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/transform/call.hpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -191,7 +191,7 @@
         }
 
         template<typename Fun, typename... Args>
- struct call : transform_base
+ struct call : callable
         {
             template<typename Sig>
             struct result;
@@ -213,7 +213,7 @@
         };
 
         template<typename Fun>
- struct call<Fun> : transform_base
+ struct call<Fun> : callable
         {
             template<typename Sig>
             struct result;
@@ -241,7 +241,7 @@
         };
 
         template<typename Fun, typename Arg0>
- struct call<Fun, Arg0> : transform_base
+ struct call<Fun, Arg0> : callable
         {
             template<typename Sig>
             struct result;
@@ -269,7 +269,7 @@
         };
 
         template<typename Fun, typename Arg0, typename Arg1>
- struct call<Fun, Arg0, Arg1> : transform_base
+ struct call<Fun, Arg0, Arg1> : callable
         {
             template<typename Sig>
             struct result;
@@ -297,7 +297,7 @@
         };
 
         template<typename Fun, typename Arg0, typename Arg1, typename Arg2>
- struct call<Fun, Arg0, Arg1, Arg2> : transform_base
+ struct call<Fun, Arg0, Arg1, Arg2> : callable
         {
             template<typename Sig>
             struct result;
@@ -334,7 +334,7 @@
     }
 
     template<typename Fun, typename... Args>
- struct is_transform<transform::call<Fun, Args...> >
+ struct is_callable<transform::call<Fun, Args...> >
       : mpl::true_
     {};
 

Modified: branches/proto/v3/boost/xpressive/proto/transform/fold.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/transform/fold.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/transform/fold.hpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -58,7 +58,7 @@
                 Visitor &v_;
             };
 
- struct reverse : transform_base
+ struct reverse : callable
             {
                 template<typename Sig>
                 struct result;
@@ -79,7 +79,7 @@
         } // namespace detail
 
         template<typename Sequence, typename State0, typename Fun>
- struct fold : transform_base
+ struct fold : callable
         {
             template<typename Sig>
             struct result;
@@ -114,12 +114,12 @@
     }
 
     template<typename Sequence, typename State, typename Fun>
- struct is_transform<transform::fold<Sequence, State, Fun> >
+ struct is_callable<transform::fold<Sequence, State, Fun> >
       : mpl::true_
     {};
 
     template<typename Sequence, typename State, typename Fun>
- struct is_transform<transform::reverse_fold<Sequence, State, Fun> >
+ struct is_callable<transform::reverse_fold<Sequence, State, Fun> >
       : mpl::true_
     {};
 

Modified: branches/proto/v3/boost/xpressive/proto/transform/fold_tree.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/transform/fold_tree.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/transform/fold_tree.hpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -61,7 +61,7 @@
 
         template<typename Sequence, typename State0, typename Fun>
         struct fold_tree
- : transform_base
+ : callable
         {
             template<typename Sig>
             struct result;
@@ -92,7 +92,7 @@
 
         template<typename Sequence, typename State0, typename Fun>
         struct reverse_fold_tree
- : transform_base
+ : callable
         {
             template<typename Sig>
             struct result;
@@ -123,22 +123,22 @@
     }
 
     template<typename Sequence, typename State0, typename Fun>
- struct is_transform<transform::fold_tree<Sequence, State0, Fun> >
+ struct is_callable<transform::fold_tree<Sequence, State0, Fun> >
       : mpl::true_
     {};
 
     template<typename Grammar, typename Fun>
- struct is_transform<transform::detail::fold_tree_<Grammar, Fun> >
+ struct is_callable<transform::detail::fold_tree_<Grammar, Fun> >
       : mpl::true_
     {};
 
     template<typename Sequence, typename State0, typename Fun>
- struct is_transform<transform::reverse_fold_tree<Sequence, State0, Fun> >
+ struct is_callable<transform::reverse_fold_tree<Sequence, State0, Fun> >
       : mpl::true_
     {};
 
     template<typename Grammar, typename Fun>
- struct is_transform<transform::detail::reverse_fold_tree_<Grammar, Fun> >
+ struct is_callable<transform::detail::reverse_fold_tree_<Grammar, Fun> >
       : mpl::true_
     {};
 }}

Modified: branches/proto/v3/boost/xpressive/proto/transform/make.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/transform/make.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/transform/make.hpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -54,7 +54,7 @@
             };
 
             template<typename R, typename Expr, typename State, typename Visitor
- , bool IsTransform = is_transform<R>::value
+ , bool IsTransform = is_callable<R>::value
>
             struct make_if_;
 
@@ -157,7 +157,7 @@
         }
 
         template<typename Return, typename... Args>
- struct make : transform_base
+ struct make : callable
         {
             template<typename Sig>
             struct result;
@@ -178,7 +178,7 @@
 
         // work around gcc bug
         template<typename T, typename A, long N, typename... Args>
- struct make<expr<T, A, N>, Args...> : transform_base
+ struct make<expr<T, A, N>, Args...> : callable
         {
             template<typename Sig>
             struct result
@@ -201,7 +201,7 @@
     }
 
     template<typename Fun, typename... Args>
- struct is_transform<transform::make<Fun, Args...> >
+ struct is_callable<transform::make<Fun, Args...> >
       : mpl::true_
     {};
 

Modified: branches/proto/v3/boost/xpressive/proto/transform/when.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/transform/when.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/transform/when.hpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -36,7 +36,7 @@
     // (possibly lambda) type and constructor arguments.
     template<typename Grammar, typename Return, typename... Args>
     struct when<Grammar, Return(Args...)>
- : transform_base
+ : callable
     {
         typedef typename Grammar::proto_base_expr proto_base_expr;
 
@@ -47,7 +47,7 @@
         struct result<This(Expr, State, Visitor)>
           : boost::result_of<
                 typename mpl::if_<
- is_transform<Return>
+ is_callable<Return>
                   , call<Return, Args...> // "Return" is a function to call
                   , make<Return, Args...> // "Return" is an object to construct
>::type(Expr, State, Visitor)
@@ -59,7 +59,7 @@
         operator()(Expr const &expr, State const &state, Visitor &visitor) const
         {
             return typename mpl::if_<
- is_transform<Return>
+ is_callable<Return>
               , call<Return, Args...>
               , make<Return, Args...>
>::type()(expr, state, visitor);

Modified: branches/proto/v3/boost/xpressive/regex_primitives.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/regex_primitives.hpp (original)
+++ branches/proto/v3/boost/xpressive/regex_primitives.hpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -52,7 +52,7 @@
         using proto::extends<basic_mark_tag, mark_tag>::operator =;
     };
 
- struct push_back : proto::transform_base
+ struct push_back : proto::callable
     {
         typedef int result_type;
 
@@ -70,8 +70,8 @@
     // s1 or -s1
     struct SubMatch
       : proto::or_<
- proto::when<basic_mark_tag, push_back(proto::_visitor, mark_number(proto::_arg))>
- , proto::when<proto::negate<basic_mark_tag >, push_back(proto::_visitor, negative_one())>
+ proto::when<basic_mark_tag, push_back(proto::_visitor, mark_number(proto::_arg)) >
+ , proto::when<proto::negate<basic_mark_tag>, push_back(proto::_visitor, negative_one()) >
>
     {};
 

Modified: branches/proto/v3/libs/xpressive/proto/example/mixed.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/example/mixed.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/example/mixed.cpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -48,7 +48,7 @@
     Iter it;
 };
 
-struct begin : proto::transform_base
+struct begin : proto::callable
 {
     template<class Sig>
     struct result;

Modified: branches/proto/v3/libs/xpressive/proto/example/vec3.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/example/vec3.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/example/vec3.cpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -62,7 +62,7 @@
 };
 
 struct one : mpl::int_<1> {};
-struct iplus : std::plus<int>, transform_base {};
+struct iplus : std::plus<int>, callable {};
 
 // Here is a transform that does the same thing as the above context.
 // It demonstrates the use of the std::plus<> function object

Modified: branches/proto/v3/libs/xpressive/proto/test/examples.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/test/examples.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/test/examples.cpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -61,10 +61,10 @@
 // child expression.
 struct unary_arity
   /*<< Custom transforms should inherit from
- transform_base. In some cases, (e.g., when the transform
+ callable. In some cases, (e.g., when the transform
   is a template), it is also necessary to specialize
- the proto::is_transform<> trait. >>*/
- : transform_base
+ the proto::is_callable<> trait. >>*/
+ : callable
 {
     template<typename Sig>
     struct result;
@@ -97,10 +97,10 @@
 // arities of the two children expressions.
 struct binary_arity
   /*<< All custom transforms should inherit from
- transform_base. In some cases, (e.g., when the transform
+ callable. In some cases, (e.g., when the transform
   is a template), it is also necessary to specialize
- the proto::is_transform<> trait. >>*/
- : transform_base
+ the proto::is_callable<> trait. >>*/
+ : callable
 {
     template<typename Sig>
     struct result;

Modified: branches/proto/v3/libs/xpressive/proto/test/main.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/test/main.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/test/main.cpp 2007-12-09 21:16:14 EST (Sun, 09 Dec 2007)
@@ -47,7 +47,7 @@
 struct pair
 {};
 
-struct make_negate : transform_base
+struct make_negate : callable
 {
     template<typename Sig> struct result;
 
@@ -65,7 +65,7 @@
     }
 };
 
-//struct make_cons : transform_base
+//struct make_cons : callable
 //{
 // template<typename Sig> struct result;
 //


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk