Release 1.41.0

[SVN r57747]

doc/index.rst

@@ -71,16 +71,16 @@ __ ../../../../index.htm
 -------------------------------------
 
 :Authors:       David Abrahams, Daniel Wallin
-:Contact:       dave@boost-consulting.com, daniel@boostpro.com
-:organization:  `BoostPro Computing`_
-:date:          $Date: 2005/07/17 19:53:01 $
+:Contact:       dave@boost-consulting.com, dalwan01@student.umu.se
+:Organization:  `Boost Consulting`_
+:Date:          $Date: 2005/07/18 20:34:31 $
 
-:copyright:     Copyright David Abrahams, Daniel Wallin
-                2005-2009. Distributed under the Boost Software License,
+:Copyright:     Copyright David Abrahams, Daniel Wallin 2005. 
+                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)
 
-.. _`BoostPro Computing`: http://www.boostpro.com
+.. _`Boost Consulting`: http://www.boost-consulting.com
 
 .. _concepts: http://www.boost.org/more/generic_programming.html#concept
 
@@ -1112,7 +1112,7 @@ be used within the body of a class::
   struct callable2
   {
       BOOST_PARAMETER_CONST_MEMBER_FUNCTION(
-          (void), call, tag, (required (arg1,(int))(arg2,(int))))
+          (void), operator(), tag, (required (arg1,(int))(arg2,(int))))
       {
           std::cout << arg1 << ", " << arg2 << std::endl;
       }
@@ -1120,9 +1120,7 @@ be used within the body of a class::
 
 .. @example.prepend('''
    #include <boost/parameter.hpp>
-   #include <iostream>
-   using namespace boost::parameter;
-   ''')
+   #include <iostream>''')
 
 .. @test('compile')
 
@@ -1133,7 +1131,7 @@ arguments on to a separate implementation function::
   struct callable2
   {
       BOOST_PARAMETER_CONST_MEMBER_FUNCTION(
-          (void), call, tag, (required (arg1,(int))(arg2,(int))))
+          (void), operator(), tag, (required (arg1,(int))(arg2,(int))))
       {
           call_impl(arg1,arg2);
       }
@@ -1145,40 +1143,10 @@ arguments on to a separate implementation function::
    #include <boost/parameter.hpp>
 
    BOOST_PARAMETER_NAME(arg1)
-   BOOST_PARAMETER_NAME(arg2)
-   using namespace boost::parameter;
-   ''')
+   BOOST_PARAMETER_NAME(arg2)''')
 
 .. @test('compile')
 
-Static Member Functions
-=======================
-
-To expose a static member function, simply insert the keyword
-“``static``” before the function name:
-
-.. parsed-literal::
-
-  BOOST_PARAMETER_NAME(arg1)
-
-  struct somebody
-  {
-      BOOST_PARAMETER_MEMBER_FUNCTION(
-          (void), **static** f, tag, (optional (arg1,(int),0)))
-      {
-          std::cout << arg1 << std::endl;
-      }
-  };
-
-.. @example.prepend('''
-   #include <boost/parameter.hpp>
-   #include <iostream>
-   using namespace boost::parameter;
-   ''')
-
-.. @test('compile')
-
-
 ------------------------------
 Parameter-Enabled Constructors
 ------------------------------
@@ -1371,10 +1339,10 @@ separately)::
   using boost::mpl::_;
 
   typedef parameter::parameters<
-      required<tag::class_type, boost::is_class<_> >
-    , parameter::optional<tag::base_list, mpl::is_sequence<_> >
-    , parameter::optional<tag::held_type>
-    , parameter::optional<tag::copyable>
+      required<tag::class_type, is_class<_> >
+    , optional<tag::base_list, mpl::is_sequence<_> >
+    , optional<tag::held_type>
+    , optional<tag::copyable>
   > class_signature;
 
   }}
@@ -1383,7 +1351,6 @@ separately)::
    #include <boost/parameter.hpp>
    #include <boost/mpl/is_sequence.hpp>
    #include <boost/noncopyable.hpp>
-   #include <boost/type_traits/is_class.hpp>
    #include <memory>
 
    using namespace boost::parameter;
@@ -1410,13 +1377,12 @@ separately)::
 Argument Packs and Parameter Extraction
 ---------------------------------------
 
