mirror of
https://github.com/python/cpython
synced 2024-09-20 04:01:42 +00: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).
99 lines
3.7 KiB
C
99 lines
3.7 KiB
C
#ifndef Py_INTOBJECT_H
|
|
#define Py_INTOBJECT_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.
|
|
|
|
******************************************************************/
|
|
|
|
/* Integer object interface */
|
|
|
|
/*
|
|
PyIntObject represents a (long) integer. This is an immutable object;
|
|
an integer cannot change its value after creation.
|
|
|
|
There are functions to create new integer objects, to test an object
|
|
for integer-ness, and to get the integer value. The latter functions
|
|
returns -1 and sets errno to EBADF if the object is not an PyIntObject.
|
|
None of the functions should be applied to nil objects.
|
|
|
|
The type PyIntObject is (unfortunately) exposed here so we can declare
|
|
_Py_TrueStruct and _Py_ZeroStruct below; don't use this.
|
|
*/
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
long ob_ival;
|
|
} PyIntObject;
|
|
|
|
extern DL_IMPORT(PyTypeObject) PyInt_Type;
|
|
|
|
#define PyInt_Check(op) ((op)->ob_type == &PyInt_Type)
|
|
|
|
extern DL_IMPORT(PyObject *) PyInt_FromString Py_PROTO((char*, char**, int));
|
|
extern DL_IMPORT(PyObject *) PyInt_FromUnicode Py_PROTO((Py_UNICODE*, int, int));
|
|
extern DL_IMPORT(PyObject *) PyInt_FromLong Py_PROTO((long));
|
|
extern DL_IMPORT(long) PyInt_AsLong Py_PROTO((PyObject *));
|
|
extern DL_IMPORT(long) PyInt_GetMax Py_PROTO((void));
|
|
|
|
|
|
/*
|
|
False and True are special intobjects used by Boolean expressions.
|
|
All values of type Boolean must point to either of these; but in
|
|
contexts where integers are required they are integers (valued 0 and 1).
|
|
Hope these macros don't conflict with other people's.
|
|
|
|
Don't forget to apply Py_INCREF() when returning True or False!!!
|
|
*/
|
|
|
|
extern DL_IMPORT(PyIntObject) _Py_ZeroStruct, _Py_TrueStruct; /* Don't use these directly */
|
|
|
|
#define Py_False ((PyObject *) &_Py_ZeroStruct)
|
|
#define Py_True ((PyObject *) &_Py_TrueStruct)
|
|
|
|
/* Macro, trading safety for speed */
|
|
#define PyInt_AS_LONG(op) (((PyIntObject *)(op))->ob_ival)
|
|
|
|
/* These aren't really part of the Int object, but they're handy; the protos
|
|
* are necessary for systems that need the magic of DL_IMPORT and that want
|
|
* to have stropmodule as a dynamically loaded module instead of building it
|
|
* into the main Python shared library/DLL. Guido thinks I'm weird for
|
|
* building it this way. :-) [cjh]
|
|
*/
|
|
extern DL_IMPORT(unsigned long) PyOS_strtoul Py_PROTO((char *, char **, int));
|
|
extern DL_IMPORT(long) PyOS_strtol Py_PROTO((char *, char **, int));
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif /* !Py_INTOBJECT_H */
|