boost/python
2
0
Fork 0
mirror of https://github.com/boostorg/python.git synced 2026-01-20 04:42:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge changes from HEAD to:

Browse Source 
Throw an IndexError when given an extended slice;
Clip bounds of slices in a mannar consistant with builtin containers;
Prevent undefined behavior within the STL when given certain kinds of
empty slices.


[SVN r22539]
This commit is contained in:
Jonathan Brandmeyer
2004-03-22 01:57:09 +00:00
parent ccc17a791a
commit 486fff38c2
2 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
include/boost/python/suite/indexing/detail/indexing_suite_detail.hpp
View File

@@ -570,15 +570,40 @@ namespace boost { namespace python { namespace detail {
base_get_slice_data(
Container& container, PySliceObject* slice, Index& from, Index& to)
{
if (Py_None != slice->step) {
PyErr_SetString( PyExc_IndexError, "slice step size not supported.");
throw_error_already_set();
}
Index min_index = DerivedPolicies::get_min_index(container);
Index max_index = DerivedPolicies::get_max_index(container);
if (Py_None == slice->start)
from = DerivedPolicies::get_min_index(container);
else
from = DerivedPolicies::convert_index(container, slice->start);
from = min_index;
else {
from = extract<long>( slice->start);
if (from < 0) // Negative slice index
from += max_index;
if (from < 0) // Clip lower bounds to zero
from = 0;
if (from > max_index) // Clip upper bounds to max_index.
from = max_index;
}
if (Py_None == slice->stop)
to = DerivedPolicies::get_max_index(container);
else
to = DerivedPolicies::convert_index(container, slice->stop);
else {
to = extract<long>( slice->stop);
if (to < 0)
to += max_index;
if (to < 0)
to = 0;
if (to > max_index)
to = max_index;
}
}
static void

24
include/boost/python/suite/indexing/vector_indexing_suite.hpp
View File

@@ -81,6 +81,8 @@ namespace boost { namespace python {
static object
get_slice(Container& container, index_type from, index_type to)
{
if (from > to)
return object(Container());
return object(Container(container.begin()+from, container.begin()+to));
}
@@ -94,8 +96,13 @@ namespace boost { namespace python {
set_slice(Container& container, index_type from,
index_type to, data_type const& v)
{
container.erase(container.begin()+from, container.begin()+to);
container.insert(container.begin()+from, v);
if (from > to) {
return;
}
else {
container.erase(container.begin()+from, container.begin()+to);
container.insert(container.begin()+from, v);
}
}
template <class Iter>
@@ -103,8 +110,13 @@ namespace boost { namespace python {
set_slice(Container& container, index_type from,
index_type to, Iter first, Iter last)
{
container.erase(container.begin()+from, container.begin()+to);
container.insert(container.begin()+from, first, last);
if (from > to) {
container.insert(container.begin()+from, first, last);
}
else {
container.erase(container.begin()+from, container.begin()+to);
container.insert(container.begin()+from, first, last);
}
}
static void
@@ -116,6 +128,10 @@ namespace boost { namespace python {
static void
delete_slice(Container& container, index_type from, index_type to)
{
if (from > to) {
// A null-op.
return;
}
container.erase(container.begin()+from, container.begin()+to);
}