-Next, within the body of ``class_`` , we use the |ParameterSpec|\ 's
-nested ``::bind< … >`` template to bundle the actual arguments into an
-|ArgumentPack|_ type, and then use the library's ``value_type< … >``
-metafunction to extract “logical parameters”.  ``value_type< … >`` is
-a lot like ``binding< … >``, but no reference is added to the actual
-argument type.  Note that defaults are specified by passing it an
-optional third argument::
+Next, within the body of ``class_`` , we use the |ParameterSpec|\
+'s nested ``::bind< … >`` template to bundle the actual arguments
+into an |ArgumentPack|_ type, and then use the library's ``binding<
+… >`` metafunction to extract “logical parameters”.  Note that
+defaults are specified by supplying an optional third argument to
+``binding< … >``::
 
   namespace boost { namespace python {
 
@@ -1434,16 +1400,16 @@ optional third argument::
       args;
 
       // Extract first logical parameter.
-      typedef typename parameter::value_type<
+      typedef typename parameter::binding<
         args, tag::class_type>::type class_type;
       
-      typedef typename parameter::value_type<
+      typedef typename parameter::binding<
         args, tag::base_list, bases<> >::type base_list;
       
-      typedef typename parameter::value_type<
+      typedef typename parameter::binding<
         args, tag::held_type, class_type>::type held_type;
       
-      typedef typename parameter::value_type<
+      typedef typename parameter::binding<
         args, tag::copyable, void>::type copyable;
   };
 
@@ -1545,12 +1511,12 @@ parameters deducible::
   typedef parameter::parameters<
       required<tag::class_type, is_class<_> >
 
-    , parameter::optional<
+    , optional<
           deduced<tag::base_list>
         , is_base_and_derived<detail::bases_base,_>
       >
 
-    , parameter::optional<
+    , optional<
           deduced<tag::held_type>
         , mpl::not_<
               mpl::or_<
@@ -1560,12 +1526,11 @@ parameters deducible::
           >
       >
 
-    , parameter::optional<deduced<tag::copyable>, is_same<noncopyable,_> >
+    , optional<deduced<tag::copyable>, is_same<noncopyable,_> >
 
   > class_signature;
 
 .. @example.prepend('''
-   #include <boost/type_traits/is_class.hpp>
    namespace boost { namespace python {''')
 
 .. @example.append('''
@@ -1583,16 +1548,16 @@ parameters deducible::
        args;
  
        // Extract first logical parameter.
-       typedef typename parameter::value_type<
+       typedef typename parameter::binding<
          args, tag::class_type>::type class_type;
       
-       typedef typename parameter::value_type<
+       typedef typename parameter::binding<
          args, tag::base_list, bases<> >::type base_list;
       
-       typedef typename parameter::value_type<
+       typedef typename parameter::binding<
          args, tag::held_type, class_type>::type held_type;
       
-       typedef typename parameter::value_type<
+       typedef typename parameter::binding<
          args, tag::copyable, void>::type copyable;
    };
 
@@ -1813,13 +1778,15 @@ function template and allow *it* to do type deduction::
 Occasionally one needs to deduce argument types without an extra
 layer of function call.  For example, suppose we wanted to return
 twice the value of the ``index`` parameter?  In that
-case we can use the ``value_type< … >`` metafunction introduced
+case we can use the ``binding< … >`` metafunction introduced
 `earlier`__::
 
    BOOST_PARAMETER_NAME(index)
 
    template <class ArgumentPack>
-   typename parameter::value_type<ArgumentPack, tag::index, int>::type
+   typename remove_reference<
+       typename parameter::binding<ArgumentPack, tag::index, int>::type
+   >::type
    twice_index(ArgumentPack const& args)
    {
        return 2 * args[_index|42];
@@ -1833,20 +1800,39 @@ case we can use the ``value_type< … >`` metafunction introduced
    #include <cassert>
 
    namespace parameter = boost::parameter;
-   ''')
+   using boost::remove_reference;''')
+
+Note that the ``remove_reference< … >`` dance is necessary because
+``binding< … >`` will return a reference type when the argument
+is bound in the argument pack. If we don't strip the reference we
+end up returning a reference to the temporary created in the ``2 * …``
+expression. A convenient shortcut would be to use the ``value_type< … >``
+metafunction:
+
+.. parsed-literal::
+
+   template <class ArgumentPack>
+   typename **parameter::value_type<ArgumentPack, tag::index, int>**::type
+   twice_index(ArgumentPack const& args)
+   {
+       return 2 * args[_index|42];
+   }
+
+.. @example.wrap('namespace with_value_type {', '''
+   int six = twice_index(_index = 3);
+   }''')
+
+.. TODO: binding<> returns a reference. We should use value_type<> here.
 
 .. @example.append('''
    int main()
    {
        assert(six == 6);
+       assert(with_value_type::six == 6);
    }''')
 
 .. @test('run', howmany='all')
 
-Note that if we had used ``binding< … >`` rather than ``value_type< …
->``, we would end up returning a reference to the temporary created in
-the ``2 * …`` expression.
-
 __ binding_intro_
 
 Lazy Default Computation
@@ -1902,10 +1888,12 @@ object.
 
 .. parsed-literal::
 
+   using boost::bind;
+   using boost::ref;
+
    typename parameter::binding<
        ArgumentPack, tag::s3, std::string
-   >::type s3 = args[_s3
-       **|| boost::bind(std::plus<std::string>(), boost::ref(s1), boost::ref(s2))** ];
+   >::type s3 = args[_s3 **|| bind(std::plus<std::string>(), ref(s1), ref(s2))** ];
 
 .. @example.prepend('''
    #include <boost/bind.hpp>

