Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix conversion of double to long; stylistic changes.

This commit is contained in:
Guido van Rossum 1991-06-03 10:58:01 +00:00
parent 246b9d8258
commit ad40531aa1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Python/bltinmodule.c
View File

@ -171,7 +171,6 @@ builtin_float(self, v)
return newfloatobject((double)x);
}
else if (is_longobject(v)) {
extern double dgetlongvalue();
return newfloatobject(dgetlongvalue(v));
}
else if (is_floatobject(v)) {
@ -215,12 +214,13 @@ builtin_int(self, v)
else if (is_longobject(v)) {
long x;
x = getlongvalue(v);
if (x == -1 && err_occurred())
if (err_occurred())
return NULL;
return newintobject(x);
}
else if (is_floatobject(v)) {
double x = getfloatvalue(v);
/* XXX should check for overflow */
return newintobject((long)x);
}
err_setstr(TypeError, "int() argument must be int, long or float");
@ -269,7 +269,7 @@ builtin_long(self, v)
}
else if (is_floatobject(v)) {
double x = getfloatvalue(v);
return newlongobject((long)x);
return dnewlongobject(x);
}
err_setstr(TypeError, "long() argument must be int, long or float");
return NULL;