mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

move coerce() from bltinmodule.c to object.c and implement builtin_coerce() differently

Browse source
This commit is contained in:
Guido van Rossum 1995-01-10 15:26:20 +00:00
parent 879c581826
commit 5524a59b09
2 changed files with 40 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Objects/object.c
View file

@ -319,6 +319,39 @@ testbool(v)
return res; return res;
} }
/* Coerce two numeric types to the "larger" one.
Increment the reference count on each argument.
Return -1 and raise an exception if no coercion is possible
(and then no reference count is incremented).
*/
int
coerce(pv, pw)
object **pv, **pw;
{
register object *v = *pv;
register object *w = *pw;
int res;
if (v->ob_type == w->ob_type && !is_instanceobject(v)) {
INCREF(v);
INCREF(w);
return 0;
}
if (v->ob_type->tp_as_number && v->ob_type->tp_as_number->nb_coerce) {
res = (*v->ob_type->tp_as_number->nb_coerce)(pv, pw);
if (res <= 0)
return res;
}
if (w->ob_type->tp_as_number && w->ob_type->tp_as_number->nb_coerce) {
res = (*w->ob_type->tp_as_number->nb_coerce)(pw, pv);
if (res <= 0)
return res;
}
err_setstr(TypeError, "number coercion failed");
return -1;
}
/* /*
NoObject is usable as a non-NULL undefined value, used by the macro None. NoObject is usable as a non-NULL undefined value, used by the macro None.

57
Python/bltinmodule.c
View file

@ -256,13 +256,15 @@ builtin_cmp(self, args)
} }
static object * static object *
do_coerce(v, w) builtin_coerce(self, args)
object *v, *w; object *self;
object *args;
{ {
object *v, *w;
object *res; object *res;
if (is_instanceobject(v) || is_instanceobject(w))
return instancebinop(v, w, "__coerce__", "__rcoerce__", if (!newgetargs(args, "OO:coerce", &v, &w))
do_coerce); return NULL;
if (coerce(&v, &w) < 0) if (coerce(&v, &w) < 0)
return NULL; return NULL;
res = mkvalue("(OO)", v, w); res = mkvalue("(OO)", v, w);
@ -271,18 +273,6 @@ do_coerce(v, w)
return res; return res;
} }
static object *
builtin_coerce(self, args)
object *self;
object *args;
{
object *v, *w;
if (!newgetargs(args, "OO:coerce", &v, &w))
return NULL;
return do_coerce(v, w);
}
static object * static object *
builtin_compile(self, args) builtin_compile(self, args)
object *self; object *self;
@ -1464,39 +1454,6 @@ initbuiltin()
(void) dictinsert(builtin_dict, "None", None); (void) dictinsert(builtin_dict, "None", None);
} }
/* Coerce two numeric types to the "larger" one.
Increment the reference count on each argument.
Return -1 and raise an exception if no coercion is possible
(and then no reference count is incremented).
*/
int
coerce(pv, pw)
object **pv, **pw;
{
register object *v = *pv;
register object *w = *pw;
int res;
if (v->ob_type == w->ob_type && !is_instanceobject(v)) {
INCREF(v);
INCREF(w);
return 0;
}
if (v->ob_type->tp_as_number && v->ob_type->tp_as_number->nb_coerce) {
res = (*v->ob_type->tp_as_number->nb_coerce)(pv, pw);
if (res <= 0)
return res;
}
if (w->ob_type->tp_as_number && w->ob_type->tp_as_number->nb_coerce) {
res = (*w->ob_type->tp_as_number->nb_coerce)(pw, pv);
if (res <= 0)
return res;
}
err_setstr(TypeError, "number coercion failed");
return -1;
}
/* Helper for filter(): filter a tuple through a function */ /* Helper for filter(): filter a tuple through a function */