doc/python.rst

@@ -2,13 +2,13 @@
  The Boost Parameter Library Python Binding Documentation 
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-:Authors:       David Abrahams, Daniel Wallin
-:Contact:       dave@boost-consulting.com, daniel@boostpro.com
-:organization:  `BoostPro Computing`_
+:Authors:       Daniel Wallin
+:Contact:       dalwan01@student.umu.se
+:organization:  `Boost Consulting`_
 :date:          $Date$
 
 :copyright:     Copyright David Abrahams, Daniel Wallin
-                2005-2009. Distributed under the Boost Software License,
+                2005. 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)
 
@@ -22,7 +22,7 @@
 
 __ ../../../../index.htm
 
-.. _`BoostPro Computing`: http://www.boostpro.com
+.. _`Boost Consulting`: http://www.boost-consulting.com
 
 
 .. role:: class

doc/reference.rst

@@ -3,12 +3,12 @@
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 :Authors:       David Abrahams, Daniel Wallin
-:Contact:       dave@boost-consulting.com, daniel@boostpro.com
-:organization:  `BoostPro Computing`_
+:Contact:       dave@boost-consulting.com, dalwan01@student.umu.se
+:organization:  `Boost Consulting`_
 :date:          $Date: 2005/07/17 19:53:01 $
 
 :copyright:     Copyright David Abrahams, Daniel Wallin
-                2005-2009. Distributed under the Boost Software License,
+                2005. 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)
 
@@ -19,7 +19,7 @@
 
 __ ../../../../index.htm
 
-.. _`BoostPro Computing`: http://www.boostpro.com
+.. _`Boost Consulting`: http://www.boost-consulting.com
 
 
 //////////////////////////////////////////////////////////////////////////////

include/boost/parameter/aux_/arg_list.hpp

@@ -11,7 +11,7 @@
 #include <boost/parameter/aux_/default.hpp>
 #include <boost/parameter/aux_/parameter_requirements.hpp>
 #include <boost/parameter/aux_/yesno.hpp>
-#include <boost/parameter/aux_/is_maybe.hpp>
+#include <boost/parameter/aux_/maybe.hpp>
 #include <boost/parameter/config.hpp>
 
 #include <boost/mpl/apply.hpp>
@@ -22,11 +22,11 @@
 
 #include <boost/type_traits/add_reference.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include <boost/type_traits/is_base_and_derived.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/facilities/intercept.hpp>
 
