mirror of
https://github.com/boostorg/python.git
synced 2026-01-20 16:52:15 +00:00
these changes follow. r44807 is a merge from another branch; many of those changes probably don't apply. ------------------------------------------------------------------------ r43423 | danieljames | 2008-02-27 14:22:01 -0500 (Wed, 27 Feb 2008) | 1 line Fix incorrect links to copyright of the form 'http:#www.boost.org ------------------------------------------------------------------------ r43546 | rwgk | 2008-03-08 23:30:13 -0500 (Sat, 08 Mar 2008) | 1 line map std::invalid_argument -> Python ValueError ------------------------------------------------------------------------ r43799 | grafik | 2008-03-22 18:53:35 -0400 (Sat, 22 Mar 2008) | 1 line Remove svn exec property from files that should not be executable to fix permission problems in archives. ------------------------------------------------------------------------ r43845 | dave | 2008-03-24 14:27:22 -0400 (Mon, 24 Mar 2008) | 1 line Work around vc9 bugs ------------------------------------------------------------------------ r43901 | bemandawes | 2008-03-27 22:11:13 -0400 (Thu, 27 Mar 2008) | 1 line Remove per email from Dave ------------------------------------------------------------------------ r44041 | rwgk | 2008-04-04 14:57:27 -0400 (Fri, 04 Apr 2008) | 1 line bogus VC8 warning C4180 disabled ------------------------------------------------------------------------ r44449 | djowel | 2008-04-15 23:07:06 -0400 (Tue, 15 Apr 2008) | 1 line Andreas patch ------------------------------------------------------------------------ r44450 | djowel | 2008-04-15 23:07:11 -0400 (Tue, 15 Apr 2008) | 1 line Andreas indexing suite patch ------------------------------------------------------------------------ r44807 | danieljames | 2008-04-27 03:39:49 -0400 (Sun, 27 Apr 2008) | 78 lines Merge in documentation fixes. Apart from the change to optional's documenation Jamfile, which I included by mistake. Fixes #1659, #1661, #1684, #1685, 1687, #1690, #1801 I wrote about this at: http://lists.boost.org/Archives/boost/2008/04/136405.php Merged revisions 44585-44806 via svnmerge from https://svn.boost.org/svn/boost/branches/doc ........ r44585 | danieljames | 2008-04-19 16:25:27 +0100 (Sat, 19 Apr 2008) | 2 lines Fix broken link to vacpp in bjam docs. Refs #1512 ........ r44586 | danieljames | 2008-04-19 16:27:36 +0100 (Sat, 19 Apr 2008) | 2 lines Fix broken link to bcpp in bjam docs. Refs #1513 ........ r44587 | danieljames | 2008-04-19 16:33:58 +0100 (Sat, 19 Apr 2008) | 2 lines DateTime documentation - Fix a link to the serialization library. Refs #1659 ........ r44588 | danieljames | 2008-04-19 16:35:36 +0100 (Sat, 19 Apr 2008) | 2 lines Fix some links in interprocess & intrusive. Refs #1661 ........ r44589 | danieljames | 2008-04-19 16:37:39 +0100 (Sat, 19 Apr 2008) | 2 lines Fix some links in the python docs. Refs #1684. ........ r44590 | danieljames | 2008-04-19 16:38:29 +0100 (Sat, 19 Apr 2008) | 2 lines Work around a quickbook bug which is affecting the python docs. Refs #1684. ........ r44591 | danieljames | 2008-04-19 16:39:34 +0100 (Sat, 19 Apr 2008) | 2 lines Fix a broken link in the numeric conversion docs. Refs #1685 ........ r44592 | danieljames | 2008-04-19 16:40:45 +0100 (Sat, 19 Apr 2008) | 2 lines Fix some links in the optional docs. Refs #1687 ........ r44593 | danieljames | 2008-04-19 16:42:09 +0100 (Sat, 19 Apr 2008) | 2 lines Fix link to the hash documentation from bimap. Refs #1690 ........ r44599 | danieljames | 2008-04-19 18:07:33 +0100 (Sat, 19 Apr 2008) | 2 lines Fix a typo in the format library. Refs #1801 ........ r44600 | danieljames | 2008-04-19 19:20:59 +0100 (Sat, 19 Apr 2008) | 1 line Initialise svnmerge. ........ r44641 | danieljames | 2008-04-20 18:59:47 +0100 (Sun, 20 Apr 2008) | 2 lines Fix the lincense url in shared container iterator documentation. ........ r44642 | danieljames | 2008-04-20 19:00:00 +0100 (Sun, 20 Apr 2008) | 2 lines Fix image link in the mpi documentation. ........ r44643 | danieljames | 2008-04-20 19:00:11 +0100 (Sun, 20 Apr 2008) | 2 lines Fix a typo in the spirit docs. ........ r44644 | danieljames | 2008-04-20 19:00:23 +0100 (Sun, 20 Apr 2008) | 2 lines Escape the slash so that quickbook doesn't think it the start of an italic section, and mess up the link. Refs #1844 ........ r44647 | danieljames | 2008-04-20 19:39:47 +0100 (Sun, 20 Apr 2008) | 2 lines Fix another typo in spirit docs. ........ ------------------------------------------------------------------------ r45283 | danieljames | 2008-05-11 09:49:20 -0400 (Sun, 11 May 2008) | 1 line Quote href values - our tools don't support unquoted values. ------------------------------------------------------------------------ r45359 | rwgk | 2008-05-14 15:38:08 -0400 (Wed, 14 May 2008) | 1 line braces added to resolve g++ 4.3.0 warning ------------------------------------------------------------------------ r45918 | rwgk | 2008-05-29 15:48:55 -0400 (Thu, 29 May 2008) | 66 lines See Python C++-SIG thread: "object.attr(object& attrname) proposal" Started 2008-05-25 by hohehohe2@gmail.com. Excerpts: If char const* is passed to objecjt.attr(), it uses PyObject_GetAttrStrng() or PyObject_SetAttrStrng(). If object is passed to objecjt.attr(), it takes the object as a Python string object and uses PyObject_GetAttr() or PyObject_SetAttr(). If attr() behaves like this, it can be useful when there are lots of objects which you know have the same attribute name. You can save time by first making a boost::python::object and passing it to every object's attr() inside a loop. I just made a bit of modification to boost:python locally and did a quick test, like test 1: for(int i = 0; i < n; ++i) { omain.attr(attrname) = 444; //attrname is a char const* } test 2: for(int i = 0; i < n; ++i) { object o = omain.attr(attrname); //attrname is a char const* } test 3: for(int i = 0; i < n; ++i) { omain.attr(oaaaa) = 444; //oaaaa is boost::python::object that represents a string } test 4: for(int i = 0; i < n; ++i) { object o = omain.attr(oaaaa); //oaaaa is boost::python::object that represents a string } and it reasonably reflected the difference between PyObject_*Attr() and PyObject_*AttrString. test 1 :2783ms test 2 :2357ms test 3 :1882ms test 4 :1267ms test5: PyObject_SetAttrString(po_main, "aaaa", po_num444); test6: Py_DECREF(PyObject_GetAttrString(po_main, "aaaa")); test7: PyObject_SetAttr(po_main, po_aaaa, po_num444); test8: Py_DECREF(PyObject_GetAttr(po_main, po_aaaa)); (po_ prefixed variables are PyObject*), all inside each for loop, and the results were test 5 :2410ms test 6 :2277ms test 7 :1629ms test 8 :1094ms It's boost 1.35.0, Python 2.5 on linux(gcc4.1.2). I also did the same test on windows(vs8) and the tendency was not so different. ------------------------------------------------------------------------ r45920 | rwgk | 2008-05-29 16:04:19 -0400 (Thu, 29 May 2008) | 1 line Projects using Boost.Python: PolyBoRi (text provided by Michael Brickenstein) ------------------------------------------------------------------------ r46115 | schoepflin | 2008-06-04 11:11:05 -0400 (Wed, 04 Jun 2008) | 1 line Added missing ostream header file. ------------------------------------------------------------------------ r46445 | dgregor | 2008-06-17 09:54:46 -0400 (Tue, 17 Jun 2008) | 1 line Add mime-type and eol-style properties as needed ------------------------------------------------------------------------ r46721 | dave | 2008-06-26 12:41:34 -0400 (Thu, 26 Jun 2008) | 2 lines Compatibility with Apache STDCXX library. Don't assume eh.h comes along with the other headers automatically. ------------------------------------------------------------------------ r46808 | bemandawes | 2008-06-28 09:45:21 -0400 (Sat, 28 Jun 2008) | 1 line With his kind permission, change Jaakko "J<LATIN SMALL LETTER A WITH DIARESIS>rvi" to "Jarvi" ------------------------------------------------------------------------ r46817 | djowel | 2008-06-28 14:24:17 -0400 (Sat, 28 Jun 2008) | 1 line added note on removing targets ------------------------------------------------------------------------ r46844 | dave | 2008-06-29 08:26:17 -0400 (Sun, 29 Jun 2008) | 2 lines Make valid HTML ------------------------------------------------------------------------ [SVN r47459]
138 lines
4.3 KiB
C++
138 lines
4.3 KiB
C++
// Copyright David Abrahams 2002.
|
|
// 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)
|
|
#ifndef ITERATOR_DWA2002512_HPP
|
|
# define ITERATOR_DWA2002512_HPP
|
|
|
|
# include <boost/python/detail/prefix.hpp>
|
|
|
|
# include <boost/python/detail/target.hpp>
|
|
# include <boost/python/object/iterator.hpp>
|
|
# include <boost/python/object_core.hpp>
|
|
|
|
# include <boost/type_traits/cv_traits.hpp>
|
|
# include <boost/type_traits/transform_traits.hpp>
|
|
|
|
# if defined(BOOST_MSVC) && (BOOST_MSVC == 1400) /*
|
|
> warning C4180: qualifier applied to function type has no meaning; ignored
|
|
Peter Dimov wrote:
|
|
This warning is caused by an overload resolution bug in VC8 that cannot be
|
|
worked around and will probably not be fixed by MS in the VC8 line. The
|
|
problematic overload is only instantiated and never called, and the code
|
|
works correctly. */
|
|
# pragma warning(disable: 4180)
|
|
# endif
|
|
|
|
# include <boost/bind.hpp>
|
|
# include <boost/bind/protect.hpp>
|
|
|
|
namespace boost { namespace python {
|
|
|
|
namespace detail
|
|
{
|
|
// Adds an additional layer of binding to
|
|
// objects::make_iterator(...), which allows us to pass member
|
|
// function and member data pointers.
|
|
template <class Target, class Accessor1, class Accessor2, class NextPolicies>
|
|
inline object make_iterator(
|
|
Accessor1 get_start
|
|
, Accessor2 get_finish
|
|
, NextPolicies next_policies
|
|
, Target&(*)()
|
|
)
|
|
{
|
|
return objects::make_iterator_function<Target>(
|
|
boost::protect(boost::bind(get_start, _1))
|
|
, boost::protect(boost::bind(get_finish, _1))
|
|
, next_policies
|
|
);
|
|
}
|
|
|
|
// Guts of template class iterators<>, below.
|
|
template <bool const_ = false>
|
|
struct iterators_impl
|
|
{
|
|
template <class T>
|
|
struct apply
|
|
{
|
|
typedef typename T::iterator iterator;
|
|
static iterator begin(T& x) { return x.begin(); }
|
|
static iterator end(T& x) { return x.end(); }
|
|
};
|
|
};
|
|
|
|
template <>
|
|
struct iterators_impl<true>
|
|
{
|
|
template <class T>
|
|
struct apply
|
|
{
|
|
typedef typename T::const_iterator iterator;
|
|
static iterator begin(T& x) { return x.begin(); }
|
|
static iterator end(T& x) { return x.end(); }
|
|
};
|
|
};
|
|
}
|
|
|
|
// An "ordinary function generator" which contains static begin(x) and
|
|
// end(x) functions that invoke T::begin() and T::end(), respectively.
|
|
template <class T>
|
|
struct iterators
|
|
: detail::iterators_impl<
|
|
boost::is_const<T>::value
|
|
>::template apply<T>
|
|
{
|
|
};
|
|
|
|
// Create an iterator-building function which uses the given
|
|
// accessors. Deduce the Target type from the accessors. The iterator
|
|
// returns copies of the inderlying elements.
|
|
template <class Accessor1, class Accessor2>
|
|
object range(Accessor1 start, Accessor2 finish)
|
|
{
|
|
return detail::make_iterator(
|
|
start, finish
|
|
, objects::default_iterator_call_policies()
|
|
, detail::target(start)
|
|
);
|
|
}
|
|
|
|
// Create an iterator-building function which uses the given accessors
|
|
// and next() policies. Deduce the Target type.
|
|
template <class NextPolicies, class Accessor1, class Accessor2>
|
|
object range(Accessor1 start, Accessor2 finish, NextPolicies* = 0)
|
|
{
|
|
return detail::make_iterator(start, finish, NextPolicies(), detail::target(start));
|
|
}
|
|
|
|
// Create an iterator-building function which uses the given accessors
|
|
// and next() policies, operating on the given Target type
|
|
template <class NextPolicies, class Target, class Accessor1, class Accessor2>
|
|
object range(Accessor1 start, Accessor2 finish, NextPolicies* = 0, boost::type<Target>* = 0)
|
|
{
|
|
// typedef typename add_reference<Target>::type target;
|
|
return detail::make_iterator(start, finish, NextPolicies(), (Target&(*)())0);
|
|
}
|
|
|
|
// A Python callable object which produces an iterator traversing
|
|
// [x.begin(), x.end()), where x is an instance of the Container
|
|
// type. NextPolicies are used as the CallPolicies for the iterator's
|
|
// next() function.
|
|
template <class Container
|
|
, class NextPolicies = objects::default_iterator_call_policies>
|
|
struct iterator : object
|
|
{
|
|
iterator()
|
|
: object(
|
|
python::range<NextPolicies>(
|
|
&iterators<Container>::begin, &iterators<Container>::end
|
|
))
|
|
{
|
|
}
|
|
};
|
|
|
|
}} // namespace boost::python
|
|
|
|
#endif // ITERATOR_DWA2002512_HPP
|