mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-21 14:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

* classobject.[ch], {float,long,int}object.c, bltinmodule.c:

Browse source 
coercion is now completely generic.
* ceval.c: for instances, don't coerce for + and *; * reverses
  arguments if left one is non-instance numeric and right one sequence.
This commit is contained in:
Guido van Rossum 1992-08-14 12:06:52 +00:00
parent 70d7a310a9
commit e6eefc2231
7 changed files with 123 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Python/ceval.c
View file

@ -1532,7 +1532,9 @@ static object *
add(v, w)
object *v, *w;
{
if (v->ob_type->tp_as_number != NULL) {
if (v->ob_type->tp_as_sequence != NULL)
return (*v->ob_type->tp_as_sequence->sq_concat)(v, w);
else if (v->ob_type->tp_as_number != NULL) {
object *x;
if (coerce(&v, &w) != 0)
return NULL;
@ -1541,8 +1543,6 @@ add(v, w)
DECREF(w);
return x;
}
else if (v->ob_type->tp_as_sequence != NULL)
return (*v->ob_type->tp_as_sequence->sq_concat)(v, w);
else {
err_setstr(TypeError, "+ not supported by operands");
return NULL;
@ -1571,16 +1571,27 @@ mul(v, w)
object *v, *w;
{
typeobject *tp;
if (is_intobject(v) && w->ob_type->tp_as_sequence != NULL) {
/* int*sequence -- swap v and w */
tp = v->ob_type;
if (tp->tp_as_number != NULL &&
w->ob_type->tp_as_sequence != NULL &&
!is_instanceobject(v)) {
/* number*sequence -- swap v and w */
object *tmp = v;
v = w;
w = tmp;
tp = v->ob_type;
}
tp = v->ob_type;
if (tp->tp_as_number != NULL) {
object *x;
if (coerce(&v, &w) != 0)
if (is_instanceobject(v)) {
/* Instances of user-defined classes get their
other argument uncoerced, so they may
implement sequence*number as well as
number*number. */
INCREF(v);
INCREF(w);
}
else if (coerce(&v, &w) != 0)
return NULL;
x = (*v->ob_type->tp_as_number->nb_multiply)(v, w);
DECREF(v);