cpython/Objects/abstract.c

1575 lines
29 KiB
C
Raw Normal View History

1995-07-18 14:12:02 +00:00
/***********************************************************
2000-06-30 23:50:40 +00:00
Copyright (c) 2000, BeOpen.com.
Copyright (c) 1995-2000, Corporation for National Research Initiatives.
Copyright (c) 1990-1995, Stichting Mathematisch Centrum.
All rights reserved.
See the file "Misc/COPYRIGHT" for information on usage and
redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
1995-07-18 14:12:02 +00:00
******************************************************************/
/* Abstract Object Interface (many thanks to Jim Fulton) */
1995-07-18 14:12:02 +00:00
#include "Python.h"
#include <ctype.h>
1995-07-18 14:12:02 +00:00
/* Shorthands to return certain errors */
1995-07-18 14:12:02 +00:00
static PyObject *
type_error(msg)
char *msg;
1995-07-18 14:12:02 +00:00
{
PyErr_SetString(PyExc_TypeError, msg);
return NULL;
1995-07-18 14:12:02 +00:00
}
static PyObject *
null_error()
1995-07-18 14:12:02 +00:00
{
if (!PyErr_Occurred())
PyErr_SetString(PyExc_SystemError,
"null argument to internal routine");
return NULL;
1995-07-18 14:12:02 +00:00
}
/* Operations on any object */
1995-07-18 14:12:02 +00:00
int
PyObject_Cmp(o1, o2, result)
PyObject *o1;
PyObject *o2;
int *result;
1995-07-18 14:12:02 +00:00
{
int r;
if (o1 == NULL || o2 == NULL) {
null_error();
return -1;
1995-07-18 14:12:02 +00:00
}
r = PyObject_Compare(o1, o2);
if (PyErr_Occurred())
return -1;
*result = r;
1995-07-18 14:12:02 +00:00
return 0;
}
PyObject *
1995-09-18 21:17:59 +00:00
PyObject_Type(o)
PyObject *o;
1995-07-18 14:12:02 +00:00
{
PyObject *v;
if (o == NULL)
return null_error();
1995-07-18 14:12:02 +00:00
v = (PyObject *)o->ob_type;
Py_INCREF(v);
return v;
}
int
1995-09-18 21:17:59 +00:00
PyObject_Length(o)
PyObject *o;
1995-07-18 14:12:02 +00:00
{
PySequenceMethods *m;
1995-07-18 14:12:02 +00:00
if (o == NULL) {
null_error();
return -1;
}
1995-07-18 14:12:02 +00:00
m = o->ob_type->tp_as_sequence;
if (m && m->sq_length)
return m->sq_length(o);
1995-07-18 14:12:02 +00:00
return PyMapping_Length(o);
1995-07-18 14:12:02 +00:00
}
PyObject *
1995-09-18 21:17:59 +00:00
PyObject_GetItem(o, key)
PyObject *o;
PyObject *key;
1995-07-18 14:12:02 +00:00
{
PyMappingMethods *m;
1995-07-18 14:12:02 +00:00
if (o == NULL || key == NULL)
return null_error();
1995-07-18 14:12:02 +00:00
m = o->ob_type->tp_as_mapping;
if (m && m->mp_subscript)
return m->mp_subscript(o, key);
1995-07-18 14:12:02 +00:00
if (o->ob_type->tp_as_sequence) {
if (PyInt_Check(key))
return PySequence_GetItem(o, PyInt_AsLong(key));
else if (PyLong_Check(key)) {
long key_value = PyLong_AsLong(key);
if (key_value == -1 && PyErr_Occurred())
return NULL;
return PySequence_GetItem(o, key_value);
}
return type_error("sequence index must be integer");
}
return type_error("unsubscriptable object");
1995-07-18 14:12:02 +00:00
}
int
1995-09-18 21:17:59 +00:00
PyObject_SetItem(o, key, value)
PyObject *o;
PyObject *key;
PyObject *value;
1995-07-18 14:12:02 +00:00
{
PyMappingMethods *m;
1995-07-18 14:12:02 +00:00
if (o == NULL || key == NULL || value == NULL) {
null_error();
return -1;
}
m = o->ob_type->tp_as_mapping;
if (m && m->mp_ass_subscript)
return m->mp_ass_subscript(o, key, value);
if (o->ob_type->tp_as_sequence) {
if (PyInt_Check(key))
return PySequence_SetItem(o, PyInt_AsLong(key), value);
else if (PyLong_Check(key)) {
long key_value = PyLong_AsLong(key);
if (key_value == -1 && PyErr_Occurred())
return -1;
return PySequence_SetItem(o, key_value, value);
}
type_error("sequence index must be integer");
return -1;
}
1995-07-18 14:12:02 +00:00
type_error("object does not support item assignment");
return -1;
1995-07-18 14:12:02 +00:00
}
int
PyObject_DelItem(o, key)
PyObject *o;
PyObject *key;
{
PyMappingMethods *m;
if (o == NULL || key == NULL) {
null_error();
return -1;
}
m = o->ob_type->tp_as_mapping;
if (m && m->mp_ass_subscript)
return m->mp_ass_subscript(o, key, (PyObject*)NULL);
if (o->ob_type->tp_as_sequence) {
if (PyInt_Check(key))
return PySequence_DelItem(o, PyInt_AsLong(key));
else if (PyLong_Check(key)) {
long key_value = PyLong_AsLong(key);
if (key_value == -1 && PyErr_Occurred())
return -1;
return PySequence_DelItem(o, key_value);
}
type_error("sequence index must be integer");
return -1;
}
type_error("object does not support item deletion");
return -1;
}
int PyObject_AsCharBuffer(PyObject *obj,
const char **buffer,
int *buffer_len)
{
PyBufferProcs *pb;
const char *pp;
int len;
if (obj == NULL || buffer == NULL || buffer_len == NULL) {
null_error();
return -1;
}
pb = obj->ob_type->tp_as_buffer;
if ( pb == NULL ||
pb->bf_getcharbuffer == NULL ||
pb->bf_getsegcount == NULL ) {
PyErr_SetString(PyExc_TypeError,
"expected a character buffer object");
goto onError;
}
if ( (*pb->bf_getsegcount)(obj,NULL) != 1 ) {
PyErr_SetString(PyExc_TypeError,
"expected a single-segment buffer object");
goto onError;
}
len = (*pb->bf_getcharbuffer)(obj,0,&pp);
if (len < 0)
goto onError;
*buffer = pp;
*buffer_len = len;
return 0;
onError:
return -1;
}
int PyObject_AsReadBuffer(PyObject *obj,
const void **buffer,
int *buffer_len)
{
PyBufferProcs *pb;
void *pp;
int len;
if (obj == NULL || buffer == NULL || buffer_len == NULL) {
null_error();
return -1;
}
pb = obj->ob_type->tp_as_buffer;
if ( pb == NULL ||
pb->bf_getreadbuffer == NULL ||
pb->bf_getsegcount == NULL ) {
PyErr_SetString(PyExc_TypeError,
"expected a readable buffer object");
goto onError;
}
if ( (*pb->bf_getsegcount)(obj,NULL) != 1 ) {
PyErr_SetString(PyExc_TypeError,
"expected a single-segment buffer object");
goto onError;
}
len = (*pb->bf_getreadbuffer)(obj,0,&pp);
if (len < 0)
goto onError;
*buffer = pp;
*buffer_len = len;
return 0;
onError:
return -1;
}
int PyObject_AsWriteBuffer(PyObject *obj,
void **buffer,
int *buffer_len)
{
PyBufferProcs *pb;
void*pp;
int len;
if (obj == NULL || buffer == NULL || buffer_len == NULL) {
null_error();
return -1;
}
pb = obj->ob_type->tp_as_buffer;
if ( pb == NULL ||
pb->bf_getwritebuffer == NULL ||
pb->bf_getsegcount == NULL ) {
PyErr_SetString(PyExc_TypeError,
"expected a writeable buffer object");
goto onError;
}
if ( (*pb->bf_getsegcount)(obj,NULL) != 1 ) {
PyErr_SetString(PyExc_TypeError,
"expected a single-segment buffer object");
goto onError;
}
len = (*pb->bf_getwritebuffer)(obj,0,&pp);
if (len < 0)
goto onError;
*buffer = pp;
*buffer_len = len;
return 0;
onError:
return -1;
}
/* Operations on numbers */
int
1995-09-18 21:17:59 +00:00
PyNumber_Check(o)
PyObject *o;
1995-07-18 14:12:02 +00:00
{
return o && o->ob_type->tp_as_number;
1995-07-18 14:12:02 +00:00
}
/* Binary operators */
1995-07-18 14:12:02 +00:00
#define BINOP(v, w, opname, ropname, thisfunc) \
if (PyInstance_Check(v) || PyInstance_Check(w)) \
1995-07-18 14:12:02 +00:00
return PyInstance_DoBinOp(v, w, opname, ropname, thisfunc)
PyObject *
PyNumber_Or(v, w)
PyObject *v, *w;
{
extern int PyNumber_Coerce();
BINOP(v, w, "__or__", "__ror__", PyNumber_Or);
1995-07-18 14:12:02 +00:00
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
1995-07-18 14:12:02 +00:00
PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
if ((f = v->ob_type->tp_as_number->nb_or) != NULL)
x = (*f)(v, w);
Py_DECREF(v);
Py_DECREF(w);
if (f != NULL)
return x;
}
return type_error("bad operand type(s) for |");
1995-07-18 14:12:02 +00:00
}
PyObject *
PyNumber_Xor(v, w)
PyObject *v, *w;
{
extern int PyNumber_Coerce();
BINOP(v, w, "__xor__", "__rxor__", PyNumber_Xor);
1995-07-18 14:12:02 +00:00
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
1995-07-18 14:12:02 +00:00
PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
if ((f = v->ob_type->tp_as_number->nb_xor) != NULL)
x = (*f)(v, w);
Py_DECREF(v);
Py_DECREF(w);
if (f != NULL)
return x;
}
return type_error("bad operand type(s) for ^");
1995-07-18 14:12:02 +00:00
}
PyObject *
PyNumber_And(v, w)
PyObject *v, *w;
{
BINOP(v, w, "__and__", "__rand__", PyNumber_And);
1995-07-18 14:12:02 +00:00
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
1995-07-18 14:12:02 +00:00
PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
if ((f = v->ob_type->tp_as_number->nb_and) != NULL)
x = (*f)(v, w);
Py_DECREF(v);
Py_DECREF(w);
if (f != NULL)
return x;
}
return type_error("bad operand type(s) for &");
1995-07-18 14:12:02 +00:00
}
PyObject *
PyNumber_Lshift(v, w)
PyObject *v, *w;
{
BINOP(v, w, "__lshift__", "__rlshift__", PyNumber_Lshift);
1995-07-18 14:12:02 +00:00
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
1995-07-18 14:12:02 +00:00
PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
if ((f = v->ob_type->tp_as_number->nb_lshift) != NULL)
x = (*f)(v, w);
Py_DECREF(v);
Py_DECREF(w);
if (f != NULL)
return x;
}
return type_error("bad operand type(s) for <<");
1995-07-18 14:12:02 +00:00
}
PyObject *
PyNumber_Rshift(v, w)
PyObject *v, *w;
{
BINOP(v, w, "__rshift__", "__rrshift__", PyNumber_Rshift);
1995-07-18 14:12:02 +00:00
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
1995-07-18 14:12:02 +00:00
PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
if ((f = v->ob_type->tp_as_number->nb_rshift) != NULL)
x = (*f)(v, w);
Py_DECREF(v);
Py_DECREF(w);
if (f != NULL)
return x;
}
return type_error("bad operand type(s) for >>");
1995-07-18 14:12:02 +00:00
}
PyObject *
PyNumber_Add(v, w)
PyObject *v, *w;
{
PySequenceMethods *m;
BINOP(v, w, "__add__", "__radd__", PyNumber_Add);
m = v->ob_type->tp_as_sequence;
if (m && m->sq_concat)
return (*m->sq_concat)(v, w);
1995-07-18 14:12:02 +00:00
else if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
1995-07-18 14:12:02 +00:00
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
if ((f = v->ob_type->tp_as_number->nb_add) != NULL)
x = (*f)(v, w);
1995-07-18 14:12:02 +00:00
Py_DECREF(v);
Py_DECREF(w);
if (f != NULL)
return x;
1995-07-18 14:12:02 +00:00
}
return type_error("bad operand type(s) for +");
1995-07-18 14:12:02 +00:00
}
PyObject *
PyNumber_Subtract(v, w)
PyObject *v, *w;
{
BINOP(v, w, "__sub__", "__rsub__", PyNumber_Subtract);
1995-07-18 14:12:02 +00:00
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
1995-07-18 14:12:02 +00:00
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
if ((f = v->ob_type->tp_as_number->nb_subtract) != NULL)
x = (*f)(v, w);
1995-07-18 14:12:02 +00:00
Py_DECREF(v);
Py_DECREF(w);
if (f != NULL)
return x;
1995-07-18 14:12:02 +00:00
}
return type_error("bad operand type(s) for -");
1995-07-18 14:12:02 +00:00
}
PyObject *
PyNumber_Multiply(v, w)
PyObject *v, *w;
{
PyTypeObject *tp = v->ob_type;
PySequenceMethods *m;
BINOP(v, w, "__mul__", "__rmul__", PyNumber_Multiply);
1995-07-18 14:12:02 +00:00
if (tp->tp_as_number != NULL &&
w->ob_type->tp_as_sequence != NULL &&
!PyInstance_Check(v)) {
/* number*sequence -- swap v and w */
PyObject *tmp = v;
v = w;
w = tmp;
tp = v->ob_type;
}
if (tp->tp_as_number != NULL) {
PyObject *x = NULL;
PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
1995-07-18 14:12:02 +00:00
if (PyInstance_Check(v)) {
/* Instances of user-defined classes get their
other argument uncoerced, so they may
implement sequence*number as well as
number*number. */
Py_INCREF(v);
Py_INCREF(w);
}
else if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
if ((f = v->ob_type->tp_as_number->nb_multiply) != NULL)
x = (*f)(v, w);
1995-07-18 14:12:02 +00:00
Py_DECREF(v);
Py_DECREF(w);
if (f != NULL)
return x;
1995-07-18 14:12:02 +00:00
}
m = tp->tp_as_sequence;
if (m && m->sq_repeat) {
long mul_value;
if (PyInt_Check(w)) {
mul_value = PyInt_AsLong(w);
}
else if (PyLong_Check(w)) {
mul_value = PyLong_AsLong(w);
if (mul_value == -1 && PyErr_Occurred())
return NULL;
}
else {
return type_error(
1995-07-18 14:12:02 +00:00
"can't multiply sequence with non-int");
}
return (*m->sq_repeat)(v, (int)mul_value);
1995-07-18 14:12:02 +00:00
}
return type_error("bad operand type(s) for *");
1995-07-18 14:12:02 +00:00
}
PyObject *
PyNumber_Divide(v, w)
PyObject *v, *w;
{
BINOP(v, w, "__div__", "__rdiv__", PyNumber_Divide);
1995-07-18 14:12:02 +00:00
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
1995-07-18 14:12:02 +00:00
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
if ((f = v->ob_type->tp_as_number->nb_divide) != NULL)
x = (*f)(v, w);
1995-07-18 14:12:02 +00:00
Py_DECREF(v);
Py_DECREF(w);
if (f != NULL)
return x;
1995-07-18 14:12:02 +00:00
}
return type_error("bad operand type(s) for /");
1995-07-18 14:12:02 +00:00
}
PyObject *
PyNumber_Remainder(v, w)
PyObject *v, *w;
{
if (PyString_Check(v))
1995-07-18 14:12:02 +00:00
return PyString_Format(v, w);
else if (PyUnicode_Check(v))
return PyUnicode_Format(v, w);
BINOP(v, w, "__mod__", "__rmod__", PyNumber_Remainder);
1995-07-18 14:12:02 +00:00
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
1995-07-18 14:12:02 +00:00
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
if ((f = v->ob_type->tp_as_number->nb_remainder) != NULL)
x = (*f)(v, w);
1995-07-18 14:12:02 +00:00
Py_DECREF(v);
Py_DECREF(w);
if (f != NULL)
return x;
1995-07-18 14:12:02 +00:00
}
return type_error("bad operand type(s) for %");
1995-07-18 14:12:02 +00:00
}
PyObject *
PyNumber_Divmod(v, w)
PyObject *v, *w;
{
BINOP(v, w, "__divmod__", "__rdivmod__", PyNumber_Divmod);
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
if ((f = v->ob_type->tp_as_number->nb_divmod) != NULL)
x = (*f)(v, w);
Py_DECREF(v);
Py_DECREF(w);
if (f != NULL)
return x;
1995-07-18 14:12:02 +00:00
}
return type_error("bad operand type(s) for divmod()");
1995-07-18 14:12:02 +00:00
}
/* Power (binary or ternary) */
1995-07-18 14:12:02 +00:00
static PyObject *
do_pow(v, w)
PyObject *v, *w;
{
PyObject *res;
PyObject * (*f) Py_FPROTO((PyObject *, PyObject *, PyObject *));
BINOP(v, w, "__pow__", "__rpow__", do_pow);
1995-07-18 14:12:02 +00:00
if (v->ob_type->tp_as_number == NULL ||
w->ob_type->tp_as_number == NULL) {
PyErr_SetString(PyExc_TypeError,
"pow(x, y) requires numeric arguments");
1995-07-18 14:12:02 +00:00
return NULL;
}
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
if ((f = v->ob_type->tp_as_number->nb_power) != NULL)
res = (*f)(v, w, Py_None);
else
res = type_error("pow(x, y) not defined for these operands");
1995-07-18 14:12:02 +00:00
Py_DECREF(v);
Py_DECREF(w);
return res;
}
PyObject *
PyNumber_Power(v, w, z)
1995-07-18 14:12:02 +00:00
PyObject *v, *w, *z;
{
PyObject *res;
PyObject *v1, *z1, *w2, *z2;
PyObject * (*f) Py_FPROTO((PyObject *, PyObject *, PyObject *));
1995-07-18 14:12:02 +00:00
if (z == Py_None)
return do_pow(v, w);
/* XXX The ternary version doesn't do class instance coercions */
if (PyInstance_Check(v))
return v->ob_type->tp_as_number->nb_power(v, w, z);
if (v->ob_type->tp_as_number == NULL ||
z->ob_type->tp_as_number == NULL ||
w->ob_type->tp_as_number == NULL) {
return type_error("pow(x, y, z) requires numeric arguments");
1995-07-18 14:12:02 +00:00
}
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
res = NULL;
v1 = v;
z1 = z;
if (PyNumber_Coerce(&v1, &z1) != 0)
goto error2;
w2 = w;
z2 = z1;
if (PyNumber_Coerce(&w2, &z2) != 0)
goto error1;
if ((f = v1->ob_type->tp_as_number->nb_power) != NULL)
res = (*f)(v1, w2, z2);
else
res = type_error(
"pow(x, y, z) not defined for these operands");
1995-07-18 14:12:02 +00:00
Py_DECREF(w2);
Py_DECREF(z2);
error1:
1995-07-18 14:12:02 +00:00
Py_DECREF(v1);
Py_DECREF(z1);
error2:
1995-07-18 14:12:02 +00:00
Py_DECREF(v);
Py_DECREF(w);
return res;
}
/* Unary operators and functions */
1995-07-18 14:12:02 +00:00
PyObject *
PyNumber_Negative(o)
PyObject *o;
1995-07-18 14:12:02 +00:00
{
PyNumberMethods *m;
if (o == NULL)
return null_error();
m = o->ob_type->tp_as_number;
if (m && m->nb_negative)
return (*m->nb_negative)(o);
return type_error("bad operand type for unary -");
1995-07-18 14:12:02 +00:00
}
PyObject *
PyNumber_Positive(o)
PyObject *o;
1995-07-18 14:12:02 +00:00
{
PyNumberMethods *m;
if (o == NULL)
return null_error();
m = o->ob_type->tp_as_number;
if (m && m->nb_positive)
return (*m->nb_positive)(o);
return type_error("bad operand type for unary +");
1995-07-18 14:12:02 +00:00
}
PyObject *
PyNumber_Invert(o)
PyObject *o;
1995-07-18 14:12:02 +00:00
{
PyNumberMethods *m;
if (o == NULL)
return null_error();
m = o->ob_type->tp_as_number;
if (m && m->nb_invert)
return (*m->nb_invert)(o);
return type_error("bad operand type for unary ~");
1995-07-18 14:12:02 +00:00
}
PyObject *
1995-09-18 21:17:59 +00:00
PyNumber_Absolute(o)
PyObject *o;
1995-07-18 14:12:02 +00:00
{
PyNumberMethods *m;
1995-07-18 14:12:02 +00:00
if (o == NULL)
return null_error();
m = o->ob_type->tp_as_number;
if (m && m->nb_absolute)
return m->nb_absolute(o);
1995-07-18 14:12:02 +00:00
return type_error("bad operand type for abs()");
1995-07-18 14:12:02 +00:00
}
Marc-Andre's third try at this bulk patch seems to work (except that his copy of test_contains.py seems to be broken -- the lines he deleted were already absent). Checkin messages: New Unicode support for int(), float(), complex() and long(). - new APIs PyInt_FromUnicode() and PyLong_FromUnicode() - added support for Unicode to PyFloat_FromString() - new encoding API PyUnicode_EncodeDecimal() which converts Unicode to a decimal char* string (used in the above new APIs) - shortcuts for calls like int(<int object>) and float(<float obj>) - tests for all of the above Unicode compares and contains checks: - comparing Unicode and non-string types now works; TypeErrors are masked, all other errors such as ValueError during Unicode coercion are passed through (note that PyUnicode_Compare does not implement the masking -- PyObject_Compare does this) - contains now works for non-string types too; TypeErrors are masked and 0 returned; all other errors are passed through Better testing support for the standard codecs. Misc minor enhancements, such as an alias dbcs for the mbcs codec. Changes: - PyLong_FromString() now applies the same error checks as does PyInt_FromString(): trailing garbage is reported as error and not longer silently ignored. The only characters which may be trailing the digits are 'L' and 'l' -- these are still silently ignored. - string.ato?() now directly interface to int(), long() and float(). The error strings are now a little different, but the type still remains the same. These functions are now ready to get declared obsolete ;-) - PyNumber_Int() now also does a check for embedded NULL chars in the input string; PyNumber_Long() already did this (and still does) Followed by: Looks like I've gone a step too far there... (and test_contains.py seem to have a bug too). I've changed back to reporting all errors in PyUnicode_Contains() and added a few more test cases to test_contains.py (plus corrected the join() NameError).
2000-04-05 20:11:21 +00:00
/* Add a check for embedded NULL-bytes in the argument. */
static PyObject *
int_from_string(s, len)
const char *s;
int len;
{
char *end;
PyObject *x;
x = PyInt_FromString((char*)s, &end, 10);
if (x == NULL)
return NULL;
if (end != s + len) {
PyErr_SetString(PyExc_ValueError,
"null byte in argument for int()");
Py_DECREF(x);
return NULL;
}
return x;
}
1995-07-18 14:12:02 +00:00
PyObject *
1995-09-18 21:17:59 +00:00
PyNumber_Int(o)
PyObject *o;
1995-07-18 14:12:02 +00:00
{
PyNumberMethods *m;
const char *buffer;
int buffer_len;
1995-07-18 14:12:02 +00:00
if (o == NULL)
return null_error();
Marc-Andre's third try at this bulk patch seems to work (except that his copy of test_contains.py seems to be broken -- the lines he deleted were already absent). Checkin messages: New Unicode support for int(), float(), complex() and long(). - new APIs PyInt_FromUnicode() and PyLong_FromUnicode() - added support for Unicode to PyFloat_FromString() - new encoding API PyUnicode_EncodeDecimal() which converts Unicode to a decimal char* string (used in the above new APIs) - shortcuts for calls like int(<int object>) and float(<float obj>) - tests for all of the above Unicode compares and contains checks: - comparing Unicode and non-string types now works; TypeErrors are masked, all other errors such as ValueError during Unicode coercion are passed through (note that PyUnicode_Compare does not implement the masking -- PyObject_Compare does this) - contains now works for non-string types too; TypeErrors are masked and 0 returned; all other errors are passed through Better testing support for the standard codecs. Misc minor enhancements, such as an alias dbcs for the mbcs codec. Changes: - PyLong_FromString() now applies the same error checks as does PyInt_FromString(): trailing garbage is reported as error and not longer silently ignored. The only characters which may be trailing the digits are 'L' and 'l' -- these are still silently ignored. - string.ato?() now directly interface to int(), long() and float(). The error strings are now a little different, but the type still remains the same. These functions are now ready to get declared obsolete ;-) - PyNumber_Int() now also does a check for embedded NULL chars in the input string; PyNumber_Long() already did this (and still does) Followed by: Looks like I've gone a step too far there... (and test_contains.py seem to have a bug too). I've changed back to reporting all errors in PyUnicode_Contains() and added a few more test cases to test_contains.py (plus corrected the join() NameError).
2000-04-05 20:11:21 +00:00
if (PyInt_Check(o)) {
Py_INCREF(o);
return o;
}
if (PyString_Check(o))
Marc-Andre's third try at this bulk patch seems to work (except that his copy of test_contains.py seems to be broken -- the lines he deleted were already absent). Checkin messages: New Unicode support for int(), float(), complex() and long(). - new APIs PyInt_FromUnicode() and PyLong_FromUnicode() - added support for Unicode to PyFloat_FromString() - new encoding API PyUnicode_EncodeDecimal() which converts Unicode to a decimal char* string (used in the above new APIs) - shortcuts for calls like int(<int object>) and float(<float obj>) - tests for all of the above Unicode compares and contains checks: - comparing Unicode and non-string types now works; TypeErrors are masked, all other errors such as ValueError during Unicode coercion are passed through (note that PyUnicode_Compare does not implement the masking -- PyObject_Compare does this) - contains now works for non-string types too; TypeErrors are masked and 0 returned; all other errors are passed through Better testing support for the standard codecs. Misc minor enhancements, such as an alias dbcs for the mbcs codec. Changes: - PyLong_FromString() now applies the same error checks as does PyInt_FromString(): trailing garbage is reported as error and not longer silently ignored. The only characters which may be trailing the digits are 'L' and 'l' -- these are still silently ignored. - string.ato?() now directly interface to int(), long() and float(). The error strings are now a little different, but the type still remains the same. These functions are now ready to get declared obsolete ;-) - PyNumber_Int() now also does a check for embedded NULL chars in the input string; PyNumber_Long() already did this (and still does) Followed by: Looks like I've gone a step too far there... (and test_contains.py seem to have a bug too). I've changed back to reporting all errors in PyUnicode_Contains() and added a few more test cases to test_contains.py (plus corrected the join() NameError).
2000-04-05 20:11:21 +00:00
return int_from_string(PyString_AS_STRING(o),
PyString_GET_SIZE(o));
if (PyUnicode_Check(o))
return PyInt_FromUnicode(PyUnicode_AS_UNICODE(o),
PyUnicode_GET_SIZE(o),
10);
m = o->ob_type->tp_as_number;
if (m && m->nb_int)
return m->nb_int(o);
if (!PyObject_AsCharBuffer(o, &buffer, &buffer_len))
Marc-Andre's third try at this bulk patch seems to work (except that his copy of test_contains.py seems to be broken -- the lines he deleted were already absent). Checkin messages: New Unicode support for int(), float(), complex() and long(). - new APIs PyInt_FromUnicode() and PyLong_FromUnicode() - added support for Unicode to PyFloat_FromString() - new encoding API PyUnicode_EncodeDecimal() which converts Unicode to a decimal char* string (used in the above new APIs) - shortcuts for calls like int(<int object>) and float(<float obj>) - tests for all of the above Unicode compares and contains checks: - comparing Unicode and non-string types now works; TypeErrors are masked, all other errors such as ValueError during Unicode coercion are passed through (note that PyUnicode_Compare does not implement the masking -- PyObject_Compare does this) - contains now works for non-string types too; TypeErrors are masked and 0 returned; all other errors are passed through Better testing support for the standard codecs. Misc minor enhancements, such as an alias dbcs for the mbcs codec. Changes: - PyLong_FromString() now applies the same error checks as does PyInt_FromString(): trailing garbage is reported as error and not longer silently ignored. The only characters which may be trailing the digits are 'L' and 'l' -- these are still silently ignored. - string.ato?() now directly interface to int(), long() and float(). The error strings are now a little different, but the type still remains the same. These functions are now ready to get declared obsolete ;-) - PyNumber_Int() now also does a check for embedded NULL chars in the input string; PyNumber_Long() already did this (and still does) Followed by: Looks like I've gone a step too far there... (and test_contains.py seem to have a bug too). I've changed back to reporting all errors in PyUnicode_Contains() and added a few more test cases to test_contains.py (plus corrected the join() NameError).
2000-04-05 20:11:21 +00:00
return int_from_string((char*)buffer, buffer_len);
1995-07-18 14:12:02 +00:00
return type_error("object can't be converted to int");
1995-07-18 14:12:02 +00:00
}
Marc-Andre's third try at this bulk patch seems to work (except that his copy of test_contains.py seems to be broken -- the lines he deleted were already absent). Checkin messages: New Unicode support for int(), float(), complex() and long(). - new APIs PyInt_FromUnicode() and PyLong_FromUnicode() - added support for Unicode to PyFloat_FromString() - new encoding API PyUnicode_EncodeDecimal() which converts Unicode to a decimal char* string (used in the above new APIs) - shortcuts for calls like int(<int object>) and float(<float obj>) - tests for all of the above Unicode compares and contains checks: - comparing Unicode and non-string types now works; TypeErrors are masked, all other errors such as ValueError during Unicode coercion are passed through (note that PyUnicode_Compare does not implement the masking -- PyObject_Compare does this) - contains now works for non-string types too; TypeErrors are masked and 0 returned; all other errors are passed through Better testing support for the standard codecs. Misc minor enhancements, such as an alias dbcs for the mbcs codec. Changes: - PyLong_FromString() now applies the same error checks as does PyInt_FromString(): trailing garbage is reported as error and not longer silently ignored. The only characters which may be trailing the digits are 'L' and 'l' -- these are still silently ignored. - string.ato?() now directly interface to int(), long() and float(). The error strings are now a little different, but the type still remains the same. These functions are now ready to get declared obsolete ;-) - PyNumber_Int() now also does a check for embedded NULL chars in the input string; PyNumber_Long() already did this (and still does) Followed by: Looks like I've gone a step too far there... (and test_contains.py seem to have a bug too). I've changed back to reporting all errors in PyUnicode_Contains() and added a few more test cases to test_contains.py (plus corrected the join() NameError).
2000-04-05 20:11:21 +00:00
/* Add a check for embedded NULL-bytes in the argument. */
static PyObject *
long_from_string(s, len)
const char *s;
int len;
{
char *end;
PyObject *x;
x = PyLong_FromString((char*)s, &end, 10);
Marc-Andre's third try at this bulk patch seems to work (except that his copy of test_contains.py seems to be broken -- the lines he deleted were already absent). Checkin messages: New Unicode support for int(), float(), complex() and long(). - new APIs PyInt_FromUnicode() and PyLong_FromUnicode() - added support for Unicode to PyFloat_FromString() - new encoding API PyUnicode_EncodeDecimal() which converts Unicode to a decimal char* string (used in the above new APIs) - shortcuts for calls like int(<int object>) and float(<float obj>) - tests for all of the above Unicode compares and contains checks: - comparing Unicode and non-string types now works; TypeErrors are masked, all other errors such as ValueError during Unicode coercion are passed through (note that PyUnicode_Compare does not implement the masking -- PyObject_Compare does this) - contains now works for non-string types too; TypeErrors are masked and 0 returned; all other errors are passed through Better testing support for the standard codecs. Misc minor enhancements, such as an alias dbcs for the mbcs codec. Changes: - PyLong_FromString() now applies the same error checks as does PyInt_FromString(): trailing garbage is reported as error and not longer silently ignored. The only characters which may be trailing the digits are 'L' and 'l' -- these are still silently ignored. - string.ato?() now directly interface to int(), long() and float(). The error strings are now a little different, but the type still remains the same. These functions are now ready to get declared obsolete ;-) - PyNumber_Int() now also does a check for embedded NULL chars in the input string; PyNumber_Long() already did this (and still does) Followed by: Looks like I've gone a step too far there... (and test_contains.py seem to have a bug too). I've changed back to reporting all errors in PyUnicode_Contains() and added a few more test cases to test_contains.py (plus corrected the join() NameError).
2000-04-05 20:11:21 +00:00
if (x == NULL)
return NULL;
Marc-Andre's third try at this bulk patch seems to work (except that his copy of test_contains.py seems to be broken -- the lines he deleted were already absent). Checkin messages: New Unicode support for int(), float(), complex() and long(). - new APIs PyInt_FromUnicode() and PyLong_FromUnicode() - added support for Unicode to PyFloat_FromString() - new encoding API PyUnicode_EncodeDecimal() which converts Unicode to a decimal char* string (used in the above new APIs) - shortcuts for calls like int(<int object>) and float(<float obj>) - tests for all of the above Unicode compares and contains checks: - comparing Unicode and non-string types now works; TypeErrors are masked, all other errors such as ValueError during Unicode coercion are passed through (note that PyUnicode_Compare does not implement the masking -- PyObject_Compare does this) - contains now works for non-string types too; TypeErrors are masked and 0 returned; all other errors are passed through Better testing support for the standard codecs. Misc minor enhancements, such as an alias dbcs for the mbcs codec. Changes: - PyLong_FromString() now applies the same error checks as does PyInt_FromString(): trailing garbage is reported as error and not longer silently ignored. The only characters which may be trailing the digits are 'L' and 'l' -- these are still silently ignored. - string.ato?() now directly interface to int(), long() and float(). The error strings are now a little different, but the type still remains the same. These functions are now ready to get declared obsolete ;-) - PyNumber_Int() now also does a check for embedded NULL chars in the input string; PyNumber_Long() already did this (and still does) Followed by: Looks like I've gone a step too far there... (and test_contains.py seem to have a bug too). I've changed back to reporting all errors in PyUnicode_Contains() and added a few more test cases to test_contains.py (plus corrected the join() NameError).
2000-04-05 20:11:21 +00:00
if (end != s + len) {
PyErr_SetString(PyExc_ValueError,
"null byte in argument for long()");
Marc-Andre's third try at this bulk patch seems to work (except that his copy of test_contains.py seems to be broken -- the lines he deleted were already absent). Checkin messages: New Unicode support for int(), float(), complex() and long(). - new APIs PyInt_FromUnicode() and PyLong_FromUnicode() - added support for Unicode to PyFloat_FromString() - new encoding API PyUnicode_EncodeDecimal() which converts Unicode to a decimal char* string (used in the above new APIs) - shortcuts for calls like int(<int object>) and float(<float obj>) - tests for all of the above Unicode compares and contains checks: - comparing Unicode and non-string types now works; TypeErrors are masked, all other errors such as ValueError during Unicode coercion are passed through (note that PyUnicode_Compare does not implement the masking -- PyObject_Compare does this) - contains now works for non-string types too; TypeErrors are masked and 0 returned; all other errors are passed through Better testing support for the standard codecs. Misc minor enhancements, such as an alias dbcs for the mbcs codec. Changes: - PyLong_FromString() now applies the same error checks as does PyInt_FromString(): trailing garbage is reported as error and not longer silently ignored. The only characters which may be trailing the digits are 'L' and 'l' -- these are still silently ignored. - string.ato?() now directly interface to int(), long() and float(). The error strings are now a little different, but the type still remains the same. These functions are now ready to get declared obsolete ;-) - PyNumber_Int() now also does a check for embedded NULL chars in the input string; PyNumber_Long() already did this (and still does) Followed by: Looks like I've gone a step too far there... (and test_contains.py seem to have a bug too). I've changed back to reporting all errors in PyUnicode_Contains() and added a few more test cases to test_contains.py (plus corrected the join() NameError).
2000-04-05 20:11:21 +00:00
Py_DECREF(x);
return NULL;
}
return x;
}
1995-07-18 14:12:02 +00:00
PyObject *
1995-09-18 21:17:59 +00:00
PyNumber_Long(o)
PyObject *o;
1995-07-18 14:12:02 +00:00
{
PyNumberMethods *m;
const char *buffer;
int buffer_len;
1995-07-18 14:12:02 +00:00
if (o == NULL)
return null_error();
Marc-Andre's third try at this bulk patch seems to work (except that his copy of test_contains.py seems to be broken -- the lines he deleted were already absent). Checkin messages: New Unicode support for int(), float(), complex() and long(). - new APIs PyInt_FromUnicode() and PyLong_FromUnicode() - added support for Unicode to PyFloat_FromString() - new encoding API PyUnicode_EncodeDecimal() which converts Unicode to a decimal char* string (used in the above new APIs) - shortcuts for calls like int(<int object>) and float(<float obj>) - tests for all of the above Unicode compares and contains checks: - comparing Unicode and non-string types now works; TypeErrors are masked, all other errors such as ValueError during Unicode coercion are passed through (note that PyUnicode_Compare does not implement the masking -- PyObject_Compare does this) - contains now works for non-string types too; TypeErrors are masked and 0 returned; all other errors are passed through Better testing support for the standard codecs. Misc minor enhancements, such as an alias dbcs for the mbcs codec. Changes: - PyLong_FromString() now applies the same error checks as does PyInt_FromString(): trailing garbage is reported as error and not longer silently ignored. The only characters which may be trailing the digits are 'L' and 'l' -- these are still silently ignored. - string.ato?() now directly interface to int(), long() and float(). The error strings are now a little different, but the type still remains the same. These functions are now ready to get declared obsolete ;-) - PyNumber_Int() now also does a check for embedded NULL chars in the input string; PyNumber_Long() already did this (and still does) Followed by: Looks like I've gone a step too far there... (and test_contains.py seem to have a bug too). I've changed back to reporting all errors in PyUnicode_Contains() and added a few more test cases to test_contains.py (plus corrected the join() NameError).
2000-04-05 20:11:21 +00:00
if (PyLong_Check(o)) {
Py_INCREF(o);
return o;
}
if (PyString_Check(o))
/* need to do extra error checking that PyLong_FromString()
* doesn't do. In particular long('9.5') must raise an
* exception, not truncate the float.
*/
return long_from_string(PyString_AS_STRING(o),
PyString_GET_SIZE(o));
Marc-Andre's third try at this bulk patch seems to work (except that his copy of test_contains.py seems to be broken -- the lines he deleted were already absent). Checkin messages: New Unicode support for int(), float(), complex() and long(). - new APIs PyInt_FromUnicode() and PyLong_FromUnicode() - added support for Unicode to PyFloat_FromString() - new encoding API PyUnicode_EncodeDecimal() which converts Unicode to a decimal char* string (used in the above new APIs) - shortcuts for calls like int(<int object>) and float(<float obj>) - tests for all of the above Unicode compares and contains checks: - comparing Unicode and non-string types now works; TypeErrors are masked, all other errors such as ValueError during Unicode coercion are passed through (note that PyUnicode_Compare does not implement the masking -- PyObject_Compare does this) - contains now works for non-string types too; TypeErrors are masked and 0 returned; all other errors are passed through Better testing support for the standard codecs. Misc minor enhancements, such as an alias dbcs for the mbcs codec. Changes: - PyLong_FromString() now applies the same error checks as does PyInt_FromString(): trailing garbage is reported as error and not longer silently ignored. The only characters which may be trailing the digits are 'L' and 'l' -- these are still silently ignored. - string.ato?() now directly interface to int(), long() and float(). The error strings are now a little different, but the type still remains the same. These functions are now ready to get declared obsolete ;-) - PyNumber_Int() now also does a check for embedded NULL chars in the input string; PyNumber_Long() already did this (and still does) Followed by: Looks like I've gone a step too far there... (and test_contains.py seem to have a bug too). I've changed back to reporting all errors in PyUnicode_Contains() and added a few more test cases to test_contains.py (plus corrected the join() NameError).
2000-04-05 20:11:21 +00:00
if (PyUnicode_Check(o))
/* The above check is done in PyLong_FromUnicode(). */
return PyLong_FromUnicode(PyUnicode_AS_UNICODE(o),
PyUnicode_GET_SIZE(o),
10);
m = o->ob_type->tp_as_number;
if (m && m->nb_long)
return m->nb_long(o);
if (!PyObject_AsCharBuffer(o, &buffer, &buffer_len))
return long_from_string(buffer, buffer_len);
1995-07-18 14:12:02 +00:00
return type_error("object can't be converted to long");
1995-07-18 14:12:02 +00:00
}
PyObject *
1995-09-18 21:17:59 +00:00
PyNumber_Float(o)
PyObject *o;
1995-07-18 14:12:02 +00:00
{
PyNumberMethods *m;
1995-07-18 14:12:02 +00:00
if (o == NULL)
return null_error();
Marc-Andre's third try at this bulk patch seems to work (except that his copy of test_contains.py seems to be broken -- the lines he deleted were already absent). Checkin messages: New Unicode support for int(), float(), complex() and long(). - new APIs PyInt_FromUnicode() and PyLong_FromUnicode() - added support for Unicode to PyFloat_FromString() - new encoding API PyUnicode_EncodeDecimal() which converts Unicode to a decimal char* string (used in the above new APIs) - shortcuts for calls like int(<int object>) and float(<float obj>) - tests for all of the above Unicode compares and contains checks: - comparing Unicode and non-string types now works; TypeErrors are masked, all other errors such as ValueError during Unicode coercion are passed through (note that PyUnicode_Compare does not implement the masking -- PyObject_Compare does this) - contains now works for non-string types too; TypeErrors are masked and 0 returned; all other errors are passed through Better testing support for the standard codecs. Misc minor enhancements, such as an alias dbcs for the mbcs codec. Changes: - PyLong_FromString() now applies the same error checks as does PyInt_FromString(): trailing garbage is reported as error and not longer silently ignored. The only characters which may be trailing the digits are 'L' and 'l' -- these are still silently ignored. - string.ato?() now directly interface to int(), long() and float(). The error strings are now a little different, but the type still remains the same. These functions are now ready to get declared obsolete ;-) - PyNumber_Int() now also does a check for embedded NULL chars in the input string; PyNumber_Long() already did this (and still does) Followed by: Looks like I've gone a step too far there... (and test_contains.py seem to have a bug too). I've changed back to reporting all errors in PyUnicode_Contains() and added a few more test cases to test_contains.py (plus corrected the join() NameError).
2000-04-05 20:11:21 +00:00
if (PyFloat_Check(o)) {
Py_INCREF(o);
return o;
}
if (!PyString_Check(o)) {
m = o->ob_type->tp_as_number;
if (m && m->nb_float)
return m->nb_float(o);
}
return PyFloat_FromString(o, NULL);
1995-07-18 14:12:02 +00:00
}
/* Operations on sequences */
1995-07-18 14:12:02 +00:00
int
PySequence_Check(s)
PyObject *s;
1995-07-18 14:12:02 +00:00
{
return s != NULL && s->ob_type->tp_as_sequence;
1995-07-18 14:12:02 +00:00
}
int
1995-09-18 21:17:59 +00:00
PySequence_Length(s)
PyObject *s;
1995-07-18 14:12:02 +00:00
{
PySequenceMethods *m;
1995-07-18 14:12:02 +00:00
if (s == NULL) {
null_error();
return -1;
}
1995-07-18 14:12:02 +00:00
m = s->ob_type->tp_as_sequence;
if (m && m->sq_length)
return m->sq_length(s);
1995-07-18 14:12:02 +00:00
type_error("len() of unsized object");
return -1;
1995-07-18 14:12:02 +00:00
}
PyObject *
1995-09-18 21:17:59 +00:00
PySequence_Concat(s, o)
PyObject *s;
PyObject *o;
1995-07-18 14:12:02 +00:00
{
PySequenceMethods *m;
if (s == NULL || o == NULL)
return null_error();
1995-07-18 14:12:02 +00:00
m = s->ob_type->tp_as_sequence;
if (m && m->sq_concat)
return m->sq_concat(s, o);
1995-07-18 14:12:02 +00:00
return type_error("object can't be concatenated");
1995-07-18 14:12:02 +00:00
}
PyObject *
1995-09-18 21:17:59 +00:00
PySequence_Repeat(o, count)
PyObject *o;
int count;
1995-07-18 14:12:02 +00:00
{
PySequenceMethods *m;
1995-07-18 14:12:02 +00:00
if (o == NULL)
return null_error();
1995-07-18 14:12:02 +00:00
m = o->ob_type->tp_as_sequence;
if (m && m->sq_repeat)
return m->sq_repeat(o, count);
return type_error("object can't be repeated");
1995-07-18 14:12:02 +00:00
}
PyObject *
1995-09-18 21:17:59 +00:00
PySequence_GetItem(s, i)
PyObject *s;
int i;
1995-07-18 14:12:02 +00:00
{
PySequenceMethods *m;
if (s == NULL)
return null_error();
m = s->ob_type->tp_as_sequence;
if (m && m->sq_item) {
if (i < 0) {
if (m->sq_length) {
int l = (*m->sq_length)(s);
if (l < 0)
return NULL;
i += l;
}
}
return m->sq_item(s, i);
}
1995-07-18 14:12:02 +00:00
return type_error("unindexable object");
1995-07-18 14:12:02 +00:00
}
PyObject *
1995-09-18 21:17:59 +00:00
PySequence_GetSlice(s, i1, i2)
PyObject *s;
int i1;
int i2;
1995-07-18 14:12:02 +00:00
{
PySequenceMethods *m;
if (!s) return null_error();
m = s->ob_type->tp_as_sequence;
if (m && m->sq_slice) {
if (i1 < 0 || i2 < 0) {
if (m->sq_length) {
int l = (*m->sq_length)(s);
if (l < 0)
return NULL;
if (i1 < 0)
i1 += l;
if (i2 < 0)
i2 += l;
}
}
return m->sq_slice(s, i1, i2);
}
1997-04-02 05:31:09 +00:00
return type_error("unsliceable object");
1995-07-18 14:12:02 +00:00
}
int
1995-09-18 21:17:59 +00:00
PySequence_SetItem(s, i, o)
PyObject *s;
int i;
PyObject *o;
1995-07-18 14:12:02 +00:00
{
PySequenceMethods *m;
if (s == NULL) {
null_error();
return -1;
}
m = s->ob_type->tp_as_sequence;
if (m && m->sq_ass_item) {
if (i < 0) {
if (m->sq_length) {
int l = (*m->sq_length)(s);
if (l < 0)
return -1;
i += l;
}
}
return m->sq_ass_item(s, i, o);
}
type_error("object doesn't support item assignment");
return -1;
1995-07-18 14:12:02 +00:00
}
int
PySequence_DelItem(s, i)
PyObject *s;
int i;
{
PySequenceMethods *m;
if (s == NULL) {
null_error();
return -1;
}
m = s->ob_type->tp_as_sequence;
if (m && m->sq_ass_item) {
if (i < 0) {
if (m->sq_length) {
int l = (*m->sq_length)(s);
if (l < 0)
return -1;
i += l;
}
}
return m->sq_ass_item(s, i, (PyObject *)NULL);
}
type_error("object doesn't support item deletion");
return -1;
}
int
1995-09-18 21:17:59 +00:00
PySequence_SetSlice(s, i1, i2, o)
PyObject *s;
int i1;
int i2;
PyObject *o;
1995-07-18 14:12:02 +00:00
{
PySequenceMethods *m;
1995-07-18 14:12:02 +00:00
if (s == NULL) {
null_error();
return -1;
}
1995-07-18 14:12:02 +00:00
m = s->ob_type->tp_as_sequence;
if (m && m->sq_ass_slice) {
if (i1 < 0 || i2 < 0) {
if (m->sq_length) {
int l = (*m->sq_length)(s);
if (l < 0)
return -1;
if (i1 < 0)
i1 += l;
if (i2 < 0)
i2 += l;
}
}
return m->sq_ass_slice(s, i1, i2, o);
}
type_error("object doesn't support slice assignment");
return -1;
1995-07-18 14:12:02 +00:00
}
int
PySequence_DelSlice(s, i1, i2)
PyObject *s;
int i1;
int i2;
{
PySequenceMethods *m;
if (s == NULL) {
null_error();
return -1;
}
m = s->ob_type->tp_as_sequence;
if (m && m->sq_ass_slice) {
if (i1 < 0 || i2 < 0) {
if (m->sq_length) {
int l = (*m->sq_length)(s);
if (l < 0)
return -1;
if (i1 < 0)
i1 += l;
if (i2 < 0)
i2 += l;
}
}
return m->sq_ass_slice(s, i1, i2, (PyObject *)NULL);
}
type_error("object doesn't support slice deletion");
return -1;
}
1995-07-18 14:12:02 +00:00
PyObject *
PySequence_Tuple(v)
PyObject *v;
1995-07-18 14:12:02 +00:00
{
PySequenceMethods *m;
1995-07-18 14:12:02 +00:00
if (v == NULL)
return null_error();
1995-07-18 14:12:02 +00:00
if (PyTuple_Check(v)) {
Py_INCREF(v);
return v;
}
if (PyList_Check(v))
return PyList_AsTuple(v);
/* There used to be code for strings here, but tuplifying strings is
not a common activity, so I nuked it. Down with code bloat! */
1995-07-18 14:12:02 +00:00
/* Generic sequence object */
m = v->ob_type->tp_as_sequence;
if (m && m->sq_item) {
int i;
PyObject *t;
int n = PySequence_Length(v);
if (n < 0)
return NULL;
t = PyTuple_New(n);
if (t == NULL)
return NULL;
for (i = 0; ; i++) {
PyObject *item = (*m->sq_item)(v, i);
if (item == NULL) {
if (PyErr_ExceptionMatches(PyExc_IndexError))
PyErr_Clear();
else {
Py_DECREF(t);
t = NULL;
}
break;
}
if (i >= n) {
if (n < 500)
n += 10;
else
n += 100;
if (_PyTuple_Resize(&t, n, 0) != 0)
break;
}
PyTuple_SET_ITEM(t, i, item);
}
if (i < n && t != NULL)
_PyTuple_Resize(&t, i, 0);
return t;
1995-07-18 14:12:02 +00:00
}
/* None of the above */
return type_error("tuple() argument must be a sequence");
1995-07-18 14:12:02 +00:00
}
PyObject *
PySequence_List(v)
PyObject *v;
{
PySequenceMethods *m;
if (v == NULL)
return null_error();
if (PyList_Check(v))
return PyList_GetSlice(v, 0, PyList_GET_SIZE(v));
m = v->ob_type->tp_as_sequence;
if (m && m->sq_item) {
int i;
PyObject *l;
int n = PySequence_Length(v);
if (n < 0)
return NULL;
l = PyList_New(n);
if (l == NULL)
return NULL;
for (i = 0; ; i++) {
PyObject *item = (*m->sq_item)(v, i);
if (item == NULL) {
if (PyErr_ExceptionMatches(PyExc_IndexError))
PyErr_Clear();
else {
Py_DECREF(l);
l = NULL;
}
break;
}
if (i < n)
PyList_SET_ITEM(l, i, item);
else if (PyList_Append(l, item) < 0) {
Py_DECREF(l);
l = NULL;
break;
}
}
if (i < n && l != NULL) {
if (PyList_SetSlice(l, i, n, (PyObject *)NULL) != 0) {
Py_DECREF(l);
l = NULL;
}
}
return l;
}
return type_error("list() argument must be a sequence");
}
1997-04-02 05:31:09 +00:00
PyObject *
PySequence_Fast(v, m)
PyObject *v;
const char* m;
{
if (v == NULL)
return null_error();
if (PyList_Check(v) || PyTuple_Check(v)) {
Py_INCREF(v);
return v;
}
v = PySequence_Tuple(v);
if (v == NULL && PyErr_ExceptionMatches(PyExc_TypeError))
return type_error(m);
return v;
}
int
PySequence_Count(s, o)
PyObject *s;
PyObject *o;
{
int l, i, n, cmp, err;
PyObject *item;
1997-04-02 05:31:09 +00:00
if (s == NULL || o == NULL) {
null_error();
return -1;
}
l = PySequence_Length(s);
if (l < 0)
return -1;
n = 0;
for (i = 0; i < l; i++) {
item = PySequence_GetItem(s, i);
if (item == NULL)
return -1;
err = PyObject_Cmp(item, o, &cmp);
Py_DECREF(item);
if (err < 0)
return err;
if (cmp == 0)
n++;
1997-04-02 05:31:09 +00:00
}
return n;
}
int
PySequence_Contains(w, v) /* v in w */
PyObject *w;
PyObject *v;
1995-07-18 14:12:02 +00:00
{
int i, cmp;
PyObject *x;
PySequenceMethods *sq;
if(PyType_HasFeature(w->ob_type, Py_TPFLAGS_HAVE_SEQUENCE_IN)) {
sq = w->ob_type->tp_as_sequence;
if(sq != NULL && sq->sq_contains != NULL)
return (*sq->sq_contains)(w, v);
}
/* If there is no better way to check whether an item is is contained,
do it the hard way */
sq = w->ob_type->tp_as_sequence;
if (sq == NULL || sq->sq_item == NULL) {
PyErr_SetString(PyExc_TypeError,
"'in' or 'not in' needs sequence right argument");
return -1;
}
for (i = 0; ; i++) {
x = (*sq->sq_item)(w, i);
if (x == NULL) {
if (PyErr_ExceptionMatches(PyExc_IndexError)) {
PyErr_Clear();
break;
}
return -1;
}
cmp = PyObject_Compare(v, x);
Py_XDECREF(x);
if (cmp == 0)
return 1;
if (PyErr_Occurred())
return -1;
}
return 0;
1995-07-18 14:12:02 +00:00
}
/* Backwards compatibility */
#undef PySequence_In
int
PySequence_In(w, v)
PyObject *w;
PyObject *v;
1995-07-18 14:12:02 +00:00
{
return PySequence_Contains(w, v);
1995-07-18 14:12:02 +00:00
}
int
1995-09-18 21:17:59 +00:00
PySequence_Index(s, o)
PyObject *s;
PyObject *o;
1995-07-18 14:12:02 +00:00
{
int l, i, cmp, err;
PyObject *item;
if (s == NULL || o == NULL) {
null_error();
return -1;
}
l = PySequence_Length(s);
if (l < 0)
return -1;
for (i = 0; i < l; i++) {
item = PySequence_GetItem(s, i);
if (item == NULL)
return -1;
err = PyObject_Cmp(item, o, &cmp);
Py_DECREF(item);
if (err < 0)
return err;
if (cmp == 0)
return i;
}
PyErr_SetString(PyExc_ValueError, "sequence.index(x): x not in list");
return -1;
1995-07-18 14:12:02 +00:00
}
/* Operations on mappings */
int
1995-09-18 21:17:59 +00:00
PyMapping_Check(o)
PyObject *o;
1995-07-18 14:12:02 +00:00
{
return o && o->ob_type->tp_as_mapping;
1995-07-18 14:12:02 +00:00
}
int
PyMapping_Length(o)
PyObject *o;
1995-07-18 14:12:02 +00:00
{
PyMappingMethods *m;
1995-07-18 14:12:02 +00:00
if (o == NULL) {
null_error();
return -1;
}
1995-07-18 14:12:02 +00:00
m = o->ob_type->tp_as_mapping;
if (m && m->mp_length)
return m->mp_length(o);
1995-07-18 14:12:02 +00:00
type_error("len() of unsized object");
return -1;
1995-07-18 14:12:02 +00:00
}
PyObject *
PyMapping_GetItemString(o, key)
PyObject *o;
char *key;
{
PyObject *okey, *r;
if (key == NULL)
return null_error();
okey = PyString_FromString(key);
if (okey == NULL)
return NULL;
r = PyObject_GetItem(o, okey);
Py_DECREF(okey);
return r;
}
int
PyMapping_SetItemString(o, key, value)
PyObject *o;
char *key;
PyObject *value;
{
PyObject *okey;
int r;
if (key == NULL) {
null_error();
return -1;
}
okey = PyString_FromString(key);
if (okey == NULL)
return -1;
r = PyObject_SetItem(o, okey, value);
Py_DECREF(okey);
return r;
}
int
1995-09-18 21:17:59 +00:00
PyMapping_HasKeyString(o, key)
PyObject *o;
char *key;
1995-07-18 14:12:02 +00:00
{
PyObject *v;
v = PyMapping_GetItemString(o, key);
if (v) {
Py_DECREF(v);
return 1;
}
PyErr_Clear();
return 0;
1995-07-18 14:12:02 +00:00
}
int
1995-09-18 21:17:59 +00:00
PyMapping_HasKey(o, key)
PyObject *o;
PyObject *key;
1995-07-18 14:12:02 +00:00
{
PyObject *v;
v = PyObject_GetItem(o, key);
if (v) {
Py_DECREF(v);
return 1;
}
PyErr_Clear();
return 0;
1995-07-18 14:12:02 +00:00
}
/* Operations on callable objects */
/* XXX PyCallable_Check() is in object.c */
1995-07-18 14:12:02 +00:00
PyObject *
1995-09-18 21:17:59 +00:00
PyObject_CallObject(o, a)
PyObject *o, *a;
1995-07-18 14:12:02 +00:00
{
PyObject *r;
PyObject *args = a;
1995-07-18 14:12:02 +00:00
if (args == NULL) {
args = PyTuple_New(0);
if (args == NULL)
return NULL;
}
r = PyEval_CallObject(o, args);
1995-07-18 14:12:02 +00:00
if (args != a) {
Py_DECREF(args);
}
return r;
}
1995-07-18 14:12:02 +00:00
PyObject *
#ifdef HAVE_STDARG_PROTOTYPES
/* VARARGS 2 */
PyObject_CallFunction(PyObject *callable, char *format, ...)
1995-07-18 14:12:02 +00:00
#else
/* VARARGS */
PyObject_CallFunction(va_alist) va_dcl
1995-07-18 14:12:02 +00:00
#endif
{
va_list va;
PyObject *args, *retval;
1995-07-18 14:12:02 +00:00
#ifdef HAVE_STDARG_PROTOTYPES
va_start(va, format);
1995-07-18 14:12:02 +00:00
#else
PyObject *callable;
char *format;
va_start(va);
callable = va_arg(va, PyObject *);
format = va_arg(va, char *);
1995-07-18 14:12:02 +00:00
#endif
if (callable == NULL) {
va_end(va);
return null_error();
}
if (format)
args = Py_VaBuildValue(format, va);
else
args = PyTuple_New(0);
va_end(va);
if (args == NULL)
return NULL;
if (!PyTuple_Check(args)) {
PyObject *a;
a = PyTuple_New(1);
if (a == NULL)
return NULL;
if (PyTuple_SetItem(a, 0, args) < 0)
return NULL;
args = a;
}
retval = PyObject_CallObject(callable, args);
Py_DECREF(args);
return retval;
1995-07-18 14:12:02 +00:00
}
PyObject *
#ifdef HAVE_STDARG_PROTOTYPES
/* VARARGS 2 */
PyObject_CallMethod(PyObject *o, char *name, char *format, ...)
#else
/* VARARGS */
PyObject_CallMethod(va_alist) va_dcl
1995-07-18 14:12:02 +00:00
#endif
{
va_list va;
PyObject *args, *func = 0, *retval;
1995-07-18 14:12:02 +00:00
#ifdef HAVE_STDARG_PROTOTYPES
va_start(va, format);
1995-07-18 14:12:02 +00:00
#else
PyObject *o;
char *name;
char *format;
va_start(va);
o = va_arg(va, PyObject *);
name = va_arg(va, char *);
format = va_arg(va, char *);
1995-07-18 14:12:02 +00:00
#endif
if (o == NULL || name == NULL) {
va_end(va);
return null_error();
}
1995-07-18 14:12:02 +00:00
func = PyObject_GetAttrString(o, name);
if (func == NULL) {
va_end(va);
PyErr_SetString(PyExc_AttributeError, name);
return 0;
}
1995-07-18 14:12:02 +00:00
if (!PyCallable_Check(func)) {
va_end(va);
return type_error("call of non-callable attribute");
}
1995-07-18 14:12:02 +00:00
if (format && *format)
args = Py_VaBuildValue(format, va);
else
args = PyTuple_New(0);
va_end(va);
if (!args)
return NULL;
if (!PyTuple_Check(args)) {
PyObject *a;
a = PyTuple_New(1);
if (a == NULL)
return NULL;
if (PyTuple_SetItem(a, 0, args) < 0)
return NULL;
args = a;
}
retval = PyObject_CallObject(func, args);
Py_DECREF(args);
Py_DECREF(func);
return retval;
1995-07-18 14:12:02 +00:00
}