mirror of
https://github.com/python/cpython.git
synced 2024-11-25 10:54:51 +08:00
9e896b37c7
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).
91 lines
3.3 KiB
C
91 lines
3.3 KiB
C
#ifndef Py_LONGOBJECT_H
|
|
#define Py_LONGOBJECT_H
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/***********************************************************
|
|
Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
|
|
The Netherlands.
|
|
|
|
All Rights Reserved
|
|
|
|
Permission to use, copy, modify, and distribute this software and its
|
|
documentation for any purpose and without fee is hereby granted,
|
|
provided that the above copyright notice appear in all copies and that
|
|
both that copyright notice and this permission notice appear in
|
|
supporting documentation, and that the names of Stichting Mathematisch
|
|
Centrum or CWI or Corporation for National Research Initiatives or
|
|
CNRI not be used in advertising or publicity pertaining to
|
|
distribution of the software without specific, written prior
|
|
permission.
|
|
|
|
While CWI is the initial source for this software, a modified version
|
|
is made available by the Corporation for National Research Initiatives
|
|
(CNRI) at the Internet address ftp://ftp.python.org.
|
|
|
|
STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH
|
|
REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
|
|
MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH
|
|
CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
|
|
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
|
PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
|
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
******************************************************************/
|
|
|
|
/* Long (arbitrary precision) integer object interface */
|
|
|
|
typedef struct _longobject PyLongObject; /* Revealed in longintrepr.h */
|
|
|
|
extern DL_IMPORT(PyTypeObject) PyLong_Type;
|
|
|
|
#define PyLong_Check(op) ((op)->ob_type == &PyLong_Type)
|
|
|
|
extern DL_IMPORT(PyObject *) PyLong_FromLong Py_PROTO((long));
|
|
extern DL_IMPORT(PyObject *) PyLong_FromUnsignedLong Py_PROTO((unsigned long));
|
|
extern DL_IMPORT(PyObject *) PyLong_FromDouble Py_PROTO((double));
|
|
extern DL_IMPORT(long) PyLong_AsLong Py_PROTO((PyObject *));
|
|
extern DL_IMPORT(unsigned long) PyLong_AsUnsignedLong Py_PROTO((PyObject *));
|
|
extern DL_IMPORT(double) PyLong_AsDouble Py_PROTO((PyObject *));
|
|
extern DL_IMPORT(PyObject *) PyLong_FromVoidPtr Py_PROTO((void *));
|
|
extern DL_IMPORT(void *) PyLong_AsVoidPtr Py_PROTO((PyObject *));
|
|
|
|
#ifdef HAVE_LONG_LONG
|
|
|
|
#ifdef HAVE_LIMITS_H
|
|
#include <limits.h>
|
|
#endif
|
|
|
|
/* Hopefully this is portable... */
|
|
#ifndef LONG_MAX
|
|
#define LONG_MAX 2147483647L
|
|
#endif
|
|
#ifndef ULONG_MAX
|
|
#define ULONG_MAX 4294967295U
|
|
#endif
|
|
#ifndef LONGLONG_MAX
|
|
#define LONGLONG_MAX 9223372036854775807LL
|
|
#endif
|
|
#ifndef ULONGLONG_MAX
|
|
#define ULONGLONG_MAX 0xffffffffffffffffULL
|
|
#endif
|
|
#ifndef LONG_LONG
|
|
#define LONG_LONG long long
|
|
#endif
|
|
|
|
extern DL_IMPORT(PyObject *) PyLong_FromLongLong Py_PROTO((LONG_LONG));
|
|
extern DL_IMPORT(PyObject *) PyLong_FromUnsignedLongLong Py_PROTO((unsigned LONG_LONG));
|
|
extern DL_IMPORT(LONG_LONG) PyLong_AsLongLong Py_PROTO((PyObject *));
|
|
extern DL_IMPORT(unsigned LONG_LONG) PyLong_AsUnsignedLongLong Py_PROTO((PyObject *));
|
|
#endif /* HAVE_LONG_LONG */
|
|
|
|
DL_IMPORT(PyObject *) PyLong_FromString Py_PROTO((char *, char **, int));
|
|
DL_IMPORT(PyObject *) PyLong_FromUnicode Py_PROTO((Py_UNICODE*, int, int));
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif /* !Py_LONGOBJECT_H */
|