1991-02-19 08:39:46 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Float object implementation */
|
|
|
|
|
1990-10-21 19:15:08 -03:00
|
|
|
/* XXX There should be overflow checks here, but it's hard to check
|
|
|
|
for any kind of float exception without losing portability. */
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
#include "Python.h"
|
Merged revisions 59933-59951 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59935 | raymond.hettinger | 2008-01-13 07:15:15 +0100 (Sun, 13 Jan 2008) | 1 line
Named tuple is a concept, not a specific type.
........
r59936 | raymond.hettinger | 2008-01-13 07:18:07 +0100 (Sun, 13 Jan 2008) | 1 line
Fix spelling.
........
r59937 | georg.brandl | 2008-01-13 10:36:18 +0100 (Sun, 13 Jan 2008) | 2 lines
Clarify the effect of text mode.
........
r59938 | thomas.heller | 2008-01-13 12:19:43 +0100 (Sun, 13 Jan 2008) | 1 line
Make Modules/socketobject.c compile for Windows again.
........
r59939 | ka-ping.yee | 2008-01-13 12:25:13 +0100 (Sun, 13 Jan 2008) | 9 lines
Check in the patch proposed by Ben Hayden (benjhayden) for issue
#1550: help('modules') broken by several 3rd party libraries.
Tested with Python build: trunk:54235:59936M -- the reported error
occurs with Django installed (or with any __init__.py present on
the path that raises an exception), and such errors indeed go away
when this change is applied.
........
r59940 | georg.brandl | 2008-01-13 16:04:05 +0100 (Sun, 13 Jan 2008) | 2 lines
Back out r59931 - test_ctypes fails with it.
........
r59943 | amaury.forgeotdarc | 2008-01-14 01:22:44 +0100 (Mon, 14 Jan 2008) | 6 lines
As discussed in issue 1700288:
ctypes takes some liberties when creating python types: it modifies the types'
__dict__ directly, bypassing all the machinery of type objects which deal with
special methods. And this broke recent optimisations of method lookup.
Now we try to modify the type with more "official" functions.
........
r59944 | amaury.forgeotdarc | 2008-01-14 01:29:41 +0100 (Mon, 14 Jan 2008) | 5 lines
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
now that ctypes uses a more supported method to create types:
Method cache optimization, by Armin Rigo, ported to 2.6 by Kevin Jacobs.
........
r59946 | amaury.forgeotdarc | 2008-01-14 02:07:27 +0100 (Mon, 14 Jan 2008) | 4 lines
?Why did my tests not notice this before?
Slots inheritance is very different from OO inheritance.
This code lead to infinite recursion on classes derived from StructType.
........
r59947 | christian.heimes | 2008-01-14 04:33:52 +0100 (Mon, 14 Jan 2008) | 1 line
Added new an better structseq representation. E.g. repr(time.gmtime(0)) now returns 'time.struct_time(tm_year=1970, tm_mon=1, tm_mday=1, tm_hour=0, tm_min=0, tm_sec=0, tm_wday=3, tm_yday=1, tm_isdst=0)' instead of '(1970, 1, 1, 0, 0, 0, 3, 1, 0)'. The feature is part of #1816: sys.flags
........
r59948 | christian.heimes | 2008-01-14 04:35:38 +0100 (Mon, 14 Jan 2008) | 1 line
I missed the most important file
........
r59949 | christian.heimes | 2008-01-14 04:42:48 +0100 (Mon, 14 Jan 2008) | 1 line
Applied patch #1816: sys.flags patch
........
r59950 | christian.heimes | 2008-01-14 05:13:37 +0100 (Mon, 14 Jan 2008) | 2 lines
Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's
readonly and help(sys.float_info) explains the attributes nicely.
........
r59951 | christian.heimes | 2008-01-14 07:06:19 +0100 (Mon, 14 Jan 2008) | 1 line
Added more comments to the new structseq repr code and implemented several of Neal's suggestions.
........
2008-01-14 14:49:24 -04:00
|
|
|
#include "structseq.h"
|
1990-10-14 09:07:46 -03:00
|
|
|
|
1990-12-20 11:06:42 -04:00
|
|
|
#include <ctype.h>
|
2007-12-01 08:22:32 -04:00
|
|
|
#include <float.h>
|
1990-10-14 09:07:46 -03:00
|
|
|
|
2008-07-16 08:30:51 -03:00
|
|
|
#undef MAX
|
|
|
|
#undef MIN
|
|
|
|
#define MAX(x, y) ((x) < (y) ? (y) : (x))
|
|
|
|
#define MIN(x, y) ((x) < (y) ? (x) : (y))
|
|
|
|
|
Merged revisions 61981,61984-61987,61992-61993,61997-62000 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r61981 | amaury.forgeotdarc | 2008-03-28 01:21:34 +0100 (Fri, 28 Mar 2008) | 2 lines
test_future3.py is a regular test file, and should be part of the test suite
........
r61984 | jeffrey.yasskin | 2008-03-28 05:11:18 +0100 (Fri, 28 Mar 2008) | 6 lines
Kill a race in test_threading in which the exception info in a thread finishing
up after it was joined had a traceback pointing to that thread's (deleted)
target attribute, while the test was trying to check that the target was
destroyed. Big thanks to Antoine Pitrou for diagnosing the race and pointing
out sys.exc_clear() to kill the exception early. This fixes issue 2496.
........
r61985 | neal.norwitz | 2008-03-28 05:41:34 +0100 (Fri, 28 Mar 2008) | 1 line
Allow use of other ports so the test can pass if 9091 is in use
........
r61986 | jeffrey.yasskin | 2008-03-28 05:53:10 +0100 (Fri, 28 Mar 2008) | 2 lines
Print more information the next time test_socket throws the wrong exception.
........
r61987 | neal.norwitz | 2008-03-28 05:58:51 +0100 (Fri, 28 Mar 2008) | 5 lines
Revert r61969 which added casts to Py_CHARMASK to avoid compiler warnings.
Rather than sprinkle casts throughout the code, change Py_CHARMASK to
always cast it's result to an unsigned char. This should ensure we
do the right thing when accessing an array with the result.
........
r61992 | neal.norwitz | 2008-03-28 06:34:59 +0100 (Fri, 28 Mar 2008) | 2 lines
Fix compiler warning about finite() missing on Solaris.
........
r61993 | neal.norwitz | 2008-03-28 07:34:03 +0100 (Fri, 28 Mar 2008) | 11 lines
Bug 1503: Get the test to pass on OSX. This should make the test more
reliable, but I'm not convinced it is the right solution. We need
to determine if this causes the test to hang on any platforms or do
other bad things.
Even if it gets the test to pass reliably, it might be that we want
to fix this in socket. The socket returned from accept() is different
on different platforms (inheriting attributes or not) and we might
want to ensure that the attributes (at least blocking) is the same
across all platforms.
........
r61997 | neal.norwitz | 2008-03-28 08:36:31 +0100 (Fri, 28 Mar 2008) | 1 line
Name the main method correctly so the test is run
........
r61998 | gregory.p.smith | 2008-03-28 09:00:44 +0100 (Fri, 28 Mar 2008) | 7 lines
This patch moves some tests from test_urllib2_net to test_urllib2_localnet.
The moved tests use a local server rather than going out to external servers.
Accepts patch from issue2429.
Contributed by Jerry Seutter & Michael Foord (fuzzyman) at PyCon 2008.
........
r61999 | georg.brandl | 2008-03-28 09:06:56 +0100 (Fri, 28 Mar 2008) | 2 lines
#2406: add examples to gzip docs.
........
r62000 | gregory.p.smith | 2008-03-28 09:32:09 +0100 (Fri, 28 Mar 2008) | 4 lines
Accept patch issue2426 by Paul Kippes (kippesp).
Adds sqlite3.Connection.iterdump to allow dumping of databases.
........
2008-03-28 07:53:29 -03:00
|
|
|
#ifdef HAVE_IEEEFP_H
|
|
|
|
#include <ieeefp.h>
|
|
|
|
#endif
|
|
|
|
|
1990-11-02 13:50:43 -04:00
|
|
|
|
Merged revisions 60245-60277 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60246 | guido.van.rossum | 2008-01-24 18:58:05 +0100 (Thu, 24 Jan 2008) | 2 lines
Fix test67.py from issue #1303614.
........
r60248 | raymond.hettinger | 2008-01-24 19:05:54 +0100 (Thu, 24 Jan 2008) | 1 line
Clean-up and speed-up code by accessing numerator/denominator directly. There's no reason to enforce readonliness
........
r60249 | raymond.hettinger | 2008-01-24 19:12:23 +0100 (Thu, 24 Jan 2008) | 1 line
Revert 60189 and restore performance.
........
r60250 | guido.van.rossum | 2008-01-24 19:21:02 +0100 (Thu, 24 Jan 2008) | 5 lines
News about recently fixed crashers:
- A few crashers fixed: weakref_in_del.py (issue #1377858);
loosing_dict_ref.py (issue #1303614, test67.py);
borrowed_ref_[34].py (not in tracker).
........
r60252 | thomas.heller | 2008-01-24 19:36:27 +0100 (Thu, 24 Jan 2008) | 7 lines
Use a PyDictObject again for the array type cache; retrieving items
from the WeakValueDictionary was slower by nearly a factor of 3.
To avoid leaks, weakref proxies for the array types are put into the
cache dict, with weakref callbacks that removes the entries when the
type goes away.
........
r60253 | thomas.heller | 2008-01-24 19:54:12 +0100 (Thu, 24 Jan 2008) | 2 lines
Replace Py_BuildValue with PyTuple_Pack because it is faster.
Also add a missing DECREF.
........
r60254 | raymond.hettinger | 2008-01-24 20:05:29 +0100 (Thu, 24 Jan 2008) | 1 line
Add support for trunc().
........
r60255 | thomas.heller | 2008-01-24 20:15:02 +0100 (Thu, 24 Jan 2008) | 5 lines
Invert the checks in get_[u]long and get_[u]longlong. The intent was
to not accept float types; the result was that integer-like objects
were not accepted.
Ported from release25-maint.
........
r60256 | raymond.hettinger | 2008-01-24 20:30:19 +0100 (Thu, 24 Jan 2008) | 1 line
Add support for int(r) just like the other numeric classes.
........
r60263 | raymond.hettinger | 2008-01-24 22:23:58 +0100 (Thu, 24 Jan 2008) | 1 line
Expand tests to include nested graph structures.
........
r60264 | raymond.hettinger | 2008-01-24 22:47:56 +0100 (Thu, 24 Jan 2008) | 1 line
Shorter pprint's for empty sets and frozensets. Fix indentation of frozensets. Add tests including two complex data structures.
........
r60265 | amaury.forgeotdarc | 2008-01-24 23:51:18 +0100 (Thu, 24 Jan 2008) | 14 lines
#1920: when considering a block starting by "while 0", the compiler optimized the
whole construct away, even when an 'else' clause is present::
while 0:
print("no")
else:
print("yes")
did not generate any code at all.
Now the compiler emits the 'else' block, like it already does for 'if' statements.
Will backport.
........
r60266 | amaury.forgeotdarc | 2008-01-24 23:59:25 +0100 (Thu, 24 Jan 2008) | 2 lines
News entry for r60265 (Issue 1920).
........
r60269 | raymond.hettinger | 2008-01-25 00:50:26 +0100 (Fri, 25 Jan 2008) | 1 line
More code cleanup. Remove unnecessary indirection to useless class methods.
........
r60270 | raymond.hettinger | 2008-01-25 01:21:54 +0100 (Fri, 25 Jan 2008) | 1 line
Add support for copy, deepcopy, and pickle.
........
r60271 | raymond.hettinger | 2008-01-25 01:33:45 +0100 (Fri, 25 Jan 2008) | 1 line
Mark todos and review comments.
........
r60272 | raymond.hettinger | 2008-01-25 02:13:12 +0100 (Fri, 25 Jan 2008) | 1 line
Add one other review comment.
........
r60273 | raymond.hettinger | 2008-01-25 02:23:38 +0100 (Fri, 25 Jan 2008) | 1 line
Fix-up signature for approximation.
........
r60274 | raymond.hettinger | 2008-01-25 02:46:33 +0100 (Fri, 25 Jan 2008) | 1 line
More design notes
........
r60276 | neal.norwitz | 2008-01-25 07:37:23 +0100 (Fri, 25 Jan 2008) | 6 lines
Make the test more robust by trying to reconnect up to 3 times
in case there were transient failures. This will hopefully silence
the buildbots for this test. As we find other tests that have a problem,
we can fix with a similar strategy assuming it is successful. It worked
on my box in a loop for 10+ runs where it would have an exception otherwise.
........
r60277 | neal.norwitz | 2008-01-25 09:04:16 +0100 (Fri, 25 Jan 2008) | 4 lines
Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64)
and eliminate a compiler warning in floatobject.c. There might be
a better way to go about this, but it should be good enough for now.
........
2008-01-25 07:23:10 -04:00
|
|
|
#ifdef _OSF_SOURCE
|
|
|
|
/* OSF1 5.1 doesn't make this available with XOPEN_SOURCE_EXTENDED defined */
|
|
|
|
extern int finite(double);
|
|
|
|
#endif
|
|
|
|
|
1997-05-13 18:00:42 -03:00
|
|
|
/* Special free list -- see comments for same code in intobject.c. */
|
2010-05-09 13:14:21 -03:00
|
|
|
#define BLOCK_SIZE 1000 /* 1K less typical malloc overhead */
|
|
|
|
#define BHEAD_SIZE 8 /* Enough for a 64-bit pointer */
|
|
|
|
#define N_FLOATOBJECTS ((BLOCK_SIZE - BHEAD_SIZE) / sizeof(PyFloatObject))
|
1999-03-12 15:43:17 -04:00
|
|
|
|
|
|
|
struct _floatblock {
|
2010-05-09 13:14:21 -03:00
|
|
|
struct _floatblock *next;
|
|
|
|
PyFloatObject objects[N_FLOATOBJECTS];
|
1999-03-12 15:43:17 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct _floatblock PyFloatBlock;
|
|
|
|
|
|
|
|
static PyFloatBlock *block_list = NULL;
|
|
|
|
static PyFloatObject *free_list = NULL;
|
|
|
|
|
1997-05-13 18:00:42 -03:00
|
|
|
static PyFloatObject *
|
2000-07-09 02:02:18 -03:00
|
|
|
fill_free_list(void)
|
1997-05-13 18:00:42 -03:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
PyFloatObject *p, *q;
|
|
|
|
/* XXX Float blocks escape the object heap. Use PyObject_MALLOC ??? */
|
|
|
|
p = (PyFloatObject *) PyMem_MALLOC(sizeof(PyFloatBlock));
|
|
|
|
if (p == NULL)
|
|
|
|
return (PyFloatObject *) PyErr_NoMemory();
|
|
|
|
((PyFloatBlock *)p)->next = block_list;
|
|
|
|
block_list = (PyFloatBlock *)p;
|
|
|
|
p = &((PyFloatBlock *)p)->objects[0];
|
|
|
|
q = p + N_FLOATOBJECTS;
|
|
|
|
while (--q > p)
|
|
|
|
Py_TYPE(q) = (struct _typeobject *)(q-1);
|
|
|
|
Py_TYPE(q) = NULL;
|
|
|
|
return p + N_FLOATOBJECTS - 1;
|
1997-05-13 18:00:42 -03:00
|
|
|
}
|
|
|
|
|
2007-12-01 08:22:32 -04:00
|
|
|
double
|
|
|
|
PyFloat_GetMax(void)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
return DBL_MAX;
|
2007-12-01 08:22:32 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
double
|
|
|
|
PyFloat_GetMin(void)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
return DBL_MIN;
|
2007-12-01 08:22:32 -04:00
|
|
|
}
|
|
|
|
|
Merged revisions 59933-59951 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59935 | raymond.hettinger | 2008-01-13 07:15:15 +0100 (Sun, 13 Jan 2008) | 1 line
Named tuple is a concept, not a specific type.
........
r59936 | raymond.hettinger | 2008-01-13 07:18:07 +0100 (Sun, 13 Jan 2008) | 1 line
Fix spelling.
........
r59937 | georg.brandl | 2008-01-13 10:36:18 +0100 (Sun, 13 Jan 2008) | 2 lines
Clarify the effect of text mode.
........
r59938 | thomas.heller | 2008-01-13 12:19:43 +0100 (Sun, 13 Jan 2008) | 1 line
Make Modules/socketobject.c compile for Windows again.
........
r59939 | ka-ping.yee | 2008-01-13 12:25:13 +0100 (Sun, 13 Jan 2008) | 9 lines
Check in the patch proposed by Ben Hayden (benjhayden) for issue
#1550: help('modules') broken by several 3rd party libraries.
Tested with Python build: trunk:54235:59936M -- the reported error
occurs with Django installed (or with any __init__.py present on
the path that raises an exception), and such errors indeed go away
when this change is applied.
........
r59940 | georg.brandl | 2008-01-13 16:04:05 +0100 (Sun, 13 Jan 2008) | 2 lines
Back out r59931 - test_ctypes fails with it.
........
r59943 | amaury.forgeotdarc | 2008-01-14 01:22:44 +0100 (Mon, 14 Jan 2008) | 6 lines
As discussed in issue 1700288:
ctypes takes some liberties when creating python types: it modifies the types'
__dict__ directly, bypassing all the machinery of type objects which deal with
special methods. And this broke recent optimisations of method lookup.
Now we try to modify the type with more "official" functions.
........
r59944 | amaury.forgeotdarc | 2008-01-14 01:29:41 +0100 (Mon, 14 Jan 2008) | 5 lines
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
now that ctypes uses a more supported method to create types:
Method cache optimization, by Armin Rigo, ported to 2.6 by Kevin Jacobs.
........
r59946 | amaury.forgeotdarc | 2008-01-14 02:07:27 +0100 (Mon, 14 Jan 2008) | 4 lines
?Why did my tests not notice this before?
Slots inheritance is very different from OO inheritance.
This code lead to infinite recursion on classes derived from StructType.
........
r59947 | christian.heimes | 2008-01-14 04:33:52 +0100 (Mon, 14 Jan 2008) | 1 line
Added new an better structseq representation. E.g. repr(time.gmtime(0)) now returns 'time.struct_time(tm_year=1970, tm_mon=1, tm_mday=1, tm_hour=0, tm_min=0, tm_sec=0, tm_wday=3, tm_yday=1, tm_isdst=0)' instead of '(1970, 1, 1, 0, 0, 0, 3, 1, 0)'. The feature is part of #1816: sys.flags
........
r59948 | christian.heimes | 2008-01-14 04:35:38 +0100 (Mon, 14 Jan 2008) | 1 line
I missed the most important file
........
r59949 | christian.heimes | 2008-01-14 04:42:48 +0100 (Mon, 14 Jan 2008) | 1 line
Applied patch #1816: sys.flags patch
........
r59950 | christian.heimes | 2008-01-14 05:13:37 +0100 (Mon, 14 Jan 2008) | 2 lines
Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's
readonly and help(sys.float_info) explains the attributes nicely.
........
r59951 | christian.heimes | 2008-01-14 07:06:19 +0100 (Mon, 14 Jan 2008) | 1 line
Added more comments to the new structseq repr code and implemented several of Neal's suggestions.
........
2008-01-14 14:49:24 -04:00
|
|
|
static PyTypeObject FloatInfoType;
|
|
|
|
|
|
|
|
PyDoc_STRVAR(floatinfo__doc__,
|
|
|
|
"sys.floatinfo\n\
|
|
|
|
\n\
|
|
|
|
A structseq holding information about the float type. It contains low level\n\
|
|
|
|
information about the precision and internal representation. Please study\n\
|
|
|
|
your system's :file:`float.h` for more information.");
|
|
|
|
|
|
|
|
static PyStructSequence_Field floatinfo_fields[] = {
|
2010-05-09 13:14:21 -03:00
|
|
|
{"max", "DBL_MAX -- maximum representable finite float"},
|
|
|
|
{"max_exp", "DBL_MAX_EXP -- maximum int e such that radix**(e-1) "
|
|
|
|
"is representable"},
|
|
|
|
{"max_10_exp", "DBL_MAX_10_EXP -- maximum int e such that 10**e "
|
|
|
|
"is representable"},
|
|
|
|
{"min", "DBL_MIN -- Minimum positive normalizer float"},
|
|
|
|
{"min_exp", "DBL_MIN_EXP -- minimum int e such that radix**(e-1) "
|
|
|
|
"is a normalized float"},
|
|
|
|
{"min_10_exp", "DBL_MIN_10_EXP -- minimum int e such that 10**e is "
|
|
|
|
"a normalized"},
|
|
|
|
{"dig", "DBL_DIG -- digits"},
|
|
|
|
{"mant_dig", "DBL_MANT_DIG -- mantissa digits"},
|
|
|
|
{"epsilon", "DBL_EPSILON -- Difference between 1 and the next "
|
|
|
|
"representable float"},
|
|
|
|
{"radix", "FLT_RADIX -- radix of exponent"},
|
|
|
|
{"rounds", "FLT_ROUNDS -- addition rounds"},
|
|
|
|
{0}
|
Merged revisions 59933-59951 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59935 | raymond.hettinger | 2008-01-13 07:15:15 +0100 (Sun, 13 Jan 2008) | 1 line
Named tuple is a concept, not a specific type.
........
r59936 | raymond.hettinger | 2008-01-13 07:18:07 +0100 (Sun, 13 Jan 2008) | 1 line
Fix spelling.
........
r59937 | georg.brandl | 2008-01-13 10:36:18 +0100 (Sun, 13 Jan 2008) | 2 lines
Clarify the effect of text mode.
........
r59938 | thomas.heller | 2008-01-13 12:19:43 +0100 (Sun, 13 Jan 2008) | 1 line
Make Modules/socketobject.c compile for Windows again.
........
r59939 | ka-ping.yee | 2008-01-13 12:25:13 +0100 (Sun, 13 Jan 2008) | 9 lines
Check in the patch proposed by Ben Hayden (benjhayden) for issue
#1550: help('modules') broken by several 3rd party libraries.
Tested with Python build: trunk:54235:59936M -- the reported error
occurs with Django installed (or with any __init__.py present on
the path that raises an exception), and such errors indeed go away
when this change is applied.
........
r59940 | georg.brandl | 2008-01-13 16:04:05 +0100 (Sun, 13 Jan 2008) | 2 lines
Back out r59931 - test_ctypes fails with it.
........
r59943 | amaury.forgeotdarc | 2008-01-14 01:22:44 +0100 (Mon, 14 Jan 2008) | 6 lines
As discussed in issue 1700288:
ctypes takes some liberties when creating python types: it modifies the types'
__dict__ directly, bypassing all the machinery of type objects which deal with
special methods. And this broke recent optimisations of method lookup.
Now we try to modify the type with more "official" functions.
........
r59944 | amaury.forgeotdarc | 2008-01-14 01:29:41 +0100 (Mon, 14 Jan 2008) | 5 lines
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
now that ctypes uses a more supported method to create types:
Method cache optimization, by Armin Rigo, ported to 2.6 by Kevin Jacobs.
........
r59946 | amaury.forgeotdarc | 2008-01-14 02:07:27 +0100 (Mon, 14 Jan 2008) | 4 lines
?Why did my tests not notice this before?
Slots inheritance is very different from OO inheritance.
This code lead to infinite recursion on classes derived from StructType.
........
r59947 | christian.heimes | 2008-01-14 04:33:52 +0100 (Mon, 14 Jan 2008) | 1 line
Added new an better structseq representation. E.g. repr(time.gmtime(0)) now returns 'time.struct_time(tm_year=1970, tm_mon=1, tm_mday=1, tm_hour=0, tm_min=0, tm_sec=0, tm_wday=3, tm_yday=1, tm_isdst=0)' instead of '(1970, 1, 1, 0, 0, 0, 3, 1, 0)'. The feature is part of #1816: sys.flags
........
r59948 | christian.heimes | 2008-01-14 04:35:38 +0100 (Mon, 14 Jan 2008) | 1 line
I missed the most important file
........
r59949 | christian.heimes | 2008-01-14 04:42:48 +0100 (Mon, 14 Jan 2008) | 1 line
Applied patch #1816: sys.flags patch
........
r59950 | christian.heimes | 2008-01-14 05:13:37 +0100 (Mon, 14 Jan 2008) | 2 lines
Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's
readonly and help(sys.float_info) explains the attributes nicely.
........
r59951 | christian.heimes | 2008-01-14 07:06:19 +0100 (Mon, 14 Jan 2008) | 1 line
Added more comments to the new structseq repr code and implemented several of Neal's suggestions.
........
2008-01-14 14:49:24 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
static PyStructSequence_Desc floatinfo_desc = {
|
2010-05-09 13:14:21 -03:00
|
|
|
"sys.floatinfo", /* name */
|
|
|
|
floatinfo__doc__, /* doc */
|
|
|
|
floatinfo_fields, /* fields */
|
|
|
|
11
|
Merged revisions 59933-59951 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59935 | raymond.hettinger | 2008-01-13 07:15:15 +0100 (Sun, 13 Jan 2008) | 1 line
Named tuple is a concept, not a specific type.
........
r59936 | raymond.hettinger | 2008-01-13 07:18:07 +0100 (Sun, 13 Jan 2008) | 1 line
Fix spelling.
........
r59937 | georg.brandl | 2008-01-13 10:36:18 +0100 (Sun, 13 Jan 2008) | 2 lines
Clarify the effect of text mode.
........
r59938 | thomas.heller | 2008-01-13 12:19:43 +0100 (Sun, 13 Jan 2008) | 1 line
Make Modules/socketobject.c compile for Windows again.
........
r59939 | ka-ping.yee | 2008-01-13 12:25:13 +0100 (Sun, 13 Jan 2008) | 9 lines
Check in the patch proposed by Ben Hayden (benjhayden) for issue
#1550: help('modules') broken by several 3rd party libraries.
Tested with Python build: trunk:54235:59936M -- the reported error
occurs with Django installed (or with any __init__.py present on
the path that raises an exception), and such errors indeed go away
when this change is applied.
........
r59940 | georg.brandl | 2008-01-13 16:04:05 +0100 (Sun, 13 Jan 2008) | 2 lines
Back out r59931 - test_ctypes fails with it.
........
r59943 | amaury.forgeotdarc | 2008-01-14 01:22:44 +0100 (Mon, 14 Jan 2008) | 6 lines
As discussed in issue 1700288:
ctypes takes some liberties when creating python types: it modifies the types'
__dict__ directly, bypassing all the machinery of type objects which deal with
special methods. And this broke recent optimisations of method lookup.
Now we try to modify the type with more "official" functions.
........
r59944 | amaury.forgeotdarc | 2008-01-14 01:29:41 +0100 (Mon, 14 Jan 2008) | 5 lines
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
now that ctypes uses a more supported method to create types:
Method cache optimization, by Armin Rigo, ported to 2.6 by Kevin Jacobs.
........
r59946 | amaury.forgeotdarc | 2008-01-14 02:07:27 +0100 (Mon, 14 Jan 2008) | 4 lines
?Why did my tests not notice this before?
Slots inheritance is very different from OO inheritance.
This code lead to infinite recursion on classes derived from StructType.
........
r59947 | christian.heimes | 2008-01-14 04:33:52 +0100 (Mon, 14 Jan 2008) | 1 line
Added new an better structseq representation. E.g. repr(time.gmtime(0)) now returns 'time.struct_time(tm_year=1970, tm_mon=1, tm_mday=1, tm_hour=0, tm_min=0, tm_sec=0, tm_wday=3, tm_yday=1, tm_isdst=0)' instead of '(1970, 1, 1, 0, 0, 0, 3, 1, 0)'. The feature is part of #1816: sys.flags
........
r59948 | christian.heimes | 2008-01-14 04:35:38 +0100 (Mon, 14 Jan 2008) | 1 line
I missed the most important file
........
r59949 | christian.heimes | 2008-01-14 04:42:48 +0100 (Mon, 14 Jan 2008) | 1 line
Applied patch #1816: sys.flags patch
........
r59950 | christian.heimes | 2008-01-14 05:13:37 +0100 (Mon, 14 Jan 2008) | 2 lines
Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's
readonly and help(sys.float_info) explains the attributes nicely.
........
r59951 | christian.heimes | 2008-01-14 07:06:19 +0100 (Mon, 14 Jan 2008) | 1 line
Added more comments to the new structseq repr code and implemented several of Neal's suggestions.
........
2008-01-14 14:49:24 -04:00
|
|
|
};
|
|
|
|
|
2007-12-01 08:22:32 -04:00
|
|
|
PyObject *
|
|
|
|
PyFloat_GetInfo(void)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
PyObject* floatinfo;
|
|
|
|
int pos = 0;
|
Merged revisions 59933-59951 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59935 | raymond.hettinger | 2008-01-13 07:15:15 +0100 (Sun, 13 Jan 2008) | 1 line
Named tuple is a concept, not a specific type.
........
r59936 | raymond.hettinger | 2008-01-13 07:18:07 +0100 (Sun, 13 Jan 2008) | 1 line
Fix spelling.
........
r59937 | georg.brandl | 2008-01-13 10:36:18 +0100 (Sun, 13 Jan 2008) | 2 lines
Clarify the effect of text mode.
........
r59938 | thomas.heller | 2008-01-13 12:19:43 +0100 (Sun, 13 Jan 2008) | 1 line
Make Modules/socketobject.c compile for Windows again.
........
r59939 | ka-ping.yee | 2008-01-13 12:25:13 +0100 (Sun, 13 Jan 2008) | 9 lines
Check in the patch proposed by Ben Hayden (benjhayden) for issue
#1550: help('modules') broken by several 3rd party libraries.
Tested with Python build: trunk:54235:59936M -- the reported error
occurs with Django installed (or with any __init__.py present on
the path that raises an exception), and such errors indeed go away
when this change is applied.
........
r59940 | georg.brandl | 2008-01-13 16:04:05 +0100 (Sun, 13 Jan 2008) | 2 lines
Back out r59931 - test_ctypes fails with it.
........
r59943 | amaury.forgeotdarc | 2008-01-14 01:22:44 +0100 (Mon, 14 Jan 2008) | 6 lines
As discussed in issue 1700288:
ctypes takes some liberties when creating python types: it modifies the types'
__dict__ directly, bypassing all the machinery of type objects which deal with
special methods. And this broke recent optimisations of method lookup.
Now we try to modify the type with more "official" functions.
........
r59944 | amaury.forgeotdarc | 2008-01-14 01:29:41 +0100 (Mon, 14 Jan 2008) | 5 lines
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
now that ctypes uses a more supported method to create types:
Method cache optimization, by Armin Rigo, ported to 2.6 by Kevin Jacobs.
........
r59946 | amaury.forgeotdarc | 2008-01-14 02:07:27 +0100 (Mon, 14 Jan 2008) | 4 lines
?Why did my tests not notice this before?
Slots inheritance is very different from OO inheritance.
This code lead to infinite recursion on classes derived from StructType.
........
r59947 | christian.heimes | 2008-01-14 04:33:52 +0100 (Mon, 14 Jan 2008) | 1 line
Added new an better structseq representation. E.g. repr(time.gmtime(0)) now returns 'time.struct_time(tm_year=1970, tm_mon=1, tm_mday=1, tm_hour=0, tm_min=0, tm_sec=0, tm_wday=3, tm_yday=1, tm_isdst=0)' instead of '(1970, 1, 1, 0, 0, 0, 3, 1, 0)'. The feature is part of #1816: sys.flags
........
r59948 | christian.heimes | 2008-01-14 04:35:38 +0100 (Mon, 14 Jan 2008) | 1 line
I missed the most important file
........
r59949 | christian.heimes | 2008-01-14 04:42:48 +0100 (Mon, 14 Jan 2008) | 1 line
Applied patch #1816: sys.flags patch
........
r59950 | christian.heimes | 2008-01-14 05:13:37 +0100 (Mon, 14 Jan 2008) | 2 lines
Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's
readonly and help(sys.float_info) explains the attributes nicely.
........
r59951 | christian.heimes | 2008-01-14 07:06:19 +0100 (Mon, 14 Jan 2008) | 1 line
Added more comments to the new structseq repr code and implemented several of Neal's suggestions.
........
2008-01-14 14:49:24 -04:00
|
|
|
|
2010-05-09 13:14:21 -03:00
|
|
|
floatinfo = PyStructSequence_New(&FloatInfoType);
|
|
|
|
if (floatinfo == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
Merged revisions 59933-59951 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59935 | raymond.hettinger | 2008-01-13 07:15:15 +0100 (Sun, 13 Jan 2008) | 1 line
Named tuple is a concept, not a specific type.
........
r59936 | raymond.hettinger | 2008-01-13 07:18:07 +0100 (Sun, 13 Jan 2008) | 1 line
Fix spelling.
........
r59937 | georg.brandl | 2008-01-13 10:36:18 +0100 (Sun, 13 Jan 2008) | 2 lines
Clarify the effect of text mode.
........
r59938 | thomas.heller | 2008-01-13 12:19:43 +0100 (Sun, 13 Jan 2008) | 1 line
Make Modules/socketobject.c compile for Windows again.
........
r59939 | ka-ping.yee | 2008-01-13 12:25:13 +0100 (Sun, 13 Jan 2008) | 9 lines
Check in the patch proposed by Ben Hayden (benjhayden) for issue
#1550: help('modules') broken by several 3rd party libraries.
Tested with Python build: trunk:54235:59936M -- the reported error
occurs with Django installed (or with any __init__.py present on
the path that raises an exception), and such errors indeed go away
when this change is applied.
........
r59940 | georg.brandl | 2008-01-13 16:04:05 +0100 (Sun, 13 Jan 2008) | 2 lines
Back out r59931 - test_ctypes fails with it.
........
r59943 | amaury.forgeotdarc | 2008-01-14 01:22:44 +0100 (Mon, 14 Jan 2008) | 6 lines
As discussed in issue 1700288:
ctypes takes some liberties when creating python types: it modifies the types'
__dict__ directly, bypassing all the machinery of type objects which deal with
special methods. And this broke recent optimisations of method lookup.
Now we try to modify the type with more "official" functions.
........
r59944 | amaury.forgeotdarc | 2008-01-14 01:29:41 +0100 (Mon, 14 Jan 2008) | 5 lines
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
now that ctypes uses a more supported method to create types:
Method cache optimization, by Armin Rigo, ported to 2.6 by Kevin Jacobs.
........
r59946 | amaury.forgeotdarc | 2008-01-14 02:07:27 +0100 (Mon, 14 Jan 2008) | 4 lines
?Why did my tests not notice this before?
Slots inheritance is very different from OO inheritance.
This code lead to infinite recursion on classes derived from StructType.
........
r59947 | christian.heimes | 2008-01-14 04:33:52 +0100 (Mon, 14 Jan 2008) | 1 line
Added new an better structseq representation. E.g. repr(time.gmtime(0)) now returns 'time.struct_time(tm_year=1970, tm_mon=1, tm_mday=1, tm_hour=0, tm_min=0, tm_sec=0, tm_wday=3, tm_yday=1, tm_isdst=0)' instead of '(1970, 1, 1, 0, 0, 0, 3, 1, 0)'. The feature is part of #1816: sys.flags
........
r59948 | christian.heimes | 2008-01-14 04:35:38 +0100 (Mon, 14 Jan 2008) | 1 line
I missed the most important file
........
r59949 | christian.heimes | 2008-01-14 04:42:48 +0100 (Mon, 14 Jan 2008) | 1 line
Applied patch #1816: sys.flags patch
........
r59950 | christian.heimes | 2008-01-14 05:13:37 +0100 (Mon, 14 Jan 2008) | 2 lines
Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's
readonly and help(sys.float_info) explains the attributes nicely.
........
r59951 | christian.heimes | 2008-01-14 07:06:19 +0100 (Mon, 14 Jan 2008) | 1 line
Added more comments to the new structseq repr code and implemented several of Neal's suggestions.
........
2008-01-14 14:49:24 -04:00
|
|
|
|
|
|
|
#define SetIntFlag(flag) \
|
2010-05-09 13:14:21 -03:00
|
|
|
PyStructSequence_SET_ITEM(floatinfo, pos++, PyLong_FromLong(flag))
|
Merged revisions 59933-59951 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59935 | raymond.hettinger | 2008-01-13 07:15:15 +0100 (Sun, 13 Jan 2008) | 1 line
Named tuple is a concept, not a specific type.
........
r59936 | raymond.hettinger | 2008-01-13 07:18:07 +0100 (Sun, 13 Jan 2008) | 1 line
Fix spelling.
........
r59937 | georg.brandl | 2008-01-13 10:36:18 +0100 (Sun, 13 Jan 2008) | 2 lines
Clarify the effect of text mode.
........
r59938 | thomas.heller | 2008-01-13 12:19:43 +0100 (Sun, 13 Jan 2008) | 1 line
Make Modules/socketobject.c compile for Windows again.
........
r59939 | ka-ping.yee | 2008-01-13 12:25:13 +0100 (Sun, 13 Jan 2008) | 9 lines
Check in the patch proposed by Ben Hayden (benjhayden) for issue
#1550: help('modules') broken by several 3rd party libraries.
Tested with Python build: trunk:54235:59936M -- the reported error
occurs with Django installed (or with any __init__.py present on
the path that raises an exception), and such errors indeed go away
when this change is applied.
........
r59940 | georg.brandl | 2008-01-13 16:04:05 +0100 (Sun, 13 Jan 2008) | 2 lines
Back out r59931 - test_ctypes fails with it.
........
r59943 | amaury.forgeotdarc | 2008-01-14 01:22:44 +0100 (Mon, 14 Jan 2008) | 6 lines
As discussed in issue 1700288:
ctypes takes some liberties when creating python types: it modifies the types'
__dict__ directly, bypassing all the machinery of type objects which deal with
special methods. And this broke recent optimisations of method lookup.
Now we try to modify the type with more "official" functions.
........
r59944 | amaury.forgeotdarc | 2008-01-14 01:29:41 +0100 (Mon, 14 Jan 2008) | 5 lines
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
now that ctypes uses a more supported method to create types:
Method cache optimization, by Armin Rigo, ported to 2.6 by Kevin Jacobs.
........
r59946 | amaury.forgeotdarc | 2008-01-14 02:07:27 +0100 (Mon, 14 Jan 2008) | 4 lines
?Why did my tests not notice this before?
Slots inheritance is very different from OO inheritance.
This code lead to infinite recursion on classes derived from StructType.
........
r59947 | christian.heimes | 2008-01-14 04:33:52 +0100 (Mon, 14 Jan 2008) | 1 line
Added new an better structseq representation. E.g. repr(time.gmtime(0)) now returns 'time.struct_time(tm_year=1970, tm_mon=1, tm_mday=1, tm_hour=0, tm_min=0, tm_sec=0, tm_wday=3, tm_yday=1, tm_isdst=0)' instead of '(1970, 1, 1, 0, 0, 0, 3, 1, 0)'. The feature is part of #1816: sys.flags
........
r59948 | christian.heimes | 2008-01-14 04:35:38 +0100 (Mon, 14 Jan 2008) | 1 line
I missed the most important file
........
r59949 | christian.heimes | 2008-01-14 04:42:48 +0100 (Mon, 14 Jan 2008) | 1 line
Applied patch #1816: sys.flags patch
........
r59950 | christian.heimes | 2008-01-14 05:13:37 +0100 (Mon, 14 Jan 2008) | 2 lines
Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's
readonly and help(sys.float_info) explains the attributes nicely.
........
r59951 | christian.heimes | 2008-01-14 07:06:19 +0100 (Mon, 14 Jan 2008) | 1 line
Added more comments to the new structseq repr code and implemented several of Neal's suggestions.
........
2008-01-14 14:49:24 -04:00
|
|
|
#define SetDblFlag(flag) \
|
2010-05-09 13:14:21 -03:00
|
|
|
PyStructSequence_SET_ITEM(floatinfo, pos++, PyFloat_FromDouble(flag))
|
|
|
|
|
|
|
|
SetDblFlag(DBL_MAX);
|
|
|
|
SetIntFlag(DBL_MAX_EXP);
|
|
|
|
SetIntFlag(DBL_MAX_10_EXP);
|
|
|
|
SetDblFlag(DBL_MIN);
|
|
|
|
SetIntFlag(DBL_MIN_EXP);
|
|
|
|
SetIntFlag(DBL_MIN_10_EXP);
|
|
|
|
SetIntFlag(DBL_DIG);
|
|
|
|
SetIntFlag(DBL_MANT_DIG);
|
|
|
|
SetDblFlag(DBL_EPSILON);
|
|
|
|
SetIntFlag(FLT_RADIX);
|
|
|
|
SetIntFlag(FLT_ROUNDS);
|
Merged revisions 59933-59951 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59935 | raymond.hettinger | 2008-01-13 07:15:15 +0100 (Sun, 13 Jan 2008) | 1 line
Named tuple is a concept, not a specific type.
........
r59936 | raymond.hettinger | 2008-01-13 07:18:07 +0100 (Sun, 13 Jan 2008) | 1 line
Fix spelling.
........
r59937 | georg.brandl | 2008-01-13 10:36:18 +0100 (Sun, 13 Jan 2008) | 2 lines
Clarify the effect of text mode.
........
r59938 | thomas.heller | 2008-01-13 12:19:43 +0100 (Sun, 13 Jan 2008) | 1 line
Make Modules/socketobject.c compile for Windows again.
........
r59939 | ka-ping.yee | 2008-01-13 12:25:13 +0100 (Sun, 13 Jan 2008) | 9 lines
Check in the patch proposed by Ben Hayden (benjhayden) for issue
#1550: help('modules') broken by several 3rd party libraries.
Tested with Python build: trunk:54235:59936M -- the reported error
occurs with Django installed (or with any __init__.py present on
the path that raises an exception), and such errors indeed go away
when this change is applied.
........
r59940 | georg.brandl | 2008-01-13 16:04:05 +0100 (Sun, 13 Jan 2008) | 2 lines
Back out r59931 - test_ctypes fails with it.
........
r59943 | amaury.forgeotdarc | 2008-01-14 01:22:44 +0100 (Mon, 14 Jan 2008) | 6 lines
As discussed in issue 1700288:
ctypes takes some liberties when creating python types: it modifies the types'
__dict__ directly, bypassing all the machinery of type objects which deal with
special methods. And this broke recent optimisations of method lookup.
Now we try to modify the type with more "official" functions.
........
r59944 | amaury.forgeotdarc | 2008-01-14 01:29:41 +0100 (Mon, 14 Jan 2008) | 5 lines
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
now that ctypes uses a more supported method to create types:
Method cache optimization, by Armin Rigo, ported to 2.6 by Kevin Jacobs.
........
r59946 | amaury.forgeotdarc | 2008-01-14 02:07:27 +0100 (Mon, 14 Jan 2008) | 4 lines
?Why did my tests not notice this before?
Slots inheritance is very different from OO inheritance.
This code lead to infinite recursion on classes derived from StructType.
........
r59947 | christian.heimes | 2008-01-14 04:33:52 +0100 (Mon, 14 Jan 2008) | 1 line
Added new an better structseq representation. E.g. repr(time.gmtime(0)) now returns 'time.struct_time(tm_year=1970, tm_mon=1, tm_mday=1, tm_hour=0, tm_min=0, tm_sec=0, tm_wday=3, tm_yday=1, tm_isdst=0)' instead of '(1970, 1, 1, 0, 0, 0, 3, 1, 0)'. The feature is part of #1816: sys.flags
........
r59948 | christian.heimes | 2008-01-14 04:35:38 +0100 (Mon, 14 Jan 2008) | 1 line
I missed the most important file
........
r59949 | christian.heimes | 2008-01-14 04:42:48 +0100 (Mon, 14 Jan 2008) | 1 line
Applied patch #1816: sys.flags patch
........
r59950 | christian.heimes | 2008-01-14 05:13:37 +0100 (Mon, 14 Jan 2008) | 2 lines
Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's
readonly and help(sys.float_info) explains the attributes nicely.
........
r59951 | christian.heimes | 2008-01-14 07:06:19 +0100 (Mon, 14 Jan 2008) | 1 line
Added more comments to the new structseq repr code and implemented several of Neal's suggestions.
........
2008-01-14 14:49:24 -04:00
|
|
|
#undef SetIntFlag
|
|
|
|
#undef SetDblFlag
|
2010-05-09 13:14:21 -03:00
|
|
|
|
|
|
|
if (PyErr_Occurred()) {
|
|
|
|
Py_CLEAR(floatinfo);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return floatinfo;
|
2007-12-01 08:22:32 -04:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
PyObject *
|
|
|
|
PyFloat_FromDouble(double fval)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
register PyFloatObject *op;
|
|
|
|
if (free_list == NULL) {
|
|
|
|
if ((free_list = fill_free_list()) == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* Inline PyObject_New */
|
|
|
|
op = free_list;
|
|
|
|
free_list = (PyFloatObject *)Py_TYPE(op);
|
|
|
|
PyObject_INIT(op, &PyFloat_Type);
|
|
|
|
op->ob_fval = fval;
|
|
|
|
return (PyObject *) op;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1999-10-12 16:54:53 -03:00
|
|
|
PyObject *
|
2007-03-18 15:35:15 -03:00
|
|
|
PyFloat_FromString(PyObject *v)
|
1999-10-12 16:54:53 -03:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
const char *s, *last, *end;
|
|
|
|
double x;
|
|
|
|
char buffer[256]; /* for errors */
|
|
|
|
char *s_buffer = NULL;
|
|
|
|
Py_ssize_t len;
|
|
|
|
PyObject *result = NULL;
|
|
|
|
|
|
|
|
if (PyUnicode_Check(v)) {
|
|
|
|
s_buffer = (char *)PyMem_MALLOC(PyUnicode_GET_SIZE(v)+1);
|
|
|
|
if (s_buffer == NULL)
|
|
|
|
return PyErr_NoMemory();
|
|
|
|
if (PyUnicode_EncodeDecimal(PyUnicode_AS_UNICODE(v),
|
|
|
|
PyUnicode_GET_SIZE(v),
|
|
|
|
s_buffer,
|
|
|
|
NULL))
|
|
|
|
goto error;
|
|
|
|
s = s_buffer;
|
|
|
|
len = strlen(s);
|
|
|
|
}
|
|
|
|
else if (PyObject_AsCharBuffer(v, &s, &len)) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"float() argument must be a string or a number");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
last = s + len;
|
|
|
|
|
|
|
|
while (Py_ISSPACE(*s))
|
|
|
|
s++;
|
|
|
|
/* We don't care about overflow or underflow. If the platform
|
|
|
|
* supports them, infinities and signed zeroes (on underflow) are
|
|
|
|
* fine. */
|
|
|
|
x = PyOS_string_to_double(s, (char **)&end, NULL);
|
|
|
|
if (x == -1.0 && PyErr_Occurred())
|
|
|
|
goto error;
|
|
|
|
while (Py_ISSPACE(*end))
|
|
|
|
end++;
|
|
|
|
if (end == last)
|
|
|
|
result = PyFloat_FromDouble(x);
|
|
|
|
else {
|
|
|
|
PyOS_snprintf(buffer, sizeof(buffer),
|
|
|
|
"invalid literal for float(): %.200s", s);
|
|
|
|
PyErr_SetString(PyExc_ValueError, buffer);
|
|
|
|
result = NULL;
|
|
|
|
}
|
2009-05-03 17:33:40 -03:00
|
|
|
|
2007-05-15 17:43:51 -03:00
|
|
|
error:
|
2010-05-09 13:14:21 -03:00
|
|
|
if (s_buffer)
|
|
|
|
PyMem_FREE(s_buffer);
|
|
|
|
return result;
|
1999-10-12 16:54:53 -03:00
|
|
|
}
|
|
|
|
|
1993-06-17 09:35:49 -03:00
|
|
|
static void
|
2000-07-09 02:02:18 -03:00
|
|
|
float_dealloc(PyFloatObject *op)
|
1992-03-27 13:28:44 -04:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
if (PyFloat_CheckExact(op)) {
|
|
|
|
Py_TYPE(op) = (struct _typeobject *)free_list;
|
|
|
|
free_list = op;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
Py_TYPE(op)->tp_free((PyObject *)op);
|
1992-03-27 13:28:44 -04:00
|
|
|
}
|
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
double
|
2000-07-09 02:02:18 -03:00
|
|
|
PyFloat_AsDouble(PyObject *op)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
PyNumberMethods *nb;
|
|
|
|
PyFloatObject *fo;
|
|
|
|
double val;
|
|
|
|
|
|
|
|
if (op && PyFloat_Check(op))
|
|
|
|
return PyFloat_AS_DOUBLE((PyFloatObject*) op);
|
|
|
|
|
|
|
|
if (op == NULL) {
|
|
|
|
PyErr_BadArgument();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((nb = Py_TYPE(op)->tp_as_number) == NULL || nb->nb_float == NULL) {
|
|
|
|
PyErr_SetString(PyExc_TypeError, "a float is required");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
fo = (PyFloatObject*) (*nb->nb_float) (op);
|
|
|
|
if (fo == NULL)
|
|
|
|
return -1;
|
|
|
|
if (!PyFloat_Check(fo)) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"nb_float should return float object");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
val = PyFloat_AS_DOUBLE(fo);
|
|
|
|
Py_DECREF(fo);
|
|
|
|
|
|
|
|
return val;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
2001-01-03 21:44:34 -04:00
|
|
|
/* Macro and helper that convert PyObject obj to a C double and store
|
2007-09-21 17:19:23 -03:00
|
|
|
the value in dbl. If conversion to double raises an exception, obj is
|
2001-12-11 16:31:34 -04:00
|
|
|
set to NULL, and the function invoking this macro returns NULL. If
|
|
|
|
obj is not of float, int or long type, Py_NotImplemented is incref'ed,
|
|
|
|
stored in obj, and returned from the function invoking this macro.
|
|
|
|
*/
|
2010-05-09 13:14:21 -03:00
|
|
|
#define CONVERT_TO_DOUBLE(obj, dbl) \
|
|
|
|
if (PyFloat_Check(obj)) \
|
|
|
|
dbl = PyFloat_AS_DOUBLE(obj); \
|
|
|
|
else if (convert_to_double(&(obj), &(dbl)) < 0) \
|
|
|
|
return obj;
|
2001-01-03 21:44:34 -04:00
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Methods */
|
|
|
|
|
2001-01-03 21:44:34 -04:00
|
|
|
static int
|
2001-09-04 02:14:19 -03:00
|
|
|
convert_to_double(PyObject **v, double *dbl)
|
2001-01-03 21:44:34 -04:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
register PyObject *obj = *v;
|
|
|
|
|
|
|
|
if (PyLong_Check(obj)) {
|
|
|
|
*dbl = PyLong_AsDouble(obj);
|
|
|
|
if (*dbl == -1.0 && PyErr_Occurred()) {
|
|
|
|
*v = NULL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_INCREF(Py_NotImplemented);
|
|
|
|
*v = Py_NotImplemented;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
2001-01-03 21:44:34 -04:00
|
|
|
}
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
static PyObject *
|
2009-05-05 11:04:18 -03:00
|
|
|
float_str_or_repr(PyFloatObject *v, int precision, char format_code)
|
2009-04-16 17:16:10 -03:00
|
|
|
{
|
|
|
|
PyObject *result;
|
|
|
|
char *buf = PyOS_double_to_string(PyFloat_AS_DOUBLE(v),
|
2009-05-05 11:04:18 -03:00
|
|
|
format_code, precision,
|
|
|
|
Py_DTSF_ADD_DOT_0,
|
2009-04-16 17:16:10 -03:00
|
|
|
NULL);
|
|
|
|
if (!buf)
|
2010-05-09 13:14:21 -03:00
|
|
|
return PyErr_NoMemory();
|
2009-04-16 17:16:10 -03:00
|
|
|
result = PyUnicode_FromString(buf);
|
|
|
|
PyMem_Free(buf);
|
|
|
|
return result;
|
|
|
|
}
|
1999-12-23 15:00:28 -04:00
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2000-07-09 02:02:18 -03:00
|
|
|
float_repr(PyFloatObject *v)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2009-05-05 11:04:18 -03:00
|
|
|
return float_str_or_repr(v, 0, 'r');
|
1999-12-23 15:00:28 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2000-07-09 02:02:18 -03:00
|
|
|
float_str(PyFloatObject *v)
|
1999-12-23 15:00:28 -04:00
|
|
|
{
|
2009-05-05 11:04:18 -03:00
|
|
|
return float_str_or_repr(v, PyFloat_STR_PRECISION, 'g');
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
2004-09-23 05:06:40 -03:00
|
|
|
/* Comparison is pretty much a nightmare. When comparing float to float,
|
|
|
|
* we do it as straightforwardly (and long-windedly) as conceivable, so
|
|
|
|
* that, e.g., Python x == y delivers the same result as the platform
|
|
|
|
* C x == y when x and/or y is a NaN.
|
|
|
|
* When mixing float with an integer type, there's no good *uniform* approach.
|
|
|
|
* Converting the double to an integer obviously doesn't work, since we
|
|
|
|
* may lose info from fractional bits. Converting the integer to a double
|
|
|
|
* also has two failure modes: (1) a long int may trigger overflow (too
|
|
|
|
* large to fit in the dynamic range of a C double); (2) even a C long may have
|
|
|
|
* more bits than fit in a C double (e.g., on a a 64-bit box long may have
|
|
|
|
* 63 bits of precision, but a C double probably has only 53), and then
|
|
|
|
* we can falsely claim equality when low-order integer bits are lost by
|
|
|
|
* coercion to double. So this part is painful too.
|
|
|
|
*/
|
|
|
|
|
2004-02-19 15:35:22 -04:00
|
|
|
static PyObject*
|
|
|
|
float_richcompare(PyObject *v, PyObject *w, int op)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
double i, j;
|
|
|
|
int r = 0;
|
|
|
|
|
|
|
|
assert(PyFloat_Check(v));
|
|
|
|
i = PyFloat_AS_DOUBLE(v);
|
|
|
|
|
|
|
|
/* Switch on the type of w. Set i and j to doubles to be compared,
|
|
|
|
* and op to the richcomp to use.
|
|
|
|
*/
|
|
|
|
if (PyFloat_Check(w))
|
|
|
|
j = PyFloat_AS_DOUBLE(w);
|
|
|
|
|
|
|
|
else if (!Py_IS_FINITE(i)) {
|
|
|
|
if (PyLong_Check(w))
|
|
|
|
/* If i is an infinity, its magnitude exceeds any
|
|
|
|
* finite integer, so it doesn't matter which int we
|
|
|
|
* compare i with. If i is a NaN, similarly.
|
|
|
|
*/
|
|
|
|
j = 0.0;
|
|
|
|
else
|
|
|
|
goto Unimplemented;
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (PyLong_Check(w)) {
|
|
|
|
int vsign = i == 0.0 ? 0 : i < 0.0 ? -1 : 1;
|
|
|
|
int wsign = _PyLong_Sign(w);
|
|
|
|
size_t nbits;
|
|
|
|
int exponent;
|
|
|
|
|
|
|
|
if (vsign != wsign) {
|
|
|
|
/* Magnitudes are irrelevant -- the signs alone
|
|
|
|
* determine the outcome.
|
|
|
|
*/
|
|
|
|
i = (double)vsign;
|
|
|
|
j = (double)wsign;
|
|
|
|
goto Compare;
|
|
|
|
}
|
|
|
|
/* The signs are the same. */
|
|
|
|
/* Convert w to a double if it fits. In particular, 0 fits. */
|
|
|
|
nbits = _PyLong_NumBits(w);
|
|
|
|
if (nbits == (size_t)-1 && PyErr_Occurred()) {
|
|
|
|
/* This long is so large that size_t isn't big enough
|
|
|
|
* to hold the # of bits. Replace with little doubles
|
|
|
|
* that give the same outcome -- w is so large that
|
|
|
|
* its magnitude must exceed the magnitude of any
|
|
|
|
* finite float.
|
|
|
|
*/
|
|
|
|
PyErr_Clear();
|
|
|
|
i = (double)vsign;
|
|
|
|
assert(wsign != 0);
|
|
|
|
j = wsign * 2.0;
|
|
|
|
goto Compare;
|
|
|
|
}
|
|
|
|
if (nbits <= 48) {
|
|
|
|
j = PyLong_AsDouble(w);
|
|
|
|
/* It's impossible that <= 48 bits overflowed. */
|
|
|
|
assert(j != -1.0 || ! PyErr_Occurred());
|
|
|
|
goto Compare;
|
|
|
|
}
|
|
|
|
assert(wsign != 0); /* else nbits was 0 */
|
|
|
|
assert(vsign != 0); /* if vsign were 0, then since wsign is
|
|
|
|
* not 0, we would have taken the
|
|
|
|
* vsign != wsign branch at the start */
|
|
|
|
/* We want to work with non-negative numbers. */
|
|
|
|
if (vsign < 0) {
|
|
|
|
/* "Multiply both sides" by -1; this also swaps the
|
|
|
|
* comparator.
|
|
|
|
*/
|
|
|
|
i = -i;
|
|
|
|
op = _Py_SwappedOp[op];
|
|
|
|
}
|
|
|
|
assert(i > 0.0);
|
|
|
|
(void) frexp(i, &exponent);
|
|
|
|
/* exponent is the # of bits in v before the radix point;
|
|
|
|
* we know that nbits (the # of bits in w) > 48 at this point
|
|
|
|
*/
|
|
|
|
if (exponent < 0 || (size_t)exponent < nbits) {
|
|
|
|
i = 1.0;
|
|
|
|
j = 2.0;
|
|
|
|
goto Compare;
|
|
|
|
}
|
|
|
|
if ((size_t)exponent > nbits) {
|
|
|
|
i = 2.0;
|
|
|
|
j = 1.0;
|
|
|
|
goto Compare;
|
|
|
|
}
|
|
|
|
/* v and w have the same number of bits before the radix
|
|
|
|
* point. Construct two longs that have the same comparison
|
|
|
|
* outcome.
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
double fracpart;
|
|
|
|
double intpart;
|
|
|
|
PyObject *result = NULL;
|
|
|
|
PyObject *one = NULL;
|
|
|
|
PyObject *vv = NULL;
|
|
|
|
PyObject *ww = w;
|
|
|
|
|
|
|
|
if (wsign < 0) {
|
|
|
|
ww = PyNumber_Negative(w);
|
|
|
|
if (ww == NULL)
|
|
|
|
goto Error;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
Py_INCREF(ww);
|
|
|
|
|
|
|
|
fracpart = modf(i, &intpart);
|
|
|
|
vv = PyLong_FromDouble(intpart);
|
|
|
|
if (vv == NULL)
|
|
|
|
goto Error;
|
|
|
|
|
|
|
|
if (fracpart != 0.0) {
|
|
|
|
/* Shift left, and or a 1 bit into vv
|
|
|
|
* to represent the lost fraction.
|
|
|
|
*/
|
|
|
|
PyObject *temp;
|
|
|
|
|
|
|
|
one = PyLong_FromLong(1);
|
|
|
|
if (one == NULL)
|
|
|
|
goto Error;
|
|
|
|
|
|
|
|
temp = PyNumber_Lshift(ww, one);
|
|
|
|
if (temp == NULL)
|
|
|
|
goto Error;
|
|
|
|
Py_DECREF(ww);
|
|
|
|
ww = temp;
|
|
|
|
|
|
|
|
temp = PyNumber_Lshift(vv, one);
|
|
|
|
if (temp == NULL)
|
|
|
|
goto Error;
|
|
|
|
Py_DECREF(vv);
|
|
|
|
vv = temp;
|
|
|
|
|
|
|
|
temp = PyNumber_Or(vv, one);
|
|
|
|
if (temp == NULL)
|
|
|
|
goto Error;
|
|
|
|
Py_DECREF(vv);
|
|
|
|
vv = temp;
|
|
|
|
}
|
|
|
|
|
|
|
|
r = PyObject_RichCompareBool(vv, ww, op);
|
|
|
|
if (r < 0)
|
|
|
|
goto Error;
|
|
|
|
result = PyBool_FromLong(r);
|
|
|
|
Error:
|
|
|
|
Py_XDECREF(vv);
|
|
|
|
Py_XDECREF(ww);
|
|
|
|
Py_XDECREF(one);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
} /* else if (PyLong_Check(w)) */
|
|
|
|
|
|
|
|
else /* w isn't float, int, or long */
|
|
|
|
goto Unimplemented;
|
2004-09-23 05:06:40 -03:00
|
|
|
|
|
|
|
Compare:
|
2010-05-09 13:14:21 -03:00
|
|
|
PyFPE_START_PROTECT("richcompare", return NULL)
|
|
|
|
switch (op) {
|
|
|
|
case Py_EQ:
|
|
|
|
r = i == j;
|
|
|
|
break;
|
|
|
|
case Py_NE:
|
|
|
|
r = i != j;
|
|
|
|
break;
|
|
|
|
case Py_LE:
|
|
|
|
r = i <= j;
|
|
|
|
break;
|
|
|
|
case Py_GE:
|
|
|
|
r = i >= j;
|
|
|
|
break;
|
|
|
|
case Py_LT:
|
|
|
|
r = i < j;
|
|
|
|
break;
|
|
|
|
case Py_GT:
|
|
|
|
r = i > j;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
PyFPE_END_PROTECT(r)
|
|
|
|
return PyBool_FromLong(r);
|
2004-09-23 05:06:40 -03:00
|
|
|
|
|
|
|
Unimplemented:
|
2010-05-09 13:14:21 -03:00
|
|
|
Py_INCREF(Py_NotImplemented);
|
|
|
|
return Py_NotImplemented;
|
2004-02-19 15:35:22 -04:00
|
|
|
}
|
|
|
|
|
1993-03-29 06:43:31 -04:00
|
|
|
static long
|
2000-07-09 02:02:18 -03:00
|
|
|
float_hash(PyFloatObject *v)
|
1993-03-29 06:43:31 -04:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
return _Py_HashDouble(v->ob_fval);
|
1993-03-29 06:43:31 -04:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2001-01-03 21:44:34 -04:00
|
|
|
float_add(PyObject *v, PyObject *w)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
double a,b;
|
|
|
|
CONVERT_TO_DOUBLE(v, a);
|
|
|
|
CONVERT_TO_DOUBLE(w, b);
|
|
|
|
PyFPE_START_PROTECT("add", return 0)
|
|
|
|
a = a + b;
|
|
|
|
PyFPE_END_PROTECT(a)
|
|
|
|
return PyFloat_FromDouble(a);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2001-01-03 21:44:34 -04:00
|
|
|
float_sub(PyObject *v, PyObject *w)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
double a,b;
|
|
|
|
CONVERT_TO_DOUBLE(v, a);
|
|
|
|
CONVERT_TO_DOUBLE(w, b);
|
|
|
|
PyFPE_START_PROTECT("subtract", return 0)
|
|
|
|
a = a - b;
|
|
|
|
PyFPE_END_PROTECT(a)
|
|
|
|
return PyFloat_FromDouble(a);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2001-01-03 21:44:34 -04:00
|
|
|
float_mul(PyObject *v, PyObject *w)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
double a,b;
|
|
|
|
CONVERT_TO_DOUBLE(v, a);
|
|
|
|
CONVERT_TO_DOUBLE(w, b);
|
|
|
|
PyFPE_START_PROTECT("multiply", return 0)
|
|
|
|
a = a * b;
|
|
|
|
PyFPE_END_PROTECT(a)
|
|
|
|
return PyFloat_FromDouble(a);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2001-01-03 21:44:34 -04:00
|
|
|
float_div(PyObject *v, PyObject *w)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
double a,b;
|
|
|
|
CONVERT_TO_DOUBLE(v, a);
|
|
|
|
CONVERT_TO_DOUBLE(w, b);
|
2008-04-18 21:31:39 -03:00
|
|
|
#ifdef Py_NAN
|
2010-05-09 13:14:21 -03:00
|
|
|
if (b == 0.0) {
|
|
|
|
PyErr_SetString(PyExc_ZeroDivisionError,
|
|
|
|
"float division");
|
|
|
|
return NULL;
|
|
|
|
}
|
2008-04-18 21:31:39 -03:00
|
|
|
#endif
|
2010-05-09 13:14:21 -03:00
|
|
|
PyFPE_START_PROTECT("divide", return 0)
|
|
|
|
a = a / b;
|
|
|
|
PyFPE_END_PROTECT(a)
|
|
|
|
return PyFloat_FromDouble(a);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2001-01-03 21:44:34 -04:00
|
|
|
float_rem(PyObject *v, PyObject *w)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
double vx, wx;
|
|
|
|
double mod;
|
|
|
|
CONVERT_TO_DOUBLE(v, vx);
|
|
|
|
CONVERT_TO_DOUBLE(w, wx);
|
2008-04-18 21:31:39 -03:00
|
|
|
#ifdef Py_NAN
|
2010-05-09 13:14:21 -03:00
|
|
|
if (wx == 0.0) {
|
|
|
|
PyErr_SetString(PyExc_ZeroDivisionError,
|
|
|
|
"float modulo");
|
|
|
|
return NULL;
|
|
|
|
}
|
2008-04-18 21:31:39 -03:00
|
|
|
#endif
|
2010-05-09 13:14:21 -03:00
|
|
|
PyFPE_START_PROTECT("modulo", return 0)
|
|
|
|
mod = fmod(vx, wx);
|
2010-12-04 09:04:18 -04:00
|
|
|
if (mod) {
|
|
|
|
/* ensure the remainder has the same sign as the denominator */
|
|
|
|
if ((wx < 0) != (mod < 0)) {
|
|
|
|
mod += wx;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* the remainder is zero, and in the presence of signed zeroes
|
|
|
|
fmod returns different results across platforms; ensure
|
|
|
|
it has the same sign as the denominator; we'd like to do
|
|
|
|
"mod = wx * 0.0", but that may get optimized away */
|
|
|
|
mod *= mod; /* hide "mod = +0" from optimizer */
|
|
|
|
if (wx < 0.0)
|
|
|
|
mod = -mod;
|
2010-05-09 13:14:21 -03:00
|
|
|
}
|
|
|
|
PyFPE_END_PROTECT(mod)
|
|
|
|
return PyFloat_FromDouble(mod);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2001-01-03 21:44:34 -04:00
|
|
|
float_divmod(PyObject *v, PyObject *w)
|
1991-05-05 17:07:00 -03:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
double vx, wx;
|
|
|
|
double div, mod, floordiv;
|
|
|
|
CONVERT_TO_DOUBLE(v, vx);
|
|
|
|
CONVERT_TO_DOUBLE(w, wx);
|
|
|
|
if (wx == 0.0) {
|
|
|
|
PyErr_SetString(PyExc_ZeroDivisionError, "float divmod()");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyFPE_START_PROTECT("divmod", return 0)
|
|
|
|
mod = fmod(vx, wx);
|
|
|
|
/* fmod is typically exact, so vx-mod is *mathematically* an
|
|
|
|
exact multiple of wx. But this is fp arithmetic, and fp
|
|
|
|
vx - mod is an approximation; the result is that div may
|
|
|
|
not be an exact integral value after the division, although
|
|
|
|
it will always be very close to one.
|
|
|
|
*/
|
|
|
|
div = (vx - mod) / wx;
|
|
|
|
if (mod) {
|
|
|
|
/* ensure the remainder has the same sign as the denominator */
|
|
|
|
if ((wx < 0) != (mod < 0)) {
|
|
|
|
mod += wx;
|
|
|
|
div -= 1.0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* the remainder is zero, and in the presence of signed zeroes
|
|
|
|
fmod returns different results across platforms; ensure
|
|
|
|
it has the same sign as the denominator; we'd like to do
|
|
|
|
"mod = wx * 0.0", but that may get optimized away */
|
|
|
|
mod *= mod; /* hide "mod = +0" from optimizer */
|
|
|
|
if (wx < 0.0)
|
|
|
|
mod = -mod;
|
|
|
|
}
|
|
|
|
/* snap quotient to nearest integral value */
|
|
|
|
if (div) {
|
|
|
|
floordiv = floor(div);
|
|
|
|
if (div - floordiv > 0.5)
|
|
|
|
floordiv += 1.0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* div is zero - get the same sign as the true quotient */
|
|
|
|
div *= div; /* hide "div = +0" from optimizers */
|
|
|
|
floordiv = div * vx / wx; /* zero w/ sign of vx/wx */
|
|
|
|
}
|
|
|
|
PyFPE_END_PROTECT(floordiv)
|
|
|
|
return Py_BuildValue("(dd)", floordiv, mod);
|
1991-05-05 17:07:00 -03:00
|
|
|
}
|
|
|
|
|
2001-12-11 15:57:24 -04:00
|
|
|
static PyObject *
|
|
|
|
float_floor_div(PyObject *v, PyObject *w)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
PyObject *t, *r;
|
|
|
|
|
|
|
|
t = float_divmod(v, w);
|
|
|
|
if (t == NULL || t == Py_NotImplemented)
|
|
|
|
return t;
|
|
|
|
assert(PyTuple_CheckExact(t));
|
|
|
|
r = PyTuple_GET_ITEM(t, 0);
|
|
|
|
Py_INCREF(r);
|
|
|
|
Py_DECREF(t);
|
|
|
|
return r;
|
2001-12-11 15:57:24 -04:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2001-01-03 21:44:34 -04:00
|
|
|
float_pow(PyObject *v, PyObject *w, PyObject *z)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
double iv, iw, ix;
|
|
|
|
|
|
|
|
if ((PyObject *)z != Py_None) {
|
|
|
|
PyErr_SetString(PyExc_TypeError, "pow() 3rd argument not "
|
|
|
|
"allowed unless all arguments are integers");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
CONVERT_TO_DOUBLE(v, iv);
|
|
|
|
CONVERT_TO_DOUBLE(w, iw);
|
|
|
|
|
|
|
|
/* Sort out special cases here instead of relying on pow() */
|
|
|
|
if (iw == 0) { /* v**0 is 1, even 0**0 */
|
|
|
|
return PyFloat_FromDouble(1.0);
|
|
|
|
}
|
|
|
|
if (iv == 0.0) { /* 0**w is error if w<0, else 1 */
|
|
|
|
if (iw < 0.0) {
|
|
|
|
PyErr_SetString(PyExc_ZeroDivisionError,
|
|
|
|
"0.0 cannot be raised to a negative power");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return PyFloat_FromDouble(0.0);
|
|
|
|
}
|
|
|
|
if (iv == 1.0) { /* 1**w is 1, even 1**inf and 1**nan */
|
|
|
|
return PyFloat_FromDouble(1.0);
|
|
|
|
}
|
|
|
|
if (iv < 0.0) {
|
|
|
|
/* Whether this is an error is a mess, and bumps into libm
|
|
|
|
* bugs so we have to figure it out ourselves.
|
|
|
|
*/
|
|
|
|
if (iw != floor(iw)) {
|
|
|
|
/* Negative numbers raised to fractional powers
|
|
|
|
* become complex.
|
|
|
|
*/
|
|
|
|
return PyComplex_Type.tp_as_number->nb_power(v, w, z);
|
|
|
|
}
|
|
|
|
/* iw is an exact integer, albeit perhaps a very large one.
|
|
|
|
* -1 raised to an exact integer should never be exceptional.
|
|
|
|
* Alas, some libms (chiefly glibc as of early 2003) return
|
|
|
|
* NaN and set EDOM on pow(-1, large_int) if the int doesn't
|
|
|
|
* happen to be representable in a *C* integer. That's a
|
|
|
|
* bug; we let that slide in math.pow() (which currently
|
|
|
|
* reflects all platform accidents), but not for Python's **.
|
|
|
|
*/
|
|
|
|
if (iv == -1.0 && Py_IS_FINITE(iw)) {
|
|
|
|
/* Return 1 if iw is even, -1 if iw is odd; there's
|
|
|
|
* no guarantee that any C integral type is big
|
|
|
|
* enough to hold iw, so we have to check this
|
|
|
|
* indirectly.
|
|
|
|
*/
|
|
|
|
ix = floor(iw * 0.5) * 2.0;
|
|
|
|
return PyFloat_FromDouble(ix == iw ? 1.0 : -1.0);
|
|
|
|
}
|
|
|
|
/* Else iv != -1.0, and overflow or underflow are possible.
|
|
|
|
* Unless we're to write pow() ourselves, we have to trust
|
|
|
|
* the platform to do this correctly.
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
errno = 0;
|
|
|
|
PyFPE_START_PROTECT("pow", return NULL)
|
|
|
|
ix = pow(iv, iw);
|
|
|
|
PyFPE_END_PROTECT(ix)
|
|
|
|
Py_ADJUST_ERANGE1(ix);
|
|
|
|
if (errno != 0) {
|
|
|
|
/* We don't expect any errno value other than ERANGE, but
|
|
|
|
* the range of libm bugs appears unbounded.
|
|
|
|
*/
|
|
|
|
PyErr_SetFromErrno(errno == ERANGE ? PyExc_OverflowError :
|
|
|
|
PyExc_ValueError);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return PyFloat_FromDouble(ix);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2000-07-09 02:02:18 -03:00
|
|
|
float_neg(PyFloatObject *v)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
return PyFloat_FromDouble(-v->ob_fval);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2000-07-09 02:02:18 -03:00
|
|
|
float_abs(PyFloatObject *v)
|
1991-05-05 17:07:00 -03:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
return PyFloat_FromDouble(fabs(v->ob_fval));
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1991-05-14 08:57:01 -03:00
|
|
|
static int
|
2006-11-28 15:15:13 -04:00
|
|
|
float_bool(PyFloatObject *v)
|
1991-05-14 08:57:01 -03:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
return v->ob_fval != 0.0;
|
1991-05-14 08:57:01 -03:00
|
|
|
}
|
|
|
|
|
2008-04-18 21:31:39 -03:00
|
|
|
static PyObject *
|
|
|
|
float_is_integer(PyObject *v)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
double x = PyFloat_AsDouble(v);
|
|
|
|
PyObject *o;
|
|
|
|
|
|
|
|
if (x == -1.0 && PyErr_Occurred())
|
|
|
|
return NULL;
|
|
|
|
if (!Py_IS_FINITE(x))
|
|
|
|
Py_RETURN_FALSE;
|
|
|
|
errno = 0;
|
|
|
|
PyFPE_START_PROTECT("is_integer", return NULL)
|
|
|
|
o = (floor(x) == x) ? Py_True : Py_False;
|
|
|
|
PyFPE_END_PROTECT(x)
|
|
|
|
if (errno != 0) {
|
|
|
|
PyErr_SetFromErrno(errno == ERANGE ? PyExc_OverflowError :
|
|
|
|
PyExc_ValueError);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
Py_INCREF(o);
|
|
|
|
return o;
|
2008-04-18 21:31:39 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
static PyObject *
|
|
|
|
float_is_inf(PyObject *v)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
double x = PyFloat_AsDouble(v);
|
|
|
|
if (x == -1.0 && PyErr_Occurred())
|
|
|
|
return NULL;
|
|
|
|
return PyBool_FromLong((long)Py_IS_INFINITY(x));
|
2008-04-18 21:31:39 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
float_is_nan(PyObject *v)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
double x = PyFloat_AsDouble(v);
|
|
|
|
if (x == -1.0 && PyErr_Occurred())
|
|
|
|
return NULL;
|
|
|
|
return PyBool_FromLong((long)Py_IS_NAN(x));
|
2008-04-18 21:31:39 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
float_is_finite(PyObject *v)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
double x = PyFloat_AsDouble(v);
|
|
|
|
if (x == -1.0 && PyErr_Occurred())
|
|
|
|
return NULL;
|
|
|
|
return PyBool_FromLong((long)Py_IS_FINITE(x));
|
2008-04-18 21:31:39 -03:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2002-11-19 16:49:15 -04:00
|
|
|
static PyObject *
|
2007-08-23 19:07:24 -03:00
|
|
|
float_trunc(PyObject *v)
|
1992-09-12 08:09:23 -03:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
double x = PyFloat_AsDouble(v);
|
|
|
|
double wholepart; /* integral portion of x, rounded toward 0 */
|
|
|
|
|
|
|
|
(void)modf(x, &wholepart);
|
|
|
|
/* Try to get out cheap if this fits in a Python int. The attempt
|
|
|
|
* to cast to long must be protected, as C doesn't define what
|
|
|
|
* happens if the double is too big to fit in a long. Some rare
|
|
|
|
* systems raise an exception then (RISCOS was mentioned as one,
|
|
|
|
* and someone using a non-default option on Sun also bumped into
|
|
|
|
* that). Note that checking for >= and <= LONG_{MIN,MAX} would
|
|
|
|
* still be vulnerable: if a long has more bits of precision than
|
|
|
|
* a double, casting MIN/MAX to double may yield an approximation,
|
|
|
|
* and if that's rounded up, then, e.g., wholepart=LONG_MAX+1 would
|
|
|
|
* yield true from the C expression wholepart<=LONG_MAX, despite
|
|
|
|
* that wholepart is actually greater than LONG_MAX.
|
|
|
|
*/
|
|
|
|
if (LONG_MIN < wholepart && wholepart < LONG_MAX) {
|
|
|
|
const long aslong = (long)wholepart;
|
|
|
|
return PyLong_FromLong(aslong);
|
|
|
|
}
|
|
|
|
return PyLong_FromDouble(wholepart);
|
1992-09-12 08:09:23 -03:00
|
|
|
}
|
|
|
|
|
2009-04-18 08:48:33 -03:00
|
|
|
/* double_round: rounds a finite double to the closest multiple of
|
|
|
|
10**-ndigits; here ndigits is within reasonable bounds (typically, -308 <=
|
|
|
|
ndigits <= 323). Returns a Python float, or sets a Python error and
|
|
|
|
returns NULL on failure (OverflowError and memory errors are possible). */
|
|
|
|
|
|
|
|
#ifndef PY_NO_SHORT_FLOAT_REPR
|
|
|
|
/* version of double_round that uses the correctly-rounded string<->double
|
|
|
|
conversions from Python/dtoa.c */
|
|
|
|
|
2007-08-23 19:07:24 -03:00
|
|
|
static PyObject *
|
2009-04-18 08:48:33 -03:00
|
|
|
double_round(double x, int ndigits) {
|
|
|
|
|
2010-05-09 13:14:21 -03:00
|
|
|
double rounded;
|
|
|
|
Py_ssize_t buflen, mybuflen=100;
|
|
|
|
char *buf, *buf_end, shortbuf[100], *mybuf=shortbuf;
|
|
|
|
int decpt, sign;
|
|
|
|
PyObject *result = NULL;
|
|
|
|
|
|
|
|
/* round to a decimal string */
|
|
|
|
buf = _Py_dg_dtoa(x, 3, ndigits, &decpt, &sign, &buf_end);
|
|
|
|
if (buf == NULL) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get new buffer if shortbuf is too small. Space needed <= buf_end -
|
|
|
|
buf + 8: (1 extra for '0', 1 for sign, 5 for exp, 1 for '\0'). */
|
|
|
|
buflen = buf_end - buf;
|
|
|
|
if (buflen + 8 > mybuflen) {
|
|
|
|
mybuflen = buflen+8;
|
|
|
|
mybuf = (char *)PyMem_Malloc(mybuflen);
|
|
|
|
if (mybuf == NULL) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* copy buf to mybuf, adding exponent, sign and leading 0 */
|
|
|
|
PyOS_snprintf(mybuf, mybuflen, "%s0%se%d", (sign ? "-" : ""),
|
|
|
|
buf, decpt - (int)buflen);
|
|
|
|
|
|
|
|
/* and convert the resulting string back to a double */
|
|
|
|
errno = 0;
|
|
|
|
rounded = _Py_dg_strtod(mybuf, NULL);
|
|
|
|
if (errno == ERANGE && fabs(rounded) >= 1.)
|
|
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
|
|
"rounded value too large to represent");
|
|
|
|
else
|
|
|
|
result = PyFloat_FromDouble(rounded);
|
|
|
|
|
|
|
|
/* done computing value; now clean up */
|
|
|
|
if (mybuf != shortbuf)
|
|
|
|
PyMem_Free(mybuf);
|
2009-04-18 08:48:33 -03:00
|
|
|
exit:
|
2010-05-09 13:14:21 -03:00
|
|
|
_Py_dg_freedtoa(buf);
|
|
|
|
return result;
|
2009-04-18 08:48:33 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
#else /* PY_NO_SHORT_FLOAT_REPR */
|
|
|
|
|
|
|
|
/* fallback version, to be used when correctly rounded binary<->decimal
|
|
|
|
conversions aren't available */
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
double_round(double x, int ndigits) {
|
2010-05-09 13:14:21 -03:00
|
|
|
double pow1, pow2, y, z;
|
|
|
|
if (ndigits >= 0) {
|
|
|
|
if (ndigits > 22) {
|
|
|
|
/* pow1 and pow2 are each safe from overflow, but
|
|
|
|
pow1*pow2 ~= pow(10.0, ndigits) might overflow */
|
|
|
|
pow1 = pow(10.0, (double)(ndigits-22));
|
|
|
|
pow2 = 1e22;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
pow1 = pow(10.0, (double)ndigits);
|
|
|
|
pow2 = 1.0;
|
|
|
|
}
|
|
|
|
y = (x*pow1)*pow2;
|
|
|
|
/* if y overflows, then rounded value is exactly x */
|
|
|
|
if (!Py_IS_FINITE(y))
|
|
|
|
return PyFloat_FromDouble(x);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
pow1 = pow(10.0, (double)-ndigits);
|
|
|
|
pow2 = 1.0; /* unused; silences a gcc compiler warning */
|
|
|
|
y = x / pow1;
|
|
|
|
}
|
|
|
|
|
|
|
|
z = round(y);
|
|
|
|
if (fabs(y-z) == 0.5)
|
|
|
|
/* halfway between two integers; use round-half-even */
|
|
|
|
z = 2.0*round(y/2.0);
|
|
|
|
|
|
|
|
if (ndigits >= 0)
|
|
|
|
z = (z / pow2) / pow1;
|
|
|
|
else
|
|
|
|
z *= pow1;
|
|
|
|
|
|
|
|
/* if computation resulted in overflow, raise OverflowError */
|
|
|
|
if (!Py_IS_FINITE(z)) {
|
|
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
|
|
"overflow occurred during round");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return PyFloat_FromDouble(z);
|
2009-04-18 08:48:33 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* PY_NO_SHORT_FLOAT_REPR */
|
|
|
|
|
|
|
|
/* round a Python float v to the closest multiple of 10**-ndigits */
|
2007-08-23 19:07:24 -03:00
|
|
|
|
2009-04-18 08:48:33 -03:00
|
|
|
static PyObject *
|
|
|
|
float_round(PyObject *v, PyObject *args)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
double x, rounded;
|
|
|
|
PyObject *o_ndigits = NULL;
|
|
|
|
Py_ssize_t ndigits;
|
|
|
|
|
|
|
|
x = PyFloat_AsDouble(v);
|
|
|
|
if (!PyArg_ParseTuple(args, "|O", &o_ndigits))
|
|
|
|
return NULL;
|
|
|
|
if (o_ndigits == NULL) {
|
|
|
|
/* single-argument round: round to nearest integer */
|
|
|
|
rounded = round(x);
|
|
|
|
if (fabs(x-rounded) == 0.5)
|
|
|
|
/* halfway case: round to even */
|
|
|
|
rounded = 2.0*round(x/2.0);
|
|
|
|
return PyLong_FromDouble(rounded);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* interpret second argument as a Py_ssize_t; clips on overflow */
|
|
|
|
ndigits = PyNumber_AsSsize_t(o_ndigits, NULL);
|
|
|
|
if (ndigits == -1 && PyErr_Occurred())
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* nans and infinities round to themselves */
|
|
|
|
if (!Py_IS_FINITE(x))
|
|
|
|
return PyFloat_FromDouble(x);
|
|
|
|
|
|
|
|
/* Deal with extreme values for ndigits. For ndigits > NDIGITS_MAX, x
|
|
|
|
always rounds to itself. For ndigits < NDIGITS_MIN, x always
|
|
|
|
rounds to +-0.0. Here 0.30103 is an upper bound for log10(2). */
|
2009-04-18 08:48:33 -03:00
|
|
|
#define NDIGITS_MAX ((int)((DBL_MANT_DIG-DBL_MIN_EXP) * 0.30103))
|
|
|
|
#define NDIGITS_MIN (-(int)((DBL_MAX_EXP + 1) * 0.30103))
|
2010-05-09 13:14:21 -03:00
|
|
|
if (ndigits > NDIGITS_MAX)
|
|
|
|
/* return x */
|
|
|
|
return PyFloat_FromDouble(x);
|
|
|
|
else if (ndigits < NDIGITS_MIN)
|
|
|
|
/* return 0.0, but with sign of x */
|
|
|
|
return PyFloat_FromDouble(0.0*x);
|
|
|
|
else
|
|
|
|
/* finite x, and ndigits is not unreasonably large */
|
|
|
|
return double_round(x, (int)ndigits);
|
2009-04-18 08:48:33 -03:00
|
|
|
#undef NDIGITS_MAX
|
|
|
|
#undef NDIGITS_MIN
|
2007-08-23 19:07:24 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2000-07-09 02:02:18 -03:00
|
|
|
float_float(PyObject *v)
|
1992-09-12 08:09:23 -03:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
if (PyFloat_CheckExact(v))
|
|
|
|
Py_INCREF(v);
|
|
|
|
else
|
|
|
|
v = PyFloat_FromDouble(((PyFloatObject *)v)->ob_fval);
|
|
|
|
return v;
|
1992-09-12 08:09:23 -03:00
|
|
|
}
|
|
|
|
|
2008-07-16 08:30:51 -03:00
|
|
|
/* turn ASCII hex characters into integer values and vice versa */
|
|
|
|
|
|
|
|
static char
|
|
|
|
char_from_hex(int x)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
assert(0 <= x && x < 16);
|
|
|
|
return "0123456789abcdef"[x];
|
2008-07-16 08:30:51 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
hex_from_char(char c) {
|
2010-05-09 13:14:21 -03:00
|
|
|
int x;
|
|
|
|
switch(c) {
|
|
|
|
case '0':
|
|
|
|
x = 0;
|
|
|
|
break;
|
|
|
|
case '1':
|
|
|
|
x = 1;
|
|
|
|
break;
|
|
|
|
case '2':
|
|
|
|
x = 2;
|
|
|
|
break;
|
|
|
|
case '3':
|
|
|
|
x = 3;
|
|
|
|
break;
|
|
|
|
case '4':
|
|
|
|
x = 4;
|
|
|
|
break;
|
|
|
|
case '5':
|
|
|
|
x = 5;
|
|
|
|
break;
|
|
|
|
case '6':
|
|
|
|
x = 6;
|
|
|
|
break;
|
|
|
|
case '7':
|
|
|
|
x = 7;
|
|
|
|
break;
|
|
|
|
case '8':
|
|
|
|
x = 8;
|
|
|
|
break;
|
|
|
|
case '9':
|
|
|
|
x = 9;
|
|
|
|
break;
|
|
|
|
case 'a':
|
|
|
|
case 'A':
|
|
|
|
x = 10;
|
|
|
|
break;
|
|
|
|
case 'b':
|
|
|
|
case 'B':
|
|
|
|
x = 11;
|
|
|
|
break;
|
|
|
|
case 'c':
|
|
|
|
case 'C':
|
|
|
|
x = 12;
|
|
|
|
break;
|
|
|
|
case 'd':
|
|
|
|
case 'D':
|
|
|
|
x = 13;
|
|
|
|
break;
|
|
|
|
case 'e':
|
|
|
|
case 'E':
|
|
|
|
x = 14;
|
|
|
|
break;
|
|
|
|
case 'f':
|
|
|
|
case 'F':
|
|
|
|
x = 15;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
x = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return x;
|
2008-07-16 08:30:51 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* convert a float to a hexadecimal string */
|
|
|
|
|
|
|
|
/* TOHEX_NBITS is DBL_MANT_DIG rounded up to the next integer
|
|
|
|
of the form 4k+1. */
|
|
|
|
#define TOHEX_NBITS DBL_MANT_DIG + 3 - (DBL_MANT_DIG+2)%4
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
float_hex(PyObject *v)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
double x, m;
|
|
|
|
int e, shift, i, si, esign;
|
|
|
|
/* Space for 1+(TOHEX_NBITS-1)/4 digits, a decimal point, and the
|
|
|
|
trailing NUL byte. */
|
|
|
|
char s[(TOHEX_NBITS-1)/4+3];
|
|
|
|
|
|
|
|
CONVERT_TO_DOUBLE(v, x);
|
|
|
|
|
|
|
|
if (Py_IS_NAN(x) || Py_IS_INFINITY(x))
|
|
|
|
return float_str((PyFloatObject *)v);
|
|
|
|
|
|
|
|
if (x == 0.0) {
|
2010-07-02 16:50:16 -03:00
|
|
|
if (copysign(1.0, x) == -1.0)
|
2010-05-09 13:14:21 -03:00
|
|
|
return PyUnicode_FromString("-0x0.0p+0");
|
|
|
|
else
|
|
|
|
return PyUnicode_FromString("0x0.0p+0");
|
|
|
|
}
|
|
|
|
|
|
|
|
m = frexp(fabs(x), &e);
|
|
|
|
shift = 1 - MAX(DBL_MIN_EXP - e, 0);
|
|
|
|
m = ldexp(m, shift);
|
|
|
|
e -= shift;
|
|
|
|
|
|
|
|
si = 0;
|
|
|
|
s[si] = char_from_hex((int)m);
|
|
|
|
si++;
|
|
|
|
m -= (int)m;
|
|
|
|
s[si] = '.';
|
|
|
|
si++;
|
|
|
|
for (i=0; i < (TOHEX_NBITS-1)/4; i++) {
|
|
|
|
m *= 16.0;
|
|
|
|
s[si] = char_from_hex((int)m);
|
|
|
|
si++;
|
|
|
|
m -= (int)m;
|
|
|
|
}
|
|
|
|
s[si] = '\0';
|
|
|
|
|
|
|
|
if (e < 0) {
|
|
|
|
esign = (int)'-';
|
|
|
|
e = -e;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
esign = (int)'+';
|
|
|
|
|
|
|
|
if (x < 0.0)
|
|
|
|
return PyUnicode_FromFormat("-0x%sp%c%d", s, esign, e);
|
|
|
|
else
|
|
|
|
return PyUnicode_FromFormat("0x%sp%c%d", s, esign, e);
|
2008-07-16 08:30:51 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(float_hex_doc,
|
|
|
|
"float.hex() -> string\n\
|
|
|
|
\n\
|
|
|
|
Return a hexadecimal representation of a floating-point number.\n\
|
|
|
|
>>> (-0.1).hex()\n\
|
|
|
|
'-0x1.999999999999ap-4'\n\
|
|
|
|
>>> 3.14159.hex()\n\
|
|
|
|
'0x1.921f9f01b866ep+1'");
|
|
|
|
|
|
|
|
/* Convert a hexadecimal string to a float. */
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
float_fromhex(PyObject *cls, PyObject *arg)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
PyObject *result_as_float, *result;
|
|
|
|
double x;
|
|
|
|
long exp, top_exp, lsb, key_digit;
|
|
|
|
char *s, *coeff_start, *s_store, *coeff_end, *exp_start, *s_end;
|
|
|
|
int half_eps, digit, round_up, negate=0;
|
|
|
|
Py_ssize_t length, ndigits, fdigits, i;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* For the sake of simplicity and correctness, we impose an artificial
|
|
|
|
* limit on ndigits, the total number of hex digits in the coefficient
|
|
|
|
* The limit is chosen to ensure that, writing exp for the exponent,
|
|
|
|
*
|
|
|
|
* (1) if exp > LONG_MAX/2 then the value of the hex string is
|
|
|
|
* guaranteed to overflow (provided it's nonzero)
|
|
|
|
*
|
|
|
|
* (2) if exp < LONG_MIN/2 then the value of the hex string is
|
|
|
|
* guaranteed to underflow to 0.
|
|
|
|
*
|
|
|
|
* (3) if LONG_MIN/2 <= exp <= LONG_MAX/2 then there's no danger of
|
|
|
|
* overflow in the calculation of exp and top_exp below.
|
|
|
|
*
|
|
|
|
* More specifically, ndigits is assumed to satisfy the following
|
|
|
|
* inequalities:
|
|
|
|
*
|
|
|
|
* 4*ndigits <= DBL_MIN_EXP - DBL_MANT_DIG - LONG_MIN/2
|
|
|
|
* 4*ndigits <= LONG_MAX/2 + 1 - DBL_MAX_EXP
|
|
|
|
*
|
|
|
|
* If either of these inequalities is not satisfied, a ValueError is
|
|
|
|
* raised. Otherwise, write x for the value of the hex string, and
|
|
|
|
* assume x is nonzero. Then
|
|
|
|
*
|
|
|
|
* 2**(exp-4*ndigits) <= |x| < 2**(exp+4*ndigits).
|
|
|
|
*
|
|
|
|
* Now if exp > LONG_MAX/2 then:
|
|
|
|
*
|
|
|
|
* exp - 4*ndigits >= LONG_MAX/2 + 1 - (LONG_MAX/2 + 1 - DBL_MAX_EXP)
|
|
|
|
* = DBL_MAX_EXP
|
|
|
|
*
|
|
|
|
* so |x| >= 2**DBL_MAX_EXP, which is too large to be stored in C
|
|
|
|
* double, so overflows. If exp < LONG_MIN/2, then
|
|
|
|
*
|
|
|
|
* exp + 4*ndigits <= LONG_MIN/2 - 1 + (
|
|
|
|
* DBL_MIN_EXP - DBL_MANT_DIG - LONG_MIN/2)
|
|
|
|
* = DBL_MIN_EXP - DBL_MANT_DIG - 1
|
|
|
|
*
|
|
|
|
* and so |x| < 2**(DBL_MIN_EXP-DBL_MANT_DIG-1), hence underflows to 0
|
|
|
|
* when converted to a C double.
|
|
|
|
*
|
|
|
|
* It's easy to show that if LONG_MIN/2 <= exp <= LONG_MAX/2 then both
|
|
|
|
* exp+4*ndigits and exp-4*ndigits are within the range of a long.
|
|
|
|
*/
|
|
|
|
|
|
|
|
s = _PyUnicode_AsStringAndSize(arg, &length);
|
|
|
|
if (s == NULL)
|
|
|
|
return NULL;
|
|
|
|
s_end = s + length;
|
|
|
|
|
|
|
|
/********************
|
|
|
|
* Parse the string *
|
|
|
|
********************/
|
|
|
|
|
|
|
|
/* leading whitespace */
|
|
|
|
while (Py_ISSPACE(*s))
|
|
|
|
s++;
|
|
|
|
|
|
|
|
/* infinities and nans */
|
|
|
|
x = _Py_parse_inf_or_nan(s, &coeff_end);
|
|
|
|
if (coeff_end != s) {
|
|
|
|
s = coeff_end;
|
|
|
|
goto finished;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* optional sign */
|
|
|
|
if (*s == '-') {
|
|
|
|
s++;
|
|
|
|
negate = 1;
|
|
|
|
}
|
|
|
|
else if (*s == '+')
|
|
|
|
s++;
|
|
|
|
|
|
|
|
/* [0x] */
|
|
|
|
s_store = s;
|
|
|
|
if (*s == '0') {
|
|
|
|
s++;
|
|
|
|
if (*s == 'x' || *s == 'X')
|
|
|
|
s++;
|
|
|
|
else
|
|
|
|
s = s_store;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* coefficient: <integer> [. <fraction>] */
|
|
|
|
coeff_start = s;
|
|
|
|
while (hex_from_char(*s) >= 0)
|
|
|
|
s++;
|
|
|
|
s_store = s;
|
|
|
|
if (*s == '.') {
|
|
|
|
s++;
|
|
|
|
while (hex_from_char(*s) >= 0)
|
|
|
|
s++;
|
|
|
|
coeff_end = s-1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
coeff_end = s;
|
|
|
|
|
|
|
|
/* ndigits = total # of hex digits; fdigits = # after point */
|
|
|
|
ndigits = coeff_end - coeff_start;
|
|
|
|
fdigits = coeff_end - s_store;
|
|
|
|
if (ndigits == 0)
|
|
|
|
goto parse_error;
|
|
|
|
if (ndigits > MIN(DBL_MIN_EXP - DBL_MANT_DIG - LONG_MIN/2,
|
|
|
|
LONG_MAX/2 + 1 - DBL_MAX_EXP)/4)
|
|
|
|
goto insane_length_error;
|
|
|
|
|
|
|
|
/* [p <exponent>] */
|
|
|
|
if (*s == 'p' || *s == 'P') {
|
|
|
|
s++;
|
|
|
|
exp_start = s;
|
|
|
|
if (*s == '-' || *s == '+')
|
|
|
|
s++;
|
|
|
|
if (!('0' <= *s && *s <= '9'))
|
|
|
|
goto parse_error;
|
|
|
|
s++;
|
|
|
|
while ('0' <= *s && *s <= '9')
|
|
|
|
s++;
|
|
|
|
exp = strtol(exp_start, NULL, 10);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
exp = 0;
|
2008-07-16 08:30:51 -03:00
|
|
|
|
|
|
|
/* for 0 <= j < ndigits, HEX_DIGIT(j) gives the jth most significant digit */
|
2010-05-09 13:14:21 -03:00
|
|
|
#define HEX_DIGIT(j) hex_from_char(*((j) < fdigits ? \
|
|
|
|
coeff_end-(j) : \
|
|
|
|
coeff_end-1-(j)))
|
|
|
|
|
|
|
|
/*******************************************
|
|
|
|
* Compute rounded value of the hex string *
|
|
|
|
*******************************************/
|
|
|
|
|
|
|
|
/* Discard leading zeros, and catch extreme overflow and underflow */
|
|
|
|
while (ndigits > 0 && HEX_DIGIT(ndigits-1) == 0)
|
|
|
|
ndigits--;
|
|
|
|
if (ndigits == 0 || exp < LONG_MIN/2) {
|
|
|
|
x = 0.0;
|
|
|
|
goto finished;
|
|
|
|
}
|
|
|
|
if (exp > LONG_MAX/2)
|
|
|
|
goto overflow_error;
|
|
|
|
|
|
|
|
/* Adjust exponent for fractional part. */
|
|
|
|
exp = exp - 4*((long)fdigits);
|
|
|
|
|
|
|
|
/* top_exp = 1 more than exponent of most sig. bit of coefficient */
|
|
|
|
top_exp = exp + 4*((long)ndigits - 1);
|
|
|
|
for (digit = HEX_DIGIT(ndigits-1); digit != 0; digit /= 2)
|
|
|
|
top_exp++;
|
|
|
|
|
|
|
|
/* catch almost all nonextreme cases of overflow and underflow here */
|
|
|
|
if (top_exp < DBL_MIN_EXP - DBL_MANT_DIG) {
|
|
|
|
x = 0.0;
|
|
|
|
goto finished;
|
|
|
|
}
|
|
|
|
if (top_exp > DBL_MAX_EXP)
|
|
|
|
goto overflow_error;
|
|
|
|
|
|
|
|
/* lsb = exponent of least significant bit of the *rounded* value.
|
|
|
|
This is top_exp - DBL_MANT_DIG unless result is subnormal. */
|
|
|
|
lsb = MAX(top_exp, (long)DBL_MIN_EXP) - DBL_MANT_DIG;
|
|
|
|
|
|
|
|
x = 0.0;
|
|
|
|
if (exp >= lsb) {
|
|
|
|
/* no rounding required */
|
|
|
|
for (i = ndigits-1; i >= 0; i--)
|
|
|
|
x = 16.0*x + HEX_DIGIT(i);
|
|
|
|
x = ldexp(x, (int)(exp));
|
|
|
|
goto finished;
|
|
|
|
}
|
|
|
|
/* rounding required. key_digit is the index of the hex digit
|
|
|
|
containing the first bit to be rounded away. */
|
|
|
|
half_eps = 1 << (int)((lsb - exp - 1) % 4);
|
|
|
|
key_digit = (lsb - exp - 1) / 4;
|
|
|
|
for (i = ndigits-1; i > key_digit; i--)
|
|
|
|
x = 16.0*x + HEX_DIGIT(i);
|
|
|
|
digit = HEX_DIGIT(key_digit);
|
|
|
|
x = 16.0*x + (double)(digit & (16-2*half_eps));
|
|
|
|
|
|
|
|
/* round-half-even: round up if bit lsb-1 is 1 and at least one of
|
|
|
|
bits lsb, lsb-2, lsb-3, lsb-4, ... is 1. */
|
|
|
|
if ((digit & half_eps) != 0) {
|
|
|
|
round_up = 0;
|
|
|
|
if ((digit & (3*half_eps-1)) != 0 ||
|
|
|
|
(half_eps == 8 && (HEX_DIGIT(key_digit+1) & 1) != 0))
|
|
|
|
round_up = 1;
|
|
|
|
else
|
|
|
|
for (i = key_digit-1; i >= 0; i--)
|
|
|
|
if (HEX_DIGIT(i) != 0) {
|
|
|
|
round_up = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (round_up == 1) {
|
|
|
|
x += 2*half_eps;
|
|
|
|
if (top_exp == DBL_MAX_EXP &&
|
|
|
|
x == ldexp((double)(2*half_eps), DBL_MANT_DIG))
|
|
|
|
/* overflow corner case: pre-rounded value <
|
|
|
|
2**DBL_MAX_EXP; rounded=2**DBL_MAX_EXP. */
|
|
|
|
goto overflow_error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
x = ldexp(x, (int)(exp+4*key_digit));
|
2008-07-16 08:30:51 -03:00
|
|
|
|
|
|
|
finished:
|
2010-05-09 13:14:21 -03:00
|
|
|
/* optional trailing whitespace leading to the end of the string */
|
|
|
|
while (Py_ISSPACE(*s))
|
|
|
|
s++;
|
|
|
|
if (s != s_end)
|
|
|
|
goto parse_error;
|
|
|
|
result_as_float = Py_BuildValue("(d)", negate ? -x : x);
|
|
|
|
if (result_as_float == NULL)
|
|
|
|
return NULL;
|
|
|
|
result = PyObject_CallObject(cls, result_as_float);
|
|
|
|
Py_DECREF(result_as_float);
|
|
|
|
return result;
|
2008-07-16 08:30:51 -03:00
|
|
|
|
|
|
|
overflow_error:
|
2010-05-09 13:14:21 -03:00
|
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
|
|
"hexadecimal value too large to represent as a float");
|
|
|
|
return NULL;
|
2008-07-16 08:30:51 -03:00
|
|
|
|
|
|
|
parse_error:
|
2010-05-09 13:14:21 -03:00
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"invalid hexadecimal floating-point string");
|
|
|
|
return NULL;
|
2008-07-16 08:30:51 -03:00
|
|
|
|
|
|
|
insane_length_error:
|
2010-05-09 13:14:21 -03:00
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"hexadecimal string too long to convert");
|
|
|
|
return NULL;
|
2008-07-16 08:30:51 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(float_fromhex_doc,
|
|
|
|
"float.fromhex(string) -> float\n\
|
|
|
|
\n\
|
|
|
|
Create a floating-point number from a hexadecimal string.\n\
|
|
|
|
>>> float.fromhex('0x1.ffffp10')\n\
|
|
|
|
2047.984375\n\
|
|
|
|
>>> float.fromhex('-0x1p-1074')\n\
|
|
|
|
-4.9406564584124654e-324");
|
|
|
|
|
|
|
|
|
2008-01-27 19:50:43 -04:00
|
|
|
static PyObject *
|
Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
NOTE: I blocked the following revisions:
svnmerge.py block -r 60521,60522,60528,60529,60534,60539
The new tests must be merged with lots of manual work.
........
r60493 | georg.brandl | 2008-02-01 12:59:08 +0100 (Fri, 01 Feb 2008) | 2 lines
Update IPv6 RFC number.
........
r60497 | georg.brandl | 2008-02-01 16:50:15 +0100 (Fri, 01 Feb 2008) | 2 lines
Add link checker builder, written for GHOP by Thomas Lamb.
........
r60500 | georg.brandl | 2008-02-01 19:08:09 +0100 (Fri, 01 Feb 2008) | 2 lines
Rename batch file.
........
r60504 | christian.heimes | 2008-02-01 19:49:26 +0100 (Fri, 01 Feb 2008) | 1 line
More int -> pid_t.
........
r60507 | georg.brandl | 2008-02-01 20:24:01 +0100 (Fri, 01 Feb 2008) | 2 lines
Wording nit.
........
r60510 | georg.brandl | 2008-02-01 21:45:33 +0100 (Fri, 01 Feb 2008) | 2 lines
Update for latest sphinx latex writer.
........
r60511 | raymond.hettinger | 2008-02-01 22:30:23 +0100 (Fri, 01 Feb 2008) | 1 line
Issue #1996: float.as_integer_ratio() should return fraction in lowest terms.
........
r60512 | raymond.hettinger | 2008-02-01 23:15:52 +0100 (Fri, 01 Feb 2008) | 1 line
Integer ratio should return ints instead of longs whereever possible.
........
r60513 | raymond.hettinger | 2008-02-01 23:22:50 +0100 (Fri, 01 Feb 2008) | 1 line
labs() takes a long for an input.
........
r60514 | raymond.hettinger | 2008-02-01 23:42:59 +0100 (Fri, 01 Feb 2008) | 1 line
Test round-trip on float.as_integer_ratio() and float.__truediv__().
........
r60515 | marc-andre.lemburg | 2008-02-01 23:58:17 +0100 (Fri, 01 Feb 2008) | 3 lines
Bump distutils version number to match Python version.
........
r60516 | raymond.hettinger | 2008-02-02 00:12:19 +0100 (Sat, 02 Feb 2008) | 1 line
Fix int/long typecase. Add check for non-binary floating point.
........
r60517 | raymond.hettinger | 2008-02-02 00:45:44 +0100 (Sat, 02 Feb 2008) | 1 line
Add protection from weirdness while scaling the mantissa to an integer.
........
r60518 | raymond.hettinger | 2008-02-02 06:11:40 +0100 (Sat, 02 Feb 2008) | 1 line
Simpler solution to handling non-IEEE 754 environments.
........
r60519 | raymond.hettinger | 2008-02-02 06:24:44 +0100 (Sat, 02 Feb 2008) | 1 line
Neaten-up a bit.
........
r60520 | georg.brandl | 2008-02-02 10:56:20 +0100 (Sat, 02 Feb 2008) | 2 lines
Amendments to the urllib2 docs, written for GHOP by Thomas Lamb.
........
r60525 | georg.brandl | 2008-02-02 11:49:58 +0100 (Sat, 02 Feb 2008) | 3 lines
Add email example how to send a multipart message.
Written for GHOP by Martin Matejek.
........
r60526 | georg.brandl | 2008-02-02 12:05:00 +0100 (Sat, 02 Feb 2008) | 2 lines
Rewrite test_socketserver as unittest, written for GHOP by Benjamin Petersen.
........
r60527 | georg.brandl | 2008-02-02 12:05:34 +0100 (Sat, 02 Feb 2008) | 2 lines
Add GHOP contributor.
........
r60530 | mark.dickinson | 2008-02-02 18:16:13 +0100 (Sat, 02 Feb 2008) | 2 lines
Make the Rational constructor accept '3.' and '.2' as well as '3.2'.
........
r60531 | neal.norwitz | 2008-02-02 19:52:51 +0100 (Sat, 02 Feb 2008) | 1 line
Update the leaky tests (ie, ignore these tests if they report leaks). This version has been running for a while.
........
r60533 | skip.montanaro | 2008-02-02 20:11:57 +0100 (Sat, 02 Feb 2008) | 7 lines
Split the refleak mail body into two parts, the first being those failing
tests which are deemed more important issues, the second those which are
known to have difficult to solve problems and are generally expected to
leak. Hopefully this doesn't break the script...
........
r60535 | georg.brandl | 2008-02-03 01:04:50 +0100 (Sun, 03 Feb 2008) | 3 lines
Wait for a delay before reaping children -- this should fix the
test_socketserver failures on several platforms.
........
r60536 | brett.cannon | 2008-02-03 03:07:55 +0100 (Sun, 03 Feb 2008) | 2 lines
Fix a minor typo.
........
r60537 | brett.cannon | 2008-02-03 03:08:45 +0100 (Sun, 03 Feb 2008) | 3 lines
Directories from CPPFLAGS and LDFLAGS were being added in the reverse order for
searches as to how they were listed in the environment variable.
........
r60538 | brett.cannon | 2008-02-03 03:34:14 +0100 (Sun, 03 Feb 2008) | 2 lines
Remove extra tick marks and add a missing closing parenthesis.
........
r60540 | andrew.macintyre | 2008-02-03 07:58:06 +0100 (Sun, 03 Feb 2008) | 2 lines
Update OS/2 EMX build bits for 2.6.
........
r60541 | andrew.macintyre | 2008-02-03 08:01:11 +0100 (Sun, 03 Feb 2008) | 2 lines
Rename module definition file to reflect v2.6.
........
r60542 | andrew.macintyre | 2008-02-03 08:07:31 +0100 (Sun, 03 Feb 2008) | 6 lines
The wrapper function is supposed to be for spawnvpe() so that's
what we should call [this wrapper only available on OS/2].
Backport candidate to 2.5.
........
r60544 | gregory.p.smith | 2008-02-03 08:20:53 +0100 (Sun, 03 Feb 2008) | 6 lines
Merge this fix from the pybsddb tree:
r293 | jcea | 2008-01-31 01:08:19 -0800 (Thu, 31 Jan 2008) | 4 lines
Solved memory leak when using cursors with
databases without environment.
........
r60546 | gregory.p.smith | 2008-02-03 09:01:46 +0100 (Sun, 03 Feb 2008) | 2 lines
remove a repeated occurance of a hardcoded berkeleydb library version number
........
r60549 | brett.cannon | 2008-02-03 10:59:21 +0100 (Sun, 03 Feb 2008) | 2 lines
Add an entry for r60537.
........
r60550 | georg.brandl | 2008-02-03 13:29:00 +0100 (Sun, 03 Feb 2008) | 2 lines
#2003: fix sentence.
........
r60551 | christian.heimes | 2008-02-03 15:34:18 +0100 (Sun, 03 Feb 2008) | 2 lines
Fixed paths to Windows build directories in build_ext.py
Use vsbuild instead of devenv in build.bat and _bsddb.vcproj
........
2008-02-03 12:51:08 -04:00
|
|
|
float_as_integer_ratio(PyObject *v, PyObject *unused)
|
2008-01-27 19:50:43 -04:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
double self;
|
|
|
|
double float_part;
|
|
|
|
int exponent;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
PyObject *prev;
|
|
|
|
PyObject *py_exponent = NULL;
|
|
|
|
PyObject *numerator = NULL;
|
|
|
|
PyObject *denominator = NULL;
|
|
|
|
PyObject *result_pair = NULL;
|
|
|
|
PyNumberMethods *long_methods = PyLong_Type.tp_as_number;
|
2008-01-27 19:50:43 -04:00
|
|
|
|
|
|
|
#define INPLACE_UPDATE(obj, call) \
|
2010-05-09 13:14:21 -03:00
|
|
|
prev = obj; \
|
|
|
|
obj = call; \
|
|
|
|
Py_DECREF(prev); \
|
2008-01-27 19:50:43 -04:00
|
|
|
|
2010-05-09 13:14:21 -03:00
|
|
|
CONVERT_TO_DOUBLE(v, self);
|
2008-01-27 19:50:43 -04:00
|
|
|
|
2010-05-09 13:14:21 -03:00
|
|
|
if (Py_IS_INFINITY(self)) {
|
|
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
|
|
"Cannot pass infinity to float.as_integer_ratio.");
|
|
|
|
return NULL;
|
|
|
|
}
|
2008-01-27 19:50:43 -04:00
|
|
|
#ifdef Py_NAN
|
2010-05-09 13:14:21 -03:00
|
|
|
if (Py_IS_NAN(self)) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"Cannot pass NaN to float.as_integer_ratio.");
|
|
|
|
return NULL;
|
|
|
|
}
|
2008-01-27 19:50:43 -04:00
|
|
|
#endif
|
|
|
|
|
2010-05-09 13:14:21 -03:00
|
|
|
PyFPE_START_PROTECT("as_integer_ratio", goto error);
|
|
|
|
float_part = frexp(self, &exponent); /* self == float_part * 2**exponent exactly */
|
|
|
|
PyFPE_END_PROTECT(float_part);
|
|
|
|
|
|
|
|
for (i=0; i<300 && float_part != floor(float_part) ; i++) {
|
|
|
|
float_part *= 2.0;
|
|
|
|
exponent--;
|
|
|
|
}
|
|
|
|
/* self == float_part * 2**exponent exactly and float_part is integral.
|
|
|
|
If FLT_RADIX != 2, the 300 steps may leave a tiny fractional part
|
|
|
|
to be truncated by PyLong_FromDouble(). */
|
|
|
|
|
|
|
|
numerator = PyLong_FromDouble(float_part);
|
|
|
|
if (numerator == NULL) goto error;
|
|
|
|
|
|
|
|
/* fold in 2**exponent */
|
|
|
|
denominator = PyLong_FromLong(1);
|
|
|
|
py_exponent = PyLong_FromLong(labs((long)exponent));
|
|
|
|
if (py_exponent == NULL) goto error;
|
|
|
|
INPLACE_UPDATE(py_exponent,
|
|
|
|
long_methods->nb_lshift(denominator, py_exponent));
|
|
|
|
if (py_exponent == NULL) goto error;
|
|
|
|
if (exponent > 0) {
|
|
|
|
INPLACE_UPDATE(numerator,
|
|
|
|
long_methods->nb_multiply(numerator, py_exponent));
|
|
|
|
if (numerator == NULL) goto error;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_DECREF(denominator);
|
|
|
|
denominator = py_exponent;
|
|
|
|
py_exponent = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
result_pair = PyTuple_Pack(2, numerator, denominator);
|
2008-01-27 19:50:43 -04:00
|
|
|
|
|
|
|
#undef INPLACE_UPDATE
|
|
|
|
error:
|
2010-05-09 13:14:21 -03:00
|
|
|
Py_XDECREF(py_exponent);
|
|
|
|
Py_XDECREF(denominator);
|
|
|
|
Py_XDECREF(numerator);
|
|
|
|
return result_pair;
|
2008-01-27 19:50:43 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(float_as_integer_ratio_doc,
|
|
|
|
"float.as_integer_ratio() -> (int, int)\n"
|
|
|
|
"\n"
|
Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
NOTE: I blocked the following revisions:
svnmerge.py block -r 60521,60522,60528,60529,60534,60539
The new tests must be merged with lots of manual work.
........
r60493 | georg.brandl | 2008-02-01 12:59:08 +0100 (Fri, 01 Feb 2008) | 2 lines
Update IPv6 RFC number.
........
r60497 | georg.brandl | 2008-02-01 16:50:15 +0100 (Fri, 01 Feb 2008) | 2 lines
Add link checker builder, written for GHOP by Thomas Lamb.
........
r60500 | georg.brandl | 2008-02-01 19:08:09 +0100 (Fri, 01 Feb 2008) | 2 lines
Rename batch file.
........
r60504 | christian.heimes | 2008-02-01 19:49:26 +0100 (Fri, 01 Feb 2008) | 1 line
More int -> pid_t.
........
r60507 | georg.brandl | 2008-02-01 20:24:01 +0100 (Fri, 01 Feb 2008) | 2 lines
Wording nit.
........
r60510 | georg.brandl | 2008-02-01 21:45:33 +0100 (Fri, 01 Feb 2008) | 2 lines
Update for latest sphinx latex writer.
........
r60511 | raymond.hettinger | 2008-02-01 22:30:23 +0100 (Fri, 01 Feb 2008) | 1 line
Issue #1996: float.as_integer_ratio() should return fraction in lowest terms.
........
r60512 | raymond.hettinger | 2008-02-01 23:15:52 +0100 (Fri, 01 Feb 2008) | 1 line
Integer ratio should return ints instead of longs whereever possible.
........
r60513 | raymond.hettinger | 2008-02-01 23:22:50 +0100 (Fri, 01 Feb 2008) | 1 line
labs() takes a long for an input.
........
r60514 | raymond.hettinger | 2008-02-01 23:42:59 +0100 (Fri, 01 Feb 2008) | 1 line
Test round-trip on float.as_integer_ratio() and float.__truediv__().
........
r60515 | marc-andre.lemburg | 2008-02-01 23:58:17 +0100 (Fri, 01 Feb 2008) | 3 lines
Bump distutils version number to match Python version.
........
r60516 | raymond.hettinger | 2008-02-02 00:12:19 +0100 (Sat, 02 Feb 2008) | 1 line
Fix int/long typecase. Add check for non-binary floating point.
........
r60517 | raymond.hettinger | 2008-02-02 00:45:44 +0100 (Sat, 02 Feb 2008) | 1 line
Add protection from weirdness while scaling the mantissa to an integer.
........
r60518 | raymond.hettinger | 2008-02-02 06:11:40 +0100 (Sat, 02 Feb 2008) | 1 line
Simpler solution to handling non-IEEE 754 environments.
........
r60519 | raymond.hettinger | 2008-02-02 06:24:44 +0100 (Sat, 02 Feb 2008) | 1 line
Neaten-up a bit.
........
r60520 | georg.brandl | 2008-02-02 10:56:20 +0100 (Sat, 02 Feb 2008) | 2 lines
Amendments to the urllib2 docs, written for GHOP by Thomas Lamb.
........
r60525 | georg.brandl | 2008-02-02 11:49:58 +0100 (Sat, 02 Feb 2008) | 3 lines
Add email example how to send a multipart message.
Written for GHOP by Martin Matejek.
........
r60526 | georg.brandl | 2008-02-02 12:05:00 +0100 (Sat, 02 Feb 2008) | 2 lines
Rewrite test_socketserver as unittest, written for GHOP by Benjamin Petersen.
........
r60527 | georg.brandl | 2008-02-02 12:05:34 +0100 (Sat, 02 Feb 2008) | 2 lines
Add GHOP contributor.
........
r60530 | mark.dickinson | 2008-02-02 18:16:13 +0100 (Sat, 02 Feb 2008) | 2 lines
Make the Rational constructor accept '3.' and '.2' as well as '3.2'.
........
r60531 | neal.norwitz | 2008-02-02 19:52:51 +0100 (Sat, 02 Feb 2008) | 1 line
Update the leaky tests (ie, ignore these tests if they report leaks). This version has been running for a while.
........
r60533 | skip.montanaro | 2008-02-02 20:11:57 +0100 (Sat, 02 Feb 2008) | 7 lines
Split the refleak mail body into two parts, the first being those failing
tests which are deemed more important issues, the second those which are
known to have difficult to solve problems and are generally expected to
leak. Hopefully this doesn't break the script...
........
r60535 | georg.brandl | 2008-02-03 01:04:50 +0100 (Sun, 03 Feb 2008) | 3 lines
Wait for a delay before reaping children -- this should fix the
test_socketserver failures on several platforms.
........
r60536 | brett.cannon | 2008-02-03 03:07:55 +0100 (Sun, 03 Feb 2008) | 2 lines
Fix a minor typo.
........
r60537 | brett.cannon | 2008-02-03 03:08:45 +0100 (Sun, 03 Feb 2008) | 3 lines
Directories from CPPFLAGS and LDFLAGS were being added in the reverse order for
searches as to how they were listed in the environment variable.
........
r60538 | brett.cannon | 2008-02-03 03:34:14 +0100 (Sun, 03 Feb 2008) | 2 lines
Remove extra tick marks and add a missing closing parenthesis.
........
r60540 | andrew.macintyre | 2008-02-03 07:58:06 +0100 (Sun, 03 Feb 2008) | 2 lines
Update OS/2 EMX build bits for 2.6.
........
r60541 | andrew.macintyre | 2008-02-03 08:01:11 +0100 (Sun, 03 Feb 2008) | 2 lines
Rename module definition file to reflect v2.6.
........
r60542 | andrew.macintyre | 2008-02-03 08:07:31 +0100 (Sun, 03 Feb 2008) | 6 lines
The wrapper function is supposed to be for spawnvpe() so that's
what we should call [this wrapper only available on OS/2].
Backport candidate to 2.5.
........
r60544 | gregory.p.smith | 2008-02-03 08:20:53 +0100 (Sun, 03 Feb 2008) | 6 lines
Merge this fix from the pybsddb tree:
r293 | jcea | 2008-01-31 01:08:19 -0800 (Thu, 31 Jan 2008) | 4 lines
Solved memory leak when using cursors with
databases without environment.
........
r60546 | gregory.p.smith | 2008-02-03 09:01:46 +0100 (Sun, 03 Feb 2008) | 2 lines
remove a repeated occurance of a hardcoded berkeleydb library version number
........
r60549 | brett.cannon | 2008-02-03 10:59:21 +0100 (Sun, 03 Feb 2008) | 2 lines
Add an entry for r60537.
........
r60550 | georg.brandl | 2008-02-03 13:29:00 +0100 (Sun, 03 Feb 2008) | 2 lines
#2003: fix sentence.
........
r60551 | christian.heimes | 2008-02-03 15:34:18 +0100 (Sun, 03 Feb 2008) | 2 lines
Fixed paths to Windows build directories in build_ext.py
Use vsbuild instead of devenv in build.bat and _bsddb.vcproj
........
2008-02-03 12:51:08 -04:00
|
|
|
"Returns a pair of integers, whose ratio is exactly equal to the original\n"
|
|
|
|
"float and with a positive denominator.\n"
|
2008-10-10 21:49:57 -03:00
|
|
|
"Raises OverflowError on infinities and a ValueError on NaNs.\n"
|
2008-01-27 19:50:43 -04:00
|
|
|
"\n"
|
|
|
|
">>> (10.0).as_integer_ratio()\n"
|
Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
NOTE: I blocked the following revisions:
svnmerge.py block -r 60521,60522,60528,60529,60534,60539
The new tests must be merged with lots of manual work.
........
r60493 | georg.brandl | 2008-02-01 12:59:08 +0100 (Fri, 01 Feb 2008) | 2 lines
Update IPv6 RFC number.
........
r60497 | georg.brandl | 2008-02-01 16:50:15 +0100 (Fri, 01 Feb 2008) | 2 lines
Add link checker builder, written for GHOP by Thomas Lamb.
........
r60500 | georg.brandl | 2008-02-01 19:08:09 +0100 (Fri, 01 Feb 2008) | 2 lines
Rename batch file.
........
r60504 | christian.heimes | 2008-02-01 19:49:26 +0100 (Fri, 01 Feb 2008) | 1 line
More int -> pid_t.
........
r60507 | georg.brandl | 2008-02-01 20:24:01 +0100 (Fri, 01 Feb 2008) | 2 lines
Wording nit.
........
r60510 | georg.brandl | 2008-02-01 21:45:33 +0100 (Fri, 01 Feb 2008) | 2 lines
Update for latest sphinx latex writer.
........
r60511 | raymond.hettinger | 2008-02-01 22:30:23 +0100 (Fri, 01 Feb 2008) | 1 line
Issue #1996: float.as_integer_ratio() should return fraction in lowest terms.
........
r60512 | raymond.hettinger | 2008-02-01 23:15:52 +0100 (Fri, 01 Feb 2008) | 1 line
Integer ratio should return ints instead of longs whereever possible.
........
r60513 | raymond.hettinger | 2008-02-01 23:22:50 +0100 (Fri, 01 Feb 2008) | 1 line
labs() takes a long for an input.
........
r60514 | raymond.hettinger | 2008-02-01 23:42:59 +0100 (Fri, 01 Feb 2008) | 1 line
Test round-trip on float.as_integer_ratio() and float.__truediv__().
........
r60515 | marc-andre.lemburg | 2008-02-01 23:58:17 +0100 (Fri, 01 Feb 2008) | 3 lines
Bump distutils version number to match Python version.
........
r60516 | raymond.hettinger | 2008-02-02 00:12:19 +0100 (Sat, 02 Feb 2008) | 1 line
Fix int/long typecase. Add check for non-binary floating point.
........
r60517 | raymond.hettinger | 2008-02-02 00:45:44 +0100 (Sat, 02 Feb 2008) | 1 line
Add protection from weirdness while scaling the mantissa to an integer.
........
r60518 | raymond.hettinger | 2008-02-02 06:11:40 +0100 (Sat, 02 Feb 2008) | 1 line
Simpler solution to handling non-IEEE 754 environments.
........
r60519 | raymond.hettinger | 2008-02-02 06:24:44 +0100 (Sat, 02 Feb 2008) | 1 line
Neaten-up a bit.
........
r60520 | georg.brandl | 2008-02-02 10:56:20 +0100 (Sat, 02 Feb 2008) | 2 lines
Amendments to the urllib2 docs, written for GHOP by Thomas Lamb.
........
r60525 | georg.brandl | 2008-02-02 11:49:58 +0100 (Sat, 02 Feb 2008) | 3 lines
Add email example how to send a multipart message.
Written for GHOP by Martin Matejek.
........
r60526 | georg.brandl | 2008-02-02 12:05:00 +0100 (Sat, 02 Feb 2008) | 2 lines
Rewrite test_socketserver as unittest, written for GHOP by Benjamin Petersen.
........
r60527 | georg.brandl | 2008-02-02 12:05:34 +0100 (Sat, 02 Feb 2008) | 2 lines
Add GHOP contributor.
........
r60530 | mark.dickinson | 2008-02-02 18:16:13 +0100 (Sat, 02 Feb 2008) | 2 lines
Make the Rational constructor accept '3.' and '.2' as well as '3.2'.
........
r60531 | neal.norwitz | 2008-02-02 19:52:51 +0100 (Sat, 02 Feb 2008) | 1 line
Update the leaky tests (ie, ignore these tests if they report leaks). This version has been running for a while.
........
r60533 | skip.montanaro | 2008-02-02 20:11:57 +0100 (Sat, 02 Feb 2008) | 7 lines
Split the refleak mail body into two parts, the first being those failing
tests which are deemed more important issues, the second those which are
known to have difficult to solve problems and are generally expected to
leak. Hopefully this doesn't break the script...
........
r60535 | georg.brandl | 2008-02-03 01:04:50 +0100 (Sun, 03 Feb 2008) | 3 lines
Wait for a delay before reaping children -- this should fix the
test_socketserver failures on several platforms.
........
r60536 | brett.cannon | 2008-02-03 03:07:55 +0100 (Sun, 03 Feb 2008) | 2 lines
Fix a minor typo.
........
r60537 | brett.cannon | 2008-02-03 03:08:45 +0100 (Sun, 03 Feb 2008) | 3 lines
Directories from CPPFLAGS and LDFLAGS were being added in the reverse order for
searches as to how they were listed in the environment variable.
........
r60538 | brett.cannon | 2008-02-03 03:34:14 +0100 (Sun, 03 Feb 2008) | 2 lines
Remove extra tick marks and add a missing closing parenthesis.
........
r60540 | andrew.macintyre | 2008-02-03 07:58:06 +0100 (Sun, 03 Feb 2008) | 2 lines
Update OS/2 EMX build bits for 2.6.
........
r60541 | andrew.macintyre | 2008-02-03 08:01:11 +0100 (Sun, 03 Feb 2008) | 2 lines
Rename module definition file to reflect v2.6.
........
r60542 | andrew.macintyre | 2008-02-03 08:07:31 +0100 (Sun, 03 Feb 2008) | 6 lines
The wrapper function is supposed to be for spawnvpe() so that's
what we should call [this wrapper only available on OS/2].
Backport candidate to 2.5.
........
r60544 | gregory.p.smith | 2008-02-03 08:20:53 +0100 (Sun, 03 Feb 2008) | 6 lines
Merge this fix from the pybsddb tree:
r293 | jcea | 2008-01-31 01:08:19 -0800 (Thu, 31 Jan 2008) | 4 lines
Solved memory leak when using cursors with
databases without environment.
........
r60546 | gregory.p.smith | 2008-02-03 09:01:46 +0100 (Sun, 03 Feb 2008) | 2 lines
remove a repeated occurance of a hardcoded berkeleydb library version number
........
r60549 | brett.cannon | 2008-02-03 10:59:21 +0100 (Sun, 03 Feb 2008) | 2 lines
Add an entry for r60537.
........
r60550 | georg.brandl | 2008-02-03 13:29:00 +0100 (Sun, 03 Feb 2008) | 2 lines
#2003: fix sentence.
........
r60551 | christian.heimes | 2008-02-03 15:34:18 +0100 (Sun, 03 Feb 2008) | 2 lines
Fixed paths to Windows build directories in build_ext.py
Use vsbuild instead of devenv in build.bat and _bsddb.vcproj
........
2008-02-03 12:51:08 -04:00
|
|
|
"(10, 1)\n"
|
2008-01-27 19:50:43 -04:00
|
|
|
">>> (0.0).as_integer_ratio()\n"
|
|
|
|
"(0, 1)\n"
|
|
|
|
">>> (-.25).as_integer_ratio()\n"
|
Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
NOTE: I blocked the following revisions:
svnmerge.py block -r 60521,60522,60528,60529,60534,60539
The new tests must be merged with lots of manual work.
........
r60493 | georg.brandl | 2008-02-01 12:59:08 +0100 (Fri, 01 Feb 2008) | 2 lines
Update IPv6 RFC number.
........
r60497 | georg.brandl | 2008-02-01 16:50:15 +0100 (Fri, 01 Feb 2008) | 2 lines
Add link checker builder, written for GHOP by Thomas Lamb.
........
r60500 | georg.brandl | 2008-02-01 19:08:09 +0100 (Fri, 01 Feb 2008) | 2 lines
Rename batch file.
........
r60504 | christian.heimes | 2008-02-01 19:49:26 +0100 (Fri, 01 Feb 2008) | 1 line
More int -> pid_t.
........
r60507 | georg.brandl | 2008-02-01 20:24:01 +0100 (Fri, 01 Feb 2008) | 2 lines
Wording nit.
........
r60510 | georg.brandl | 2008-02-01 21:45:33 +0100 (Fri, 01 Feb 2008) | 2 lines
Update for latest sphinx latex writer.
........
r60511 | raymond.hettinger | 2008-02-01 22:30:23 +0100 (Fri, 01 Feb 2008) | 1 line
Issue #1996: float.as_integer_ratio() should return fraction in lowest terms.
........
r60512 | raymond.hettinger | 2008-02-01 23:15:52 +0100 (Fri, 01 Feb 2008) | 1 line
Integer ratio should return ints instead of longs whereever possible.
........
r60513 | raymond.hettinger | 2008-02-01 23:22:50 +0100 (Fri, 01 Feb 2008) | 1 line
labs() takes a long for an input.
........
r60514 | raymond.hettinger | 2008-02-01 23:42:59 +0100 (Fri, 01 Feb 2008) | 1 line
Test round-trip on float.as_integer_ratio() and float.__truediv__().
........
r60515 | marc-andre.lemburg | 2008-02-01 23:58:17 +0100 (Fri, 01 Feb 2008) | 3 lines
Bump distutils version number to match Python version.
........
r60516 | raymond.hettinger | 2008-02-02 00:12:19 +0100 (Sat, 02 Feb 2008) | 1 line
Fix int/long typecase. Add check for non-binary floating point.
........
r60517 | raymond.hettinger | 2008-02-02 00:45:44 +0100 (Sat, 02 Feb 2008) | 1 line
Add protection from weirdness while scaling the mantissa to an integer.
........
r60518 | raymond.hettinger | 2008-02-02 06:11:40 +0100 (Sat, 02 Feb 2008) | 1 line
Simpler solution to handling non-IEEE 754 environments.
........
r60519 | raymond.hettinger | 2008-02-02 06:24:44 +0100 (Sat, 02 Feb 2008) | 1 line
Neaten-up a bit.
........
r60520 | georg.brandl | 2008-02-02 10:56:20 +0100 (Sat, 02 Feb 2008) | 2 lines
Amendments to the urllib2 docs, written for GHOP by Thomas Lamb.
........
r60525 | georg.brandl | 2008-02-02 11:49:58 +0100 (Sat, 02 Feb 2008) | 3 lines
Add email example how to send a multipart message.
Written for GHOP by Martin Matejek.
........
r60526 | georg.brandl | 2008-02-02 12:05:00 +0100 (Sat, 02 Feb 2008) | 2 lines
Rewrite test_socketserver as unittest, written for GHOP by Benjamin Petersen.
........
r60527 | georg.brandl | 2008-02-02 12:05:34 +0100 (Sat, 02 Feb 2008) | 2 lines
Add GHOP contributor.
........
r60530 | mark.dickinson | 2008-02-02 18:16:13 +0100 (Sat, 02 Feb 2008) | 2 lines
Make the Rational constructor accept '3.' and '.2' as well as '3.2'.
........
r60531 | neal.norwitz | 2008-02-02 19:52:51 +0100 (Sat, 02 Feb 2008) | 1 line
Update the leaky tests (ie, ignore these tests if they report leaks). This version has been running for a while.
........
r60533 | skip.montanaro | 2008-02-02 20:11:57 +0100 (Sat, 02 Feb 2008) | 7 lines
Split the refleak mail body into two parts, the first being those failing
tests which are deemed more important issues, the second those which are
known to have difficult to solve problems and are generally expected to
leak. Hopefully this doesn't break the script...
........
r60535 | georg.brandl | 2008-02-03 01:04:50 +0100 (Sun, 03 Feb 2008) | 3 lines
Wait for a delay before reaping children -- this should fix the
test_socketserver failures on several platforms.
........
r60536 | brett.cannon | 2008-02-03 03:07:55 +0100 (Sun, 03 Feb 2008) | 2 lines
Fix a minor typo.
........
r60537 | brett.cannon | 2008-02-03 03:08:45 +0100 (Sun, 03 Feb 2008) | 3 lines
Directories from CPPFLAGS and LDFLAGS were being added in the reverse order for
searches as to how they were listed in the environment variable.
........
r60538 | brett.cannon | 2008-02-03 03:34:14 +0100 (Sun, 03 Feb 2008) | 2 lines
Remove extra tick marks and add a missing closing parenthesis.
........
r60540 | andrew.macintyre | 2008-02-03 07:58:06 +0100 (Sun, 03 Feb 2008) | 2 lines
Update OS/2 EMX build bits for 2.6.
........
r60541 | andrew.macintyre | 2008-02-03 08:01:11 +0100 (Sun, 03 Feb 2008) | 2 lines
Rename module definition file to reflect v2.6.
........
r60542 | andrew.macintyre | 2008-02-03 08:07:31 +0100 (Sun, 03 Feb 2008) | 6 lines
The wrapper function is supposed to be for spawnvpe() so that's
what we should call [this wrapper only available on OS/2].
Backport candidate to 2.5.
........
r60544 | gregory.p.smith | 2008-02-03 08:20:53 +0100 (Sun, 03 Feb 2008) | 6 lines
Merge this fix from the pybsddb tree:
r293 | jcea | 2008-01-31 01:08:19 -0800 (Thu, 31 Jan 2008) | 4 lines
Solved memory leak when using cursors with
databases without environment.
........
r60546 | gregory.p.smith | 2008-02-03 09:01:46 +0100 (Sun, 03 Feb 2008) | 2 lines
remove a repeated occurance of a hardcoded berkeleydb library version number
........
r60549 | brett.cannon | 2008-02-03 10:59:21 +0100 (Sun, 03 Feb 2008) | 2 lines
Add an entry for r60537.
........
r60550 | georg.brandl | 2008-02-03 13:29:00 +0100 (Sun, 03 Feb 2008) | 2 lines
#2003: fix sentence.
........
r60551 | christian.heimes | 2008-02-03 15:34:18 +0100 (Sun, 03 Feb 2008) | 2 lines
Fixed paths to Windows build directories in build_ext.py
Use vsbuild instead of devenv in build.bat and _bsddb.vcproj
........
2008-02-03 12:51:08 -04:00
|
|
|
"(-1, 4)");
|
2008-01-27 19:50:43 -04:00
|
|
|
|
1992-09-12 08:09:23 -03:00
|
|
|
|
2002-07-17 13:30:39 -03:00
|
|
|
static PyObject *
|
2001-08-29 12:47:46 -03:00
|
|
|
float_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
|
|
|
|
|
2001-08-02 01:15:00 -03:00
|
|
|
static PyObject *
|
|
|
|
float_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
PyObject *x = Py_False; /* Integer zero */
|
|
|
|
static char *kwlist[] = {"x", 0};
|
|
|
|
|
|
|
|
if (type != &PyFloat_Type)
|
|
|
|
return float_subtype_new(type, args, kwds); /* Wimp out */
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:float", kwlist, &x))
|
|
|
|
return NULL;
|
|
|
|
/* If it's a string, but not a string subclass, use
|
|
|
|
PyFloat_FromString. */
|
|
|
|
if (PyUnicode_CheckExact(x))
|
|
|
|
return PyFloat_FromString(x);
|
|
|
|
return PyNumber_Float(x);
|
2001-08-02 01:15:00 -03:00
|
|
|
}
|
|
|
|
|
2001-08-29 12:47:46 -03:00
|
|
|
/* Wimpy, slow approach to tp_new calls for subtypes of float:
|
|
|
|
first create a regular float from whatever arguments we got,
|
|
|
|
then allocate a subtype instance and initialize its ob_fval
|
|
|
|
from the regular float. The regular float is then thrown away.
|
|
|
|
*/
|
|
|
|
static PyObject *
|
|
|
|
float_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
PyObject *tmp, *newobj;
|
|
|
|
|
|
|
|
assert(PyType_IsSubtype(type, &PyFloat_Type));
|
|
|
|
tmp = float_new(&PyFloat_Type, args, kwds);
|
|
|
|
if (tmp == NULL)
|
|
|
|
return NULL;
|
|
|
|
assert(PyFloat_CheckExact(tmp));
|
|
|
|
newobj = type->tp_alloc(type, 0);
|
|
|
|
if (newobj == NULL) {
|
|
|
|
Py_DECREF(tmp);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
((PyFloatObject *)newobj)->ob_fval = ((PyFloatObject *)tmp)->ob_fval;
|
|
|
|
Py_DECREF(tmp);
|
|
|
|
return newobj;
|
2001-08-29 12:47:46 -03:00
|
|
|
}
|
|
|
|
|
2003-01-29 13:58:45 -04:00
|
|
|
static PyObject *
|
|
|
|
float_getnewargs(PyFloatObject *v)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
return Py_BuildValue("(d)", v->ob_fval);
|
2003-01-29 13:58:45 -04:00
|
|
|
}
|
|
|
|
|
2005-05-27 12:23:20 -03:00
|
|
|
/* this is for the benefit of the pack/unpack routines below */
|
|
|
|
|
|
|
|
typedef enum {
|
2010-05-09 13:14:21 -03:00
|
|
|
unknown_format, ieee_big_endian_format, ieee_little_endian_format
|
2005-05-27 12:23:20 -03:00
|
|
|
} float_format_type;
|
|
|
|
|
|
|
|
static float_format_type double_format, float_format;
|
|
|
|
static float_format_type detected_double_format, detected_float_format;
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
float_getformat(PyTypeObject *v, PyObject* arg)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
char* s;
|
|
|
|
float_format_type r;
|
|
|
|
|
|
|
|
if (!PyUnicode_Check(arg)) {
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"__getformat__() argument must be string, not %.500s",
|
|
|
|
Py_TYPE(arg)->tp_name);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
s = _PyUnicode_AsString(arg);
|
|
|
|
if (s == NULL)
|
|
|
|
return NULL;
|
|
|
|
if (strcmp(s, "double") == 0) {
|
|
|
|
r = double_format;
|
|
|
|
}
|
|
|
|
else if (strcmp(s, "float") == 0) {
|
|
|
|
r = float_format;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"__getformat__() argument 1 must be "
|
|
|
|
"'double' or 'float'");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (r) {
|
|
|
|
case unknown_format:
|
|
|
|
return PyUnicode_FromString("unknown");
|
|
|
|
case ieee_little_endian_format:
|
|
|
|
return PyUnicode_FromString("IEEE, little-endian");
|
|
|
|
case ieee_big_endian_format:
|
|
|
|
return PyUnicode_FromString("IEEE, big-endian");
|
|
|
|
default:
|
|
|
|
Py_FatalError("insane float_format or double_format");
|
|
|
|
return NULL;
|
|
|
|
}
|
2005-05-27 12:23:20 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(float_getformat_doc,
|
|
|
|
"float.__getformat__(typestr) -> string\n"
|
|
|
|
"\n"
|
|
|
|
"You probably don't want to use this function. It exists mainly to be\n"
|
|
|
|
"used in Python's test suite.\n"
|
|
|
|
"\n"
|
|
|
|
"typestr must be 'double' or 'float'. This function returns whichever of\n"
|
|
|
|
"'unknown', 'IEEE, big-endian' or 'IEEE, little-endian' best describes the\n"
|
|
|
|
"format of floating point numbers used by the C type named by typestr.");
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
float_setformat(PyTypeObject *v, PyObject* args)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
char* typestr;
|
|
|
|
char* format;
|
|
|
|
float_format_type f;
|
|
|
|
float_format_type detected;
|
|
|
|
float_format_type *p;
|
|
|
|
|
|
|
|
if (!PyArg_ParseTuple(args, "ss:__setformat__", &typestr, &format))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (strcmp(typestr, "double") == 0) {
|
|
|
|
p = &double_format;
|
|
|
|
detected = detected_double_format;
|
|
|
|
}
|
|
|
|
else if (strcmp(typestr, "float") == 0) {
|
|
|
|
p = &float_format;
|
|
|
|
detected = detected_float_format;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"__setformat__() argument 1 must "
|
|
|
|
"be 'double' or 'float'");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strcmp(format, "unknown") == 0) {
|
|
|
|
f = unknown_format;
|
|
|
|
}
|
|
|
|
else if (strcmp(format, "IEEE, little-endian") == 0) {
|
|
|
|
f = ieee_little_endian_format;
|
|
|
|
}
|
|
|
|
else if (strcmp(format, "IEEE, big-endian") == 0) {
|
|
|
|
f = ieee_big_endian_format;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"__setformat__() argument 2 must be "
|
|
|
|
"'unknown', 'IEEE, little-endian' or "
|
|
|
|
"'IEEE, big-endian'");
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (f != unknown_format && f != detected) {
|
|
|
|
PyErr_Format(PyExc_ValueError,
|
|
|
|
"can only set %s format to 'unknown' or the "
|
|
|
|
"detected platform value", typestr);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
*p = f;
|
|
|
|
Py_RETURN_NONE;
|
2005-05-27 12:23:20 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(float_setformat_doc,
|
|
|
|
"float.__setformat__(typestr, fmt) -> None\n"
|
|
|
|
"\n"
|
|
|
|
"You probably don't want to use this function. It exists mainly to be\n"
|
|
|
|
"used in Python's test suite.\n"
|
|
|
|
"\n"
|
|
|
|
"typestr must be 'double' or 'float'. fmt must be one of 'unknown',\n"
|
|
|
|
"'IEEE, big-endian' or 'IEEE, little-endian', and in addition can only be\n"
|
|
|
|
"one of the latter two if it appears to match the underlying C reality.\n"
|
|
|
|
"\n"
|
|
|
|
"Overrides the automatic determination of C-level floating point type.\n"
|
|
|
|
"This affects how floats are converted to and from binary strings.");
|
|
|
|
|
2007-08-01 15:08:08 -03:00
|
|
|
static PyObject *
|
|
|
|
float_getzero(PyObject *v, void *closure)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
return PyFloat_FromDouble(0.0);
|
2007-08-01 15:08:08 -03:00
|
|
|
}
|
|
|
|
|
2007-08-24 23:26:07 -03:00
|
|
|
static PyObject *
|
|
|
|
float__format__(PyObject *self, PyObject *args)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
PyObject *format_spec;
|
2008-05-30 15:10:19 -03:00
|
|
|
|
2010-05-09 13:14:21 -03:00
|
|
|
if (!PyArg_ParseTuple(args, "U:__format__", &format_spec))
|
|
|
|
return NULL;
|
|
|
|
return _PyFloat_FormatAdvanced(self,
|
|
|
|
PyUnicode_AS_UNICODE(format_spec),
|
|
|
|
PyUnicode_GET_SIZE(format_spec));
|
2007-08-24 23:26:07 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(float__format__doc,
|
|
|
|
"float.__format__(format_spec) -> string\n"
|
|
|
|
"\n"
|
|
|
|
"Formats the float according to format_spec.");
|
|
|
|
|
|
|
|
|
2003-01-29 13:58:45 -04:00
|
|
|
static PyMethodDef float_methods[] = {
|
2010-05-09 13:14:21 -03:00
|
|
|
{"conjugate", (PyCFunction)float_float, METH_NOARGS,
|
|
|
|
"Returns self, the complex conjugate of any float."},
|
|
|
|
{"__trunc__", (PyCFunction)float_trunc, METH_NOARGS,
|
|
|
|
"Returns the Integral closest to x between 0 and x."},
|
|
|
|
{"__round__", (PyCFunction)float_round, METH_VARARGS,
|
|
|
|
"Returns the Integral closest to x, rounding half toward even.\n"
|
|
|
|
"When an argument is passed, works like built-in round(x, ndigits)."},
|
|
|
|
{"as_integer_ratio", (PyCFunction)float_as_integer_ratio, METH_NOARGS,
|
|
|
|
float_as_integer_ratio_doc},
|
|
|
|
{"fromhex", (PyCFunction)float_fromhex,
|
|
|
|
METH_O|METH_CLASS, float_fromhex_doc},
|
|
|
|
{"hex", (PyCFunction)float_hex,
|
|
|
|
METH_NOARGS, float_hex_doc},
|
|
|
|
{"is_integer", (PyCFunction)float_is_integer, METH_NOARGS,
|
|
|
|
"Returns True if the float is an integer."},
|
2008-04-18 21:31:39 -03:00
|
|
|
#if 0
|
2010-05-09 13:14:21 -03:00
|
|
|
{"is_inf", (PyCFunction)float_is_inf, METH_NOARGS,
|
|
|
|
"Returns True if the float is positive or negative infinite."},
|
|
|
|
{"is_finite", (PyCFunction)float_is_finite, METH_NOARGS,
|
|
|
|
"Returns True if the float is finite, neither infinite nor NaN."},
|
|
|
|
{"is_nan", (PyCFunction)float_is_nan, METH_NOARGS,
|
|
|
|
"Returns True if the float is not a number (NaN)."},
|
2008-04-18 21:31:39 -03:00
|
|
|
#endif
|
2010-05-09 13:14:21 -03:00
|
|
|
{"__getnewargs__", (PyCFunction)float_getnewargs, METH_NOARGS},
|
|
|
|
{"__getformat__", (PyCFunction)float_getformat,
|
|
|
|
METH_O|METH_CLASS, float_getformat_doc},
|
|
|
|
{"__setformat__", (PyCFunction)float_setformat,
|
|
|
|
METH_VARARGS|METH_CLASS, float_setformat_doc},
|
|
|
|
{"__format__", (PyCFunction)float__format__,
|
|
|
|
METH_VARARGS, float__format__doc},
|
|
|
|
{NULL, NULL} /* sentinel */
|
2003-01-29 13:58:45 -04:00
|
|
|
};
|
|
|
|
|
2007-08-01 15:08:08 -03:00
|
|
|
static PyGetSetDef float_getset[] = {
|
2010-05-09 13:14:21 -03:00
|
|
|
{"real",
|
2007-08-01 15:08:08 -03:00
|
|
|
(getter)float_float, (setter)NULL,
|
|
|
|
"the real part of a complex number",
|
|
|
|
NULL},
|
2010-05-09 13:14:21 -03:00
|
|
|
{"imag",
|
2007-08-01 15:08:08 -03:00
|
|
|
(getter)float_getzero, (setter)NULL,
|
|
|
|
"the imaginary part of a complex number",
|
|
|
|
NULL},
|
|
|
|
{NULL} /* Sentinel */
|
|
|
|
};
|
|
|
|
|
2002-06-13 17:33:02 -03:00
|
|
|
PyDoc_STRVAR(float_doc,
|
2001-08-02 01:15:00 -03:00
|
|
|
"float(x) -> floating point number\n\
|
|
|
|
\n\
|
2002-06-13 17:33:02 -03:00
|
|
|
Convert a string or number to a floating point number, if possible.");
|
2001-08-02 01:15:00 -03:00
|
|
|
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyNumberMethods float_as_number = {
|
2010-05-09 13:14:21 -03:00
|
|
|
float_add, /*nb_add*/
|
|
|
|
float_sub, /*nb_subtract*/
|
|
|
|
float_mul, /*nb_multiply*/
|
|
|
|
float_rem, /*nb_remainder*/
|
|
|
|
float_divmod, /*nb_divmod*/
|
|
|
|
float_pow, /*nb_power*/
|
|
|
|
(unaryfunc)float_neg, /*nb_negative*/
|
|
|
|
(unaryfunc)float_float, /*nb_positive*/
|
|
|
|
(unaryfunc)float_abs, /*nb_absolute*/
|
|
|
|
(inquiry)float_bool, /*nb_bool*/
|
|
|
|
0, /*nb_invert*/
|
|
|
|
0, /*nb_lshift*/
|
|
|
|
0, /*nb_rshift*/
|
|
|
|
0, /*nb_and*/
|
|
|
|
0, /*nb_xor*/
|
|
|
|
0, /*nb_or*/
|
|
|
|
float_trunc, /*nb_int*/
|
|
|
|
0, /*nb_reserved*/
|
|
|
|
float_float, /*nb_float*/
|
|
|
|
0, /* nb_inplace_add */
|
|
|
|
0, /* nb_inplace_subtract */
|
|
|
|
0, /* nb_inplace_multiply */
|
|
|
|
0, /* nb_inplace_remainder */
|
|
|
|
0, /* nb_inplace_power */
|
|
|
|
0, /* nb_inplace_lshift */
|
|
|
|
0, /* nb_inplace_rshift */
|
|
|
|
0, /* nb_inplace_and */
|
|
|
|
0, /* nb_inplace_xor */
|
|
|
|
0, /* nb_inplace_or */
|
|
|
|
float_floor_div, /* nb_floor_divide */
|
|
|
|
float_div, /* nb_true_divide */
|
|
|
|
0, /* nb_inplace_floor_divide */
|
|
|
|
0, /* nb_inplace_true_divide */
|
1990-10-14 09:07:46 -03:00
|
|
|
};
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
PyTypeObject PyFloat_Type = {
|
2010-05-09 13:14:21 -03:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
"float",
|
|
|
|
sizeof(PyFloatObject),
|
|
|
|
0,
|
|
|
|
(destructor)float_dealloc, /* tp_dealloc */
|
|
|
|
0, /* tp_print */
|
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
|
|
|
0, /* tp_reserved */
|
|
|
|
(reprfunc)float_repr, /* tp_repr */
|
|
|
|
&float_as_number, /* tp_as_number */
|
|
|
|
0, /* tp_as_sequence */
|
|
|
|
0, /* tp_as_mapping */
|
|
|
|
(hashfunc)float_hash, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
(reprfunc)float_str, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
|
|
|
float_doc, /* tp_doc */
|
|
|
|
0, /* tp_traverse */
|
|
|
|
0, /* tp_clear */
|
|
|
|
float_richcompare, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
0, /* tp_iter */
|
|
|
|
0, /* tp_iternext */
|
|
|
|
float_methods, /* tp_methods */
|
|
|
|
0, /* tp_members */
|
|
|
|
float_getset, /* tp_getset */
|
|
|
|
0, /* tp_base */
|
|
|
|
0, /* tp_dict */
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
0, /* tp_dictoffset */
|
|
|
|
0, /* tp_init */
|
|
|
|
0, /* tp_alloc */
|
|
|
|
float_new, /* tp_new */
|
1990-10-14 09:07:46 -03:00
|
|
|
};
|
1997-08-04 23:16:08 -03:00
|
|
|
|
2005-05-27 12:23:20 -03:00
|
|
|
void
|
|
|
|
_PyFloat_Init(void)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
/* We attempt to determine if this machine is using IEEE
|
|
|
|
floating point formats by peering at the bits of some
|
|
|
|
carefully chosen values. If it looks like we are on an
|
|
|
|
IEEE platform, the float packing/unpacking routines can
|
|
|
|
just copy bits, if not they resort to arithmetic & shifts
|
|
|
|
and masks. The shifts & masks approach works on all finite
|
|
|
|
values, but what happens to infinities, NaNs and signed
|
|
|
|
zeroes on packing is an accident, and attempting to unpack
|
|
|
|
a NaN or an infinity will raise an exception.
|
|
|
|
|
|
|
|
Note that if we're on some whacked-out platform which uses
|
|
|
|
IEEE formats but isn't strictly little-endian or big-
|
|
|
|
endian, we will fall back to the portable shifts & masks
|
|
|
|
method. */
|
2005-05-27 12:23:20 -03:00
|
|
|
|
|
|
|
#if SIZEOF_DOUBLE == 8
|
2010-05-09 13:14:21 -03:00
|
|
|
{
|
|
|
|
double x = 9006104071832581.0;
|
|
|
|
if (memcmp(&x, "\x43\x3f\xff\x01\x02\x03\x04\x05", 8) == 0)
|
|
|
|
detected_double_format = ieee_big_endian_format;
|
|
|
|
else if (memcmp(&x, "\x05\x04\x03\x02\x01\xff\x3f\x43", 8) == 0)
|
|
|
|
detected_double_format = ieee_little_endian_format;
|
|
|
|
else
|
|
|
|
detected_double_format = unknown_format;
|
|
|
|
}
|
2005-05-27 12:23:20 -03:00
|
|
|
#else
|
2010-05-09 13:14:21 -03:00
|
|
|
detected_double_format = unknown_format;
|
2005-05-27 12:23:20 -03:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if SIZEOF_FLOAT == 4
|
2010-05-09 13:14:21 -03:00
|
|
|
{
|
|
|
|
float y = 16711938.0;
|
|
|
|
if (memcmp(&y, "\x4b\x7f\x01\x02", 4) == 0)
|
|
|
|
detected_float_format = ieee_big_endian_format;
|
|
|
|
else if (memcmp(&y, "\x02\x01\x7f\x4b", 4) == 0)
|
|
|
|
detected_float_format = ieee_little_endian_format;
|
|
|
|
else
|
|
|
|
detected_float_format = unknown_format;
|
|
|
|
}
|
2005-05-27 12:23:20 -03:00
|
|
|
#else
|
2010-05-09 13:14:21 -03:00
|
|
|
detected_float_format = unknown_format;
|
2005-05-27 12:23:20 -03:00
|
|
|
#endif
|
|
|
|
|
2010-05-09 13:14:21 -03:00
|
|
|
double_format = detected_double_format;
|
|
|
|
float_format = detected_float_format;
|
2007-12-10 21:06:40 -04:00
|
|
|
|
2010-05-09 13:14:21 -03:00
|
|
|
/* Init float info */
|
|
|
|
if (FloatInfoType.tp_name == 0)
|
|
|
|
PyStructSequence_InitType(&FloatInfoType, &floatinfo_desc);
|
2005-05-27 12:23:20 -03:00
|
|
|
}
|
|
|
|
|
Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r64722 | georg.brandl | 2008-07-05 12:13:36 +0200 (Sat, 05 Jul 2008) | 4 lines
#2663: support an *ignore* argument to shutil.copytree(). Patch by Tarek Ziade.
This is a new feature, but Barry authorized adding it in the beta period.
........
r64729 | mark.dickinson | 2008-07-05 13:33:52 +0200 (Sat, 05 Jul 2008) | 5 lines
Issue 3188: accept float('infinity') as well as float('inf'). This
makes the float constructor behave in the same way as specified
by various other language standards, including C99, IEEE 754r,
and the IBM Decimal standard.
........
r64753 | gregory.p.smith | 2008-07-06 05:35:58 +0200 (Sun, 06 Jul 2008) | 4 lines
- Issue #2862: Make int and float freelist management consistent with other
freelists. Changes their CompactFreeList apis into ClearFreeList apis and
calls them via gc.collect().
........
r64845 | raymond.hettinger | 2008-07-10 16:03:19 +0200 (Thu, 10 Jul 2008) | 1 line
Issue 3301: Bisect functions behaved badly when lo was negative.
........
r64846 | raymond.hettinger | 2008-07-10 16:34:57 +0200 (Thu, 10 Jul 2008) | 1 line
Issue 3285: Fractions from_float() and from_decimal() accept Integral arguments.
........
r64849 | andrew.kuchling | 2008-07-10 16:43:31 +0200 (Thu, 10 Jul 2008) | 1 line
Wording changes
........
r64871 | raymond.hettinger | 2008-07-11 14:00:21 +0200 (Fri, 11 Jul 2008) | 1 line
Add cautionary note on the use of PySequence_Fast_ITEMS.
........
r64880 | amaury.forgeotdarc | 2008-07-11 23:28:25 +0200 (Fri, 11 Jul 2008) | 5 lines
#3317 in zipfile module, restore the previous names of global variables:
some applications relied on them.
Also remove duplicated lines.
........
r64881 | amaury.forgeotdarc | 2008-07-11 23:45:06 +0200 (Fri, 11 Jul 2008) | 3 lines
#3342: In tracebacks, printed source lines were not indented since r62555.
#3343: Py_DisplaySourceLine should be a private function. Rename it to _Py_DisplaySourceLine.
........
r64882 | josiah.carlson | 2008-07-12 00:17:14 +0200 (Sat, 12 Jul 2008) | 2 lines
Fix for the AttributeError in test_asynchat.
........
r64885 | josiah.carlson | 2008-07-12 01:26:59 +0200 (Sat, 12 Jul 2008) | 2 lines
Fixed test for asyncore.
........
r64888 | matthias.klose | 2008-07-12 09:51:48 +0200 (Sat, 12 Jul 2008) | 2 lines
- Fix bashisms in Tools/faqwiz/move-faqwiz.sh
........
r64897 | benjamin.peterson | 2008-07-12 22:16:19 +0200 (Sat, 12 Jul 2008) | 1 line
fix various doc typos #3320
........
r64900 | alexandre.vassalotti | 2008-07-13 00:06:53 +0200 (Sun, 13 Jul 2008) | 2 lines
Fixed typo.
........
r64901 | benjamin.peterson | 2008-07-13 01:41:19 +0200 (Sun, 13 Jul 2008) | 1 line
#1778443 robotparser fixes from Aristotelis Mikropoulos
........
r64915 | nick.coghlan | 2008-07-13 16:52:36 +0200 (Sun, 13 Jul 2008) | 1 line
Fix issue 3221 by emitting a RuntimeWarning instead of raising SystemError when the parent module can't be found during an absolute import (likely due to non-PEP 361 aware code which sets a module level __package__ attribute)
........
r64926 | martin.v.loewis | 2008-07-13 22:31:49 +0200 (Sun, 13 Jul 2008) | 2 lines
Add turtle into the module index.
........
r64927 | alexandre.vassalotti | 2008-07-13 22:42:44 +0200 (Sun, 13 Jul 2008) | 3 lines
Issue #3274: Use a less common identifier for the temporary variable
in Py_CLEAR().
........
r64928 | andrew.kuchling | 2008-07-13 23:43:25 +0200 (Sun, 13 Jul 2008) | 1 line
Re-word
........
r64929 | andrew.kuchling | 2008-07-13 23:43:52 +0200 (Sun, 13 Jul 2008) | 1 line
Add various items; move ctypes items into a subsection of their own
........
r64938 | andrew.kuchling | 2008-07-14 02:35:32 +0200 (Mon, 14 Jul 2008) | 1 line
Typo fixes
........
r64939 | andrew.kuchling | 2008-07-14 02:40:55 +0200 (Mon, 14 Jul 2008) | 1 line
Typo fix
........
r64940 | andrew.kuchling | 2008-07-14 03:18:16 +0200 (Mon, 14 Jul 2008) | 1 line
Typo fix
........
r64941 | andrew.kuchling | 2008-07-14 03:18:31 +0200 (Mon, 14 Jul 2008) | 1 line
Expand the multiprocessing section
........
r64944 | gregory.p.smith | 2008-07-14 08:06:48 +0200 (Mon, 14 Jul 2008) | 7 lines
Fix posix.fork1() / os.fork1() to only call PyOS_AfterFork() in the child
process rather than both parent and child.
Does anyone actually use fork1()? It appears to be a Solaris thing
but if Python is built with pthreads on Solaris, fork1() and fork()
should be the same.
........
r64961 | jesse.noller | 2008-07-15 15:47:33 +0200 (Tue, 15 Jul 2008) | 1 line
multiprocessing/connection.py patch to remove fqdn oddness for issue 3270
........
r64966 | nick.coghlan | 2008-07-15 17:40:22 +0200 (Tue, 15 Jul 2008) | 1 line
Add missing NEWS entry for r64962
........
r64973 | jesse.noller | 2008-07-15 20:29:18 +0200 (Tue, 15 Jul 2008) | 1 line
Revert 3270 patch: self._address is in pretty widespread use, need to revisit
........
2008-07-16 09:55:28 -03:00
|
|
|
int
|
|
|
|
PyFloat_ClearFreeList(void)
|
1997-08-04 23:16:08 -03:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
PyFloatObject *p;
|
|
|
|
PyFloatBlock *list, *next;
|
|
|
|
int i;
|
|
|
|
int u; /* remaining unfreed floats per block */
|
|
|
|
int freelist_size = 0;
|
|
|
|
|
|
|
|
list = block_list;
|
|
|
|
block_list = NULL;
|
|
|
|
free_list = NULL;
|
|
|
|
while (list != NULL) {
|
|
|
|
u = 0;
|
|
|
|
for (i = 0, p = &list->objects[0];
|
|
|
|
i < N_FLOATOBJECTS;
|
|
|
|
i++, p++) {
|
|
|
|
if (PyFloat_CheckExact(p) && Py_REFCNT(p) != 0)
|
|
|
|
u++;
|
|
|
|
}
|
|
|
|
next = list->next;
|
|
|
|
if (u) {
|
|
|
|
list->next = block_list;
|
|
|
|
block_list = list;
|
|
|
|
for (i = 0, p = &list->objects[0];
|
|
|
|
i < N_FLOATOBJECTS;
|
|
|
|
i++, p++) {
|
|
|
|
if (!PyFloat_CheckExact(p) ||
|
|
|
|
Py_REFCNT(p) == 0) {
|
|
|
|
Py_TYPE(p) = (struct _typeobject *)
|
|
|
|
free_list;
|
|
|
|
free_list = p;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyMem_FREE(list);
|
|
|
|
}
|
|
|
|
freelist_size += u;
|
|
|
|
list = next;
|
|
|
|
}
|
|
|
|
return freelist_size;
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60553 | neal.norwitz | 2008-02-03 17:53:09 +0100 (Sun, 03 Feb 2008) | 1 line
Ignore leaky warnings from test_asynchat
........
r60555 | christian.heimes | 2008-02-03 20:51:13 +0100 (Sun, 03 Feb 2008) | 1 line
Another int -> pid_t case
........
r60560 | amaury.forgeotdarc | 2008-02-03 23:51:43 +0100 (Sun, 03 Feb 2008) | 6 lines
Ensure that PySet_Add() operates on a newly created frozenset, like PyTuple_SetItem does.
Add PyFrozenSet_Check(), which was not needed before; The list of Py*Set_Check* macros seems to be complete now.
Add missing NEWS entries about all this.
........
r60563 | amaury.forgeotdarc | 2008-02-04 00:14:32 +0100 (Mon, 04 Feb 2008) | 2 lines
Nasty typo in setobject.h
........
r60564 | amaury.forgeotdarc | 2008-02-04 00:15:32 +0100 (Mon, 04 Feb 2008) | 3 lines
Correct test_mailbox on win32: since the test sets a custom 'colon' attribute
to the main mailbox, copy it to secondary mailbox instances.
........
r60565 | amaury.forgeotdarc | 2008-02-04 00:57:24 +0100 (Mon, 04 Feb 2008) | 2 lines
Let test_socketserver pass on win32, which does not have AF_UNIX sockets.
........
r60566 | jeffrey.yasskin | 2008-02-04 02:04:35 +0100 (Mon, 04 Feb 2008) | 2 lines
Make int() and long() fall back to __trunc__(). See issue 2002.
........
r60567 | christian.heimes | 2008-02-04 19:00:12 +0100 (Mon, 04 Feb 2008) | 3 lines
Patch #1953
I implemented the function sys._compact_freelists() and C API functions PyInt_/PyFloat_CompactFreeList() to compact the pre-allocated blocks of ints and floats. They allow the user to reduce the memory usage of a Python process that deals with lots of numbers.
The patch also renames sys._cleartypecache to sys._clear_type_cache
........
2008-02-04 14:48:49 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
PyFloat_Fini(void)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
PyFloatObject *p;
|
|
|
|
PyFloatBlock *list;
|
|
|
|
int i;
|
|
|
|
int u; /* total unfreed floats per block */
|
|
|
|
|
|
|
|
u = PyFloat_ClearFreeList();
|
|
|
|
|
|
|
|
if (!Py_VerboseFlag)
|
|
|
|
return;
|
|
|
|
fprintf(stderr, "# cleanup floats");
|
|
|
|
if (!u) {
|
|
|
|
fprintf(stderr, "\n");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
fprintf(stderr,
|
|
|
|
": %d unfreed float%s\n",
|
|
|
|
u, u == 1 ? "" : "s");
|
|
|
|
}
|
|
|
|
if (Py_VerboseFlag > 1) {
|
|
|
|
list = block_list;
|
|
|
|
while (list != NULL) {
|
|
|
|
for (i = 0, p = &list->objects[0];
|
|
|
|
i < N_FLOATOBJECTS;
|
|
|
|
i++, p++) {
|
|
|
|
if (PyFloat_CheckExact(p) &&
|
|
|
|
Py_REFCNT(p) != 0) {
|
|
|
|
char *buf = PyOS_double_to_string(
|
|
|
|
PyFloat_AS_DOUBLE(p), 'r',
|
|
|
|
0, 0, NULL);
|
|
|
|
if (buf) {
|
|
|
|
/* XXX(twouters) cast
|
|
|
|
refcount to long
|
|
|
|
until %zd is
|
|
|
|
universally
|
|
|
|
available
|
|
|
|
*/
|
|
|
|
fprintf(stderr,
|
|
|
|
"# <float at %p, refcnt=%ld, val=%s>\n",
|
|
|
|
p, (long)Py_REFCNT(p), buf);
|
|
|
|
PyMem_Free(buf);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
}
|
1997-08-04 23:16:08 -03:00
|
|
|
}
|
2003-03-20 16:53:32 -04:00
|
|
|
|
|
|
|
/*----------------------------------------------------------------------------
|
|
|
|
* _PyFloat_{Pack,Unpack}{4,8}. See floatobject.h.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
_PyFloat_Pack4(double x, unsigned char *p, int le)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
if (float_format == unknown_format) {
|
|
|
|
unsigned char sign;
|
|
|
|
int e;
|
|
|
|
double f;
|
|
|
|
unsigned int fbits;
|
|
|
|
int incr = 1;
|
|
|
|
|
|
|
|
if (le) {
|
|
|
|
p += 3;
|
|
|
|
incr = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (x < 0) {
|
|
|
|
sign = 1;
|
|
|
|
x = -x;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
sign = 0;
|
|
|
|
|
|
|
|
f = frexp(x, &e);
|
|
|
|
|
|
|
|
/* Normalize f to be in the range [1.0, 2.0) */
|
|
|
|
if (0.5 <= f && f < 1.0) {
|
|
|
|
f *= 2.0;
|
|
|
|
e--;
|
|
|
|
}
|
|
|
|
else if (f == 0.0)
|
|
|
|
e = 0;
|
|
|
|
else {
|
|
|
|
PyErr_SetString(PyExc_SystemError,
|
|
|
|
"frexp() result out of range");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (e >= 128)
|
|
|
|
goto Overflow;
|
|
|
|
else if (e < -126) {
|
|
|
|
/* Gradual underflow */
|
|
|
|
f = ldexp(f, 126 + e);
|
|
|
|
e = 0;
|
|
|
|
}
|
|
|
|
else if (!(e == 0 && f == 0.0)) {
|
|
|
|
e += 127;
|
|
|
|
f -= 1.0; /* Get rid of leading 1 */
|
|
|
|
}
|
|
|
|
|
|
|
|
f *= 8388608.0; /* 2**23 */
|
|
|
|
fbits = (unsigned int)(f + 0.5); /* Round */
|
|
|
|
assert(fbits <= 8388608);
|
|
|
|
if (fbits >> 23) {
|
|
|
|
/* The carry propagated out of a string of 23 1 bits. */
|
|
|
|
fbits = 0;
|
|
|
|
++e;
|
|
|
|
if (e >= 255)
|
|
|
|
goto Overflow;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* First byte */
|
|
|
|
*p = (sign << 7) | (e >> 1);
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Second byte */
|
|
|
|
*p = (char) (((e & 1) << 7) | (fbits >> 16));
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Third byte */
|
|
|
|
*p = (fbits >> 8) & 0xFF;
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Fourth byte */
|
|
|
|
*p = fbits & 0xFF;
|
|
|
|
|
|
|
|
/* Done */
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
float y = (float)x;
|
|
|
|
const char *s = (char*)&y;
|
|
|
|
int i, incr = 1;
|
|
|
|
|
|
|
|
if (Py_IS_INFINITY(y) && !Py_IS_INFINITY(x))
|
|
|
|
goto Overflow;
|
|
|
|
|
|
|
|
if ((float_format == ieee_little_endian_format && !le)
|
|
|
|
|| (float_format == ieee_big_endian_format && le)) {
|
|
|
|
p += 3;
|
|
|
|
incr = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
*p = *s++;
|
|
|
|
p += incr;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r61239 | andrew.kuchling | 2008-03-05 01:44:41 +0100 (Wed, 05 Mar 2008) | 1 line
Add more items; add fragmentary notes
........
r61240 | amaury.forgeotdarc | 2008-03-05 02:50:33 +0100 (Wed, 05 Mar 2008) | 13 lines
Issue#2238: some syntax errors from *args or **kwargs expressions
would give bogus error messages, because of untested exceptions::
>>> f(**g(1=2))
XXX undetected error
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
TypeError: 'int' object is not iterable
instead of the expected SyntaxError: keyword can't be an expression
Will backport.
........
r61241 | neal.norwitz | 2008-03-05 06:10:48 +0100 (Wed, 05 Mar 2008) | 3 lines
Remove the files/dirs after closing the DB so the tests work on Windows.
Patch from Trent Nelson. Also simplified removing a file by using test_support.
........
r61242 | neal.norwitz | 2008-03-05 06:14:18 +0100 (Wed, 05 Mar 2008) | 3 lines
Get this test to pass even when there is no sound card in the system.
Patch from Trent Nelson. (I can't test this.)
........
r61243 | neal.norwitz | 2008-03-05 06:20:44 +0100 (Wed, 05 Mar 2008) | 3 lines
Catch OSError when trying to remove a file in case removal fails. This
should prevent a failure in tearDown masking any real test failure.
........
r61244 | neal.norwitz | 2008-03-05 06:38:06 +0100 (Wed, 05 Mar 2008) | 5 lines
Make the timeout longer to give slow machines a chance to pass the test
before timing out. This doesn't change the duration of the test under
normal circumstances. This is targetted at fixing the spurious failures
on the FreeBSD buildbot primarily.
........
r61245 | neal.norwitz | 2008-03-05 06:49:03 +0100 (Wed, 05 Mar 2008) | 1 line
Tabs -> spaces
........
r61246 | neal.norwitz | 2008-03-05 06:50:20 +0100 (Wed, 05 Mar 2008) | 1 line
Use -u urlfetch to run more tests
........
r61247 | neal.norwitz | 2008-03-05 06:51:20 +0100 (Wed, 05 Mar 2008) | 1 line
test_smtplib sometimes reports leaks too, suppress it
........
r61248 | jeffrey.yasskin | 2008-03-05 07:19:56 +0100 (Wed, 05 Mar 2008) | 5 lines
Fix test_socketserver on Windows after r61099 added several signal.alarm()
calls (which don't exist on non-Unix platforms).
Thanks to Trent Nelson for the report and patch.
........
r61249 | georg.brandl | 2008-03-05 08:10:35 +0100 (Wed, 05 Mar 2008) | 2 lines
Fix some rst.
........
r61252 | thomas.heller | 2008-03-05 15:53:39 +0100 (Wed, 05 Mar 2008) | 2 lines
News entry for yesterdays commit.
........
r61253 | thomas.heller | 2008-03-05 16:34:29 +0100 (Wed, 05 Mar 2008) | 3 lines
Issue 1872: Changed the struct module typecode from 't' to '?', for
compatibility with PEP3118.
........
r61254 | skip.montanaro | 2008-03-05 17:41:09 +0100 (Wed, 05 Mar 2008) | 4 lines
Elaborate on the role of the altinstall target when installing multiple
versions.
........
r61255 | georg.brandl | 2008-03-05 20:31:44 +0100 (Wed, 05 Mar 2008) | 2 lines
#2239: PYTHONPATH delimiter is os.pathsep.
........
r61256 | raymond.hettinger | 2008-03-05 21:59:58 +0100 (Wed, 05 Mar 2008) | 1 line
C implementation of itertools.permutations().
........
r61257 | raymond.hettinger | 2008-03-05 22:04:32 +0100 (Wed, 05 Mar 2008) | 1 line
Small code cleanup.
........
r61260 | martin.v.loewis | 2008-03-05 23:24:31 +0100 (Wed, 05 Mar 2008) | 2 lines
cd PCbuild only after deleting all pyc files.
........
r61261 | raymond.hettinger | 2008-03-06 02:15:52 +0100 (Thu, 06 Mar 2008) | 1 line
Add examples.
........
r61262 | andrew.kuchling | 2008-03-06 02:36:27 +0100 (Thu, 06 Mar 2008) | 1 line
Add two items
........
r61263 | georg.brandl | 2008-03-06 07:47:18 +0100 (Thu, 06 Mar 2008) | 2 lines
#1725737: ignore other VC directories other than CVS and SVN's too.
........
r61264 | martin.v.loewis | 2008-03-06 07:55:22 +0100 (Thu, 06 Mar 2008) | 4 lines
Patch #2232: os.tmpfile might fail on Windows if the user has no
permission to create files in the root directory.
Will backport to 2.5.
........
r61269 | georg.brandl | 2008-03-06 08:19:15 +0100 (Thu, 06 Mar 2008) | 2 lines
Expand on re.split behavior with captured expressions.
........
r61270 | georg.brandl | 2008-03-06 08:22:09 +0100 (Thu, 06 Mar 2008) | 2 lines
Little clarification of assignments.
........
r61271 | georg.brandl | 2008-03-06 08:31:34 +0100 (Thu, 06 Mar 2008) | 2 lines
Add isinstance/issubclass to tutorial.
........
r61272 | georg.brandl | 2008-03-06 08:34:52 +0100 (Thu, 06 Mar 2008) | 2 lines
Add missing NEWS entry for r61263.
........
r61273 | georg.brandl | 2008-03-06 08:41:16 +0100 (Thu, 06 Mar 2008) | 2 lines
#2225: return nonzero status code from py_compile if not all files could be compiled.
........
r61274 | georg.brandl | 2008-03-06 08:43:02 +0100 (Thu, 06 Mar 2008) | 2 lines
#2220: handle matching failure more gracefully.
........
r61275 | georg.brandl | 2008-03-06 08:45:52 +0100 (Thu, 06 Mar 2008) | 2 lines
Bug #2220: handle rlcompleter attribute match failure more gracefully.
........
r61278 | martin.v.loewis | 2008-03-06 14:49:47 +0100 (Thu, 06 Mar 2008) | 1 line
Rely on x64 platform configuration when building _bsddb on AMD64.
........
r61279 | martin.v.loewis | 2008-03-06 14:50:28 +0100 (Thu, 06 Mar 2008) | 1 line
Update db-4.4.20 build procedure.
........
r61285 | raymond.hettinger | 2008-03-06 21:52:01 +0100 (Thu, 06 Mar 2008) | 1 line
More tests.
........
r61286 | raymond.hettinger | 2008-03-06 23:51:36 +0100 (Thu, 06 Mar 2008) | 1 line
Issue 2246: itertools grouper object did not participate in GC (should be backported).
........
r61288 | raymond.hettinger | 2008-03-07 02:33:20 +0100 (Fri, 07 Mar 2008) | 1 line
Tweak recipes and tests
........
r61289 | jeffrey.yasskin | 2008-03-07 07:22:15 +0100 (Fri, 07 Mar 2008) | 5 lines
Progress on issue #1193577 by adding a polling .shutdown() method to
SocketServers. The core of the patch was written by Pedro Werneck, but any bugs
are mine. I've also rearranged the code for timeouts in order to avoid
interfering with the shutdown poll.
........
r61290 | nick.coghlan | 2008-03-07 15:13:28 +0100 (Fri, 07 Mar 2008) | 1 line
Speed up with statements by storing the __exit__ method on the stack instead of in a temp variable (bumps the magic number for pyc files)
........
r61298 | andrew.kuchling | 2008-03-07 22:09:23 +0100 (Fri, 07 Mar 2008) | 1 line
Grammar fix
........
r61303 | georg.brandl | 2008-03-08 10:54:06 +0100 (Sat, 08 Mar 2008) | 2 lines
#2253: fix continue vs. finally docs.
........
r61304 | marc-andre.lemburg | 2008-03-08 11:01:43 +0100 (Sat, 08 Mar 2008) | 3 lines
Add new name for Mandrake: Mandriva.
........
r61305 | georg.brandl | 2008-03-08 11:05:24 +0100 (Sat, 08 Mar 2008) | 2 lines
#1533486: fix types in refcount intro.
........
r61312 | facundo.batista | 2008-03-08 17:50:27 +0100 (Sat, 08 Mar 2008) | 5 lines
Issue 1106316. post_mortem()'s parameter, traceback, is now
optional: it defaults to the traceback of the exception that is currently
being handled.
........
r61313 | jeffrey.yasskin | 2008-03-08 19:26:54 +0100 (Sat, 08 Mar 2008) | 2 lines
Add tests for with and finally performance to pybench.
........
r61314 | jeffrey.yasskin | 2008-03-08 21:08:21 +0100 (Sat, 08 Mar 2008) | 2 lines
Fix pybench for pythons < 2.6, tested back to 2.3.
........
r61317 | jeffrey.yasskin | 2008-03-08 22:35:15 +0100 (Sat, 08 Mar 2008) | 3 lines
Well that was dumb. platform.python_implementation returns a function, not a
string.
........
r61329 | georg.brandl | 2008-03-09 16:11:39 +0100 (Sun, 09 Mar 2008) | 2 lines
#2249: document assertTrue and assertFalse.
........
r61332 | neal.norwitz | 2008-03-09 20:03:42 +0100 (Sun, 09 Mar 2008) | 4 lines
Introduce a lock to fix a race condition which caused an exception in the test.
Some buildbots were consistently failing (e.g., amd64).
Also remove a couple of semi-colons.
........
r61344 | raymond.hettinger | 2008-03-11 01:19:07 +0100 (Tue, 11 Mar 2008) | 1 line
Add recipe to docs.
........
r61350 | guido.van.rossum | 2008-03-11 22:18:06 +0100 (Tue, 11 Mar 2008) | 3 lines
Fix the overflows in expandtabs(). "This time for sure!"
(Exploit at request.)
........
r61351 | raymond.hettinger | 2008-03-11 22:37:46 +0100 (Tue, 11 Mar 2008) | 1 line
Improve docs for itemgetter(). Show that it works with slices.
........
r61363 | georg.brandl | 2008-03-13 08:15:56 +0100 (Thu, 13 Mar 2008) | 2 lines
#2265: fix example.
........
r61364 | georg.brandl | 2008-03-13 08:17:14 +0100 (Thu, 13 Mar 2008) | 2 lines
#2270: fix typo.
........
r61365 | georg.brandl | 2008-03-13 08:21:41 +0100 (Thu, 13 Mar 2008) | 2 lines
#1720705: add docs about import/threading interaction, wording by Nick.
........
r61366 | andrew.kuchling | 2008-03-13 12:07:35 +0100 (Thu, 13 Mar 2008) | 1 line
Add class decorators
........
r61367 | raymond.hettinger | 2008-03-13 17:43:17 +0100 (Thu, 13 Mar 2008) | 1 line
Add 2-to-3 support for the itertools moved to builtins or renamed.
........
r61368 | raymond.hettinger | 2008-03-13 17:43:59 +0100 (Thu, 13 Mar 2008) | 1 line
Consistent tense.
........
r61369 | raymond.hettinger | 2008-03-13 20:03:51 +0100 (Thu, 13 Mar 2008) | 1 line
Issue 2274: Add heapq.heappushpop().
........
r61370 | raymond.hettinger | 2008-03-13 20:33:34 +0100 (Thu, 13 Mar 2008) | 1 line
Simplify the nlargest() code using heappushpop().
........
r61371 | brett.cannon | 2008-03-13 21:27:00 +0100 (Thu, 13 Mar 2008) | 4 lines
Move test_thread over to unittest. Commits GHOP 237.
Thanks Benjamin Peterson for the patch.
........
r61372 | brett.cannon | 2008-03-13 21:33:10 +0100 (Thu, 13 Mar 2008) | 4 lines
Move test_tokenize to doctest.
Done as GHOP 238 by Josip Dzolonga.
........
r61373 | brett.cannon | 2008-03-13 21:47:41 +0100 (Thu, 13 Mar 2008) | 4 lines
Convert test_contains, test_crypt, and test_select to unittest.
Patch from GHOP 294 by David Marek.
........
r61374 | brett.cannon | 2008-03-13 22:02:16 +0100 (Thu, 13 Mar 2008) | 4 lines
Move test_gdbm to use unittest.
Closes issue #1960. Thanks Giampaolo Rodola.
........
r61375 | brett.cannon | 2008-03-13 22:09:28 +0100 (Thu, 13 Mar 2008) | 4 lines
Convert test_fcntl to unittest.
Closes issue #2055. Thanks Giampaolo Rodola.
........
r61376 | raymond.hettinger | 2008-03-14 06:03:44 +0100 (Fri, 14 Mar 2008) | 1 line
Leave heapreplace() unchanged.
........
r61378 | martin.v.loewis | 2008-03-14 14:56:09 +0100 (Fri, 14 Mar 2008) | 2 lines
Patch #2284: add -x64 option to rt.bat.
........
r61379 | martin.v.loewis | 2008-03-14 14:57:59 +0100 (Fri, 14 Mar 2008) | 2 lines
Use -x64 flag.
........
r61382 | brett.cannon | 2008-03-14 15:03:10 +0100 (Fri, 14 Mar 2008) | 2 lines
Remove a bad test.
........
r61383 | mark.dickinson | 2008-03-14 15:23:37 +0100 (Fri, 14 Mar 2008) | 9 lines
Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently
across platforms: it should now raise OverflowError on all
platforms. (Previously it raised OverflowError only on
non IEEE 754 platforms.)
Also fix the (already existing) test for this behaviour
so that it actually raises TestFailed instead of just
referencing it.
........
r61387 | thomas.heller | 2008-03-14 22:06:21 +0100 (Fri, 14 Mar 2008) | 1 line
Remove unneeded initializer.
........
r61388 | martin.v.loewis | 2008-03-14 22:19:28 +0100 (Fri, 14 Mar 2008) | 2 lines
Run debug version, cd to PCbuild.
........
r61392 | georg.brandl | 2008-03-15 00:10:34 +0100 (Sat, 15 Mar 2008) | 2 lines
Remove obsolete paragraph. #2288.
........
r61395 | georg.brandl | 2008-03-15 01:20:19 +0100 (Sat, 15 Mar 2008) | 2 lines
Fix lots of broken links in the docs, found by Sphinx' external link checker.
........
r61396 | skip.montanaro | 2008-03-15 03:32:49 +0100 (Sat, 15 Mar 2008) | 1 line
note that fork and forkpty raise OSError on failure
........
r61402 | skip.montanaro | 2008-03-15 17:04:45 +0100 (Sat, 15 Mar 2008) | 1 line
add %f format to datetime - issue 1158
........
r61403 | skip.montanaro | 2008-03-15 17:07:11 +0100 (Sat, 15 Mar 2008) | 2 lines
.
........
2008-03-15 21:07:10 -03:00
|
|
|
Overflow:
|
2010-05-09 13:14:21 -03:00
|
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
|
|
"float too large to pack with f format");
|
|
|
|
return -1;
|
2003-03-20 16:53:32 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
_PyFloat_Pack8(double x, unsigned char *p, int le)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
if (double_format == unknown_format) {
|
|
|
|
unsigned char sign;
|
|
|
|
int e;
|
|
|
|
double f;
|
|
|
|
unsigned int fhi, flo;
|
|
|
|
int incr = 1;
|
|
|
|
|
|
|
|
if (le) {
|
|
|
|
p += 7;
|
|
|
|
incr = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (x < 0) {
|
|
|
|
sign = 1;
|
|
|
|
x = -x;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
sign = 0;
|
|
|
|
|
|
|
|
f = frexp(x, &e);
|
|
|
|
|
|
|
|
/* Normalize f to be in the range [1.0, 2.0) */
|
|
|
|
if (0.5 <= f && f < 1.0) {
|
|
|
|
f *= 2.0;
|
|
|
|
e--;
|
|
|
|
}
|
|
|
|
else if (f == 0.0)
|
|
|
|
e = 0;
|
|
|
|
else {
|
|
|
|
PyErr_SetString(PyExc_SystemError,
|
|
|
|
"frexp() result out of range");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (e >= 1024)
|
|
|
|
goto Overflow;
|
|
|
|
else if (e < -1022) {
|
|
|
|
/* Gradual underflow */
|
|
|
|
f = ldexp(f, 1022 + e);
|
|
|
|
e = 0;
|
|
|
|
}
|
|
|
|
else if (!(e == 0 && f == 0.0)) {
|
|
|
|
e += 1023;
|
|
|
|
f -= 1.0; /* Get rid of leading 1 */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* fhi receives the high 28 bits; flo the low 24 bits (== 52 bits) */
|
|
|
|
f *= 268435456.0; /* 2**28 */
|
|
|
|
fhi = (unsigned int)f; /* Truncate */
|
|
|
|
assert(fhi < 268435456);
|
|
|
|
|
|
|
|
f -= (double)fhi;
|
|
|
|
f *= 16777216.0; /* 2**24 */
|
|
|
|
flo = (unsigned int)(f + 0.5); /* Round */
|
|
|
|
assert(flo <= 16777216);
|
|
|
|
if (flo >> 24) {
|
|
|
|
/* The carry propagated out of a string of 24 1 bits. */
|
|
|
|
flo = 0;
|
|
|
|
++fhi;
|
|
|
|
if (fhi >> 28) {
|
|
|
|
/* And it also progagated out of the next 28 bits. */
|
|
|
|
fhi = 0;
|
|
|
|
++e;
|
|
|
|
if (e >= 2047)
|
|
|
|
goto Overflow;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* First byte */
|
|
|
|
*p = (sign << 7) | (e >> 4);
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Second byte */
|
|
|
|
*p = (unsigned char) (((e & 0xF) << 4) | (fhi >> 24));
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Third byte */
|
|
|
|
*p = (fhi >> 16) & 0xFF;
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Fourth byte */
|
|
|
|
*p = (fhi >> 8) & 0xFF;
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Fifth byte */
|
|
|
|
*p = fhi & 0xFF;
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Sixth byte */
|
|
|
|
*p = (flo >> 16) & 0xFF;
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Seventh byte */
|
|
|
|
*p = (flo >> 8) & 0xFF;
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Eighth byte */
|
|
|
|
*p = flo & 0xFF;
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Done */
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
Overflow:
|
|
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
|
|
"float too large to pack with d format");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
const char *s = (char*)&x;
|
|
|
|
int i, incr = 1;
|
|
|
|
|
|
|
|
if ((double_format == ieee_little_endian_format && !le)
|
|
|
|
|| (double_format == ieee_big_endian_format && le)) {
|
|
|
|
p += 7;
|
|
|
|
incr = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < 8; i++) {
|
|
|
|
*p = *s++;
|
|
|
|
p += incr;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2003-03-20 16:53:32 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
double
|
|
|
|
_PyFloat_Unpack4(const unsigned char *p, int le)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
if (float_format == unknown_format) {
|
|
|
|
unsigned char sign;
|
|
|
|
int e;
|
|
|
|
unsigned int f;
|
|
|
|
double x;
|
|
|
|
int incr = 1;
|
|
|
|
|
|
|
|
if (le) {
|
|
|
|
p += 3;
|
|
|
|
incr = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* First byte */
|
|
|
|
sign = (*p >> 7) & 1;
|
|
|
|
e = (*p & 0x7F) << 1;
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Second byte */
|
|
|
|
e |= (*p >> 7) & 1;
|
|
|
|
f = (*p & 0x7F) << 16;
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
if (e == 255) {
|
|
|
|
PyErr_SetString(
|
|
|
|
PyExc_ValueError,
|
|
|
|
"can't unpack IEEE 754 special value "
|
|
|
|
"on non-IEEE platform");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Third byte */
|
|
|
|
f |= *p << 8;
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Fourth byte */
|
|
|
|
f |= *p;
|
|
|
|
|
|
|
|
x = (double)f / 8388608.0;
|
|
|
|
|
|
|
|
/* XXX This sadly ignores Inf/NaN issues */
|
|
|
|
if (e == 0)
|
|
|
|
e = -126;
|
|
|
|
else {
|
|
|
|
x += 1.0;
|
|
|
|
e -= 127;
|
|
|
|
}
|
|
|
|
x = ldexp(x, e);
|
|
|
|
|
|
|
|
if (sign)
|
|
|
|
x = -x;
|
|
|
|
|
|
|
|
return x;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
float x;
|
|
|
|
|
|
|
|
if ((float_format == ieee_little_endian_format && !le)
|
|
|
|
|| (float_format == ieee_big_endian_format && le)) {
|
|
|
|
char buf[4];
|
|
|
|
char *d = &buf[3];
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
*d-- = *p++;
|
|
|
|
}
|
|
|
|
memcpy(&x, buf, 4);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
memcpy(&x, p, 4);
|
|
|
|
}
|
|
|
|
|
|
|
|
return x;
|
|
|
|
}
|
2003-03-20 16:53:32 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
double
|
|
|
|
_PyFloat_Unpack8(const unsigned char *p, int le)
|
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
if (double_format == unknown_format) {
|
|
|
|
unsigned char sign;
|
|
|
|
int e;
|
|
|
|
unsigned int fhi, flo;
|
|
|
|
double x;
|
|
|
|
int incr = 1;
|
|
|
|
|
|
|
|
if (le) {
|
|
|
|
p += 7;
|
|
|
|
incr = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* First byte */
|
|
|
|
sign = (*p >> 7) & 1;
|
|
|
|
e = (*p & 0x7F) << 4;
|
|
|
|
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Second byte */
|
|
|
|
e |= (*p >> 4) & 0xF;
|
|
|
|
fhi = (*p & 0xF) << 24;
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
if (e == 2047) {
|
|
|
|
PyErr_SetString(
|
|
|
|
PyExc_ValueError,
|
|
|
|
"can't unpack IEEE 754 special value "
|
|
|
|
"on non-IEEE platform");
|
|
|
|
return -1.0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Third byte */
|
|
|
|
fhi |= *p << 16;
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Fourth byte */
|
|
|
|
fhi |= *p << 8;
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Fifth byte */
|
|
|
|
fhi |= *p;
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Sixth byte */
|
|
|
|
flo = *p << 16;
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Seventh byte */
|
|
|
|
flo |= *p << 8;
|
|
|
|
p += incr;
|
|
|
|
|
|
|
|
/* Eighth byte */
|
|
|
|
flo |= *p;
|
|
|
|
|
|
|
|
x = (double)fhi + (double)flo / 16777216.0; /* 2**24 */
|
|
|
|
x /= 268435456.0; /* 2**28 */
|
|
|
|
|
|
|
|
if (e == 0)
|
|
|
|
e = -1022;
|
|
|
|
else {
|
|
|
|
x += 1.0;
|
|
|
|
e -= 1023;
|
|
|
|
}
|
|
|
|
x = ldexp(x, e);
|
|
|
|
|
|
|
|
if (sign)
|
|
|
|
x = -x;
|
|
|
|
|
|
|
|
return x;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
double x;
|
|
|
|
|
|
|
|
if ((double_format == ieee_little_endian_format && !le)
|
|
|
|
|| (double_format == ieee_big_endian_format && le)) {
|
|
|
|
char buf[8];
|
|
|
|
char *d = &buf[7];
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 8; i++) {
|
|
|
|
*d-- = *p++;
|
|
|
|
}
|
|
|
|
memcpy(&x, buf, 8);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
memcpy(&x, p, 8);
|
|
|
|
}
|
|
|
|
|
|
|
|
return x;
|
|
|
|
}
|
2003-03-20 16:53:32 -04:00
|
|
|
}
|