-namespace boost { namespace parameter {
+namespace boost { namespace parameter { 
 
 // Forward declaration for aux::arg_list, below.
 template<class T> struct keyword;
@@ -46,7 +46,7 @@ struct lambda_tag;
 // declarations to build member function overload sets that can
 // match against keywords.
 //
-
+  
 // MPL sequence support
 struct arg_list_tag;
 
@@ -83,14 +83,14 @@ struct empty_arg_list
     template <class KW>
     static no_tag has_key(KW*);
 #endif
-
+    
 #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
     || (BOOST_WORKAROUND(__GNUC__, < 3)) \
     || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
-
+    
     // The overload set technique doesn't work with these older
     // compilers, so they need some explicit handholding.
-
+      
     // A metafunction class that, given a keyword, returns the type
     // of the base sublist whose get() function can produce the
     // value for that key
@@ -159,6 +159,11 @@ no_tag operator*(empty_arg_list, KW*);
 template <class KW, class T>
 struct tagged_argument;
 
+template <class T>
+struct is_maybe
+  : is_base_and_derived<maybe_base, T>
+{};
+
 template <class T>
 struct get_reference
 {
@@ -206,9 +211,9 @@ struct arg_list : Next
     // Create a new list by prepending arg to a copy of tail.  Used
     // when incrementally building this structure with the comma
     // operator.
-    arg_list(TaggedArg head, Next const& tail)
+    arg_list(TaggedArg arg, Next const& tail)
       : Next(tail)
-      , arg(head)
+      , arg(arg)
     {}
 
     // A metafunction class that, given a keyword and a default
@@ -236,8 +241,8 @@ struct arg_list : Next
     // same keyword is used again
     static yes_tag has_key(key_type*);
     using Next::has_key;
-
-#  define BOOST_PARAMETER_CALL_HAS_KEY(next, key) next::has_key((key*)0)
+    
+#  define BOOST_PARAMETER_CALL_HAS_KEY(next, key) next::has_key((key*)0)  
 # endif
 
     BOOST_MPL_ASSERT_MSG(
@@ -252,7 +257,7 @@ struct arg_list : Next
     // specific arguments by name
     //
 
-    // Helpers that handle the case when TaggedArg is
+    // Helpers that handle the case when TaggedArg is 
     // empty<T>.
     template <class D>
     reference get_default(D const&, mpl::false_) const
@@ -332,7 +337,7 @@ struct arg_list : Next
     template <class Default>
     reference get(default_<key_type,Default> const& d) const
     {
-        return get_default(d, holds_maybe());
+        return get_default(d, holds_maybe());        
     }
 
     template <class Default>
@@ -340,7 +345,7 @@ struct arg_list : Next
     {
         return arg.value;
     }
-
+    
 #else
 
     reference operator[](keyword<key_type> const&) const
@@ -395,7 +400,7 @@ struct arg_list : Next
     // Comma operator to compose argument list without using parameters<>.
     // Useful for argument lists with undetermined length.
     template <class KW, class T2>
-    arg_list<tagged_argument<KW, T2>, self>
+    arg_list<tagged_argument<KW, T2>, self> 
     operator,(tagged_argument<KW,T2> x) const
     {
         return arg_list<tagged_argument<KW,T2>, self>(x, *this);
@@ -409,7 +414,7 @@ struct arg_list : Next
 
 #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)  // ETI workaround
 template <> struct arg_list<int,int> {};
-#endif
+#endif 
 
 // MPL sequence support
 template <class ArgumentPack>
@@ -419,7 +424,7 @@ struct arg_list_iterator
 
     // The incremented iterator
     typedef arg_list_iterator<typename ArgumentPack::tail_type> next;
-
+    
     // dereferencing yields the key type
     typedef typename ArgumentPack::key_type type;
 };

include/boost/parameter/aux_/is_maybe.hpp

@@ -1,26 +0,0 @@
-// Copyright Daniel Wallin, David Abrahams 2010. Use, modification and
-// distribution is subject to 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_PARAMETER_IS_MAYBE_050329_HPP
-#define BOOST_PARAMETER_IS_MAYBE_050329_HPP
-
-#include <boost/type_traits/is_base_and_derived.hpp>
-
-namespace boost {
-namespace parameter {
-namespace aux {
-
-struct maybe_base {};
-
-template <class T>
-struct is_maybe
-  : is_base_and_derived<maybe_base, T>
-{};
-
-} // namespace aux
-} // namespace parameter
-} // namespace boost
-
-#endif // BOOST_PARAMETER_IS_MAYBE_050329_HPP

include/boost/parameter/aux_/maybe.hpp

@@ -2,41 +2,21 @@
 // subject to 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)
 
-//
-// 2009.10.21 TDS remove depenency on boost::python::detail::referent_storage
-//
-#ifndef BOOST_PARAMETER_MAYBE_091021_HPP
-# define BOOST_PARAMETER_MAYBE_091021_HPP
+#ifndef BOOST_PARAMETER_MAYBE_060211_HPP
+# define BOOST_PARAMETER_MAYBE_060211_HPP
 
 # include <boost/mpl/if.hpp>
 # include <boost/mpl/identity.hpp>
 # include <boost/type_traits/is_reference.hpp>
 # include <boost/type_traits/add_reference.hpp>
 # include <boost/optional.hpp>
-# include <boost/aligned_storage.hpp>
+# include <boost/python/detail/referent_storage.hpp>
 # include <boost/type_traits/remove_cv.hpp>
 # include <boost/type_traits/add_const.hpp>
-# include <boost/parameter/aux_/is_maybe.hpp>
 
 namespace boost { namespace parameter { namespace aux {
 
-template <class T> struct referent_size;
-
-template <class T>
-struct referent_size<T&>
-{
-  BOOST_STATIC_CONSTANT(std::size_t, value = sizeof(T));
-};
-
-// A metafunction returning a POD type which can store U, where T ==
-// U&. If T is not a reference type, returns a POD which can store T.
-template <class T>
-struct referent_storage
-{
-  typedef typename boost::aligned_storage<
-    referent_size<T>::value
-    >::type type;
-};
+struct maybe_base {};
 
 template <class T>
 struct maybe : maybe_base
@@ -44,17 +24,17 @@ struct maybe : maybe_base
     typedef typename add_reference<
 # if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
         T const
-# else
+# else 
         typename add_const<T>::type
-# endif
+# endif 
     >::type reference;
-
+    
     typedef typename remove_cv<
         BOOST_DEDUCED_TYPENAME remove_reference<reference>::type
     >::type non_cv_value;
-
-    explicit maybe(T value_)
-      : value(value_)
+        
+    explicit maybe(T value)
+      : value(value)
       , constructed(false)
     {}
 
@@ -68,28 +48,28 @@ struct maybe : maybe_base
             this->destroy();
     }
 
-    reference construct(reference value_) const
+    reference construct(reference value) const
     {
-        return value_;
+        return value;
     }
 
     template <class U>
-    reference construct2(U const& value_) const
+    reference construct2(U const& value) const
     {
-        new (m_storage.address()) non_cv_value(value_);
+        new (m_storage.bytes) non_cv_value(value);
         constructed = true;
-        return *(non_cv_value*)m_storage.address();
+        return *(non_cv_value*)m_storage.bytes;
     }
 
     template <class U>
-    reference construct(U const& value_) const
+    reference construct(U const& value) const
     {
-        return this->construct2(value_);
+        return this->construct2(value);
     }
 
     void destroy()
     {
-        ((non_cv_value*)m_storage.address())->~non_cv_value();
+        ((non_cv_value*)m_storage.bytes)->~non_cv_value();
     }
 
     typedef reference(maybe<T>::*safe_bool)() const;
@@ -107,9 +87,7 @@ struct maybe : maybe_base
 private:
     boost::optional<T> value;
     mutable bool constructed;
-
-
-    mutable typename referent_storage<
+    mutable typename boost::python::detail::referent_storage<
         reference
     >::type m_storage;
 };

include/boost/parameter/preprocessor.hpp

@@ -14,9 +14,7 @@
 # include <boost/parameter/aux_/preprocessor/flatten.hpp>
 
 # include <boost/preprocessor/repetition/repeat_from_to.hpp>
-# include <boost/preprocessor/comparison/equal.hpp>
 # include <boost/preprocessor/control/if.hpp>
-# include <boost/preprocessor/control/iif.hpp>
 # include <boost/preprocessor/control/expr_if.hpp>
 # include <boost/preprocessor/repetition/enum_params.hpp>
 # include <boost/preprocessor/repetition/enum_binary_params.hpp>
@@ -25,12 +23,9 @@
 # include <boost/preprocessor/seq/for_each_product.hpp>
 # include <boost/preprocessor/seq/for_each_i.hpp> 
 # include <boost/preprocessor/tuple/elem.hpp> 
-# include <boost/preprocessor/tuple/eat.hpp>
 # include <boost/preprocessor/seq/fold_left.hpp>
-# include <boost/preprocessor/seq/push_back.hpp>
 # include <boost/preprocessor/seq/size.hpp>
 # include <boost/preprocessor/seq/enum.hpp>
-# include <boost/preprocessor/seq/push_back.hpp>
 
 # include <boost/preprocessor/detail/is_nullary.hpp>
 
@@ -363,7 +358,7 @@ struct funptr_predicate<void**>
 #  define BOOST_PARAMETER_FUNCTION_FWD_MATCH_Z(z, name, parameters, n) \
     , typename boost::parameter::aux::match< \
           parameters, BOOST_PP_ENUM_PARAMS(n, ParameterArgumentType) \
-      >::type = parameters()
+      >::type boost_parameter_enabler_argument = parameters()
 # else
 #  define BOOST_PARAMETER_FUNCTION_FWD_MATCH_Z(z, name, parameters, n)
 # endif