summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1992-08-14 12:06:52 (GMT)
committerGuido van Rossum <guido@python.org>1992-08-14 12:06:52 (GMT)
commite6eefc22313e7f2da5918ecd608fbb0b7a7a1610 (patch)
tree2896ab6358835d67083251ca911ff6d29a1138bf /Include
parent70d7a310a9844d1a3f80c110f1acd3d6059939b4 (diff)
downloadcpython-e6eefc22313e7f2da5918ecd608fbb0b7a7a1610.zip
cpython-e6eefc22313e7f2da5918ecd608fbb0b7a7a1610.tar.gz
cpython-e6eefc22313e7f2da5918ecd608fbb0b7a7a1610.tar.bz2
* classobject.[ch], {float,long,int}object.c, bltinmodule.c:
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.
Diffstat (limited to 'Include')
-rw-r--r--Include/classobject.h1
-rw-r--r--Include/object.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/Include/classobject.h b/Include/classobject.h
index 1d24a7c..b33cacc 100644
--- a/Include/classobject.h
+++ b/Include/classobject.h
@@ -43,5 +43,4 @@ extern object *newinstancemethodobject PROTO((object *, object *));
extern object *instancemethodgetfunc PROTO((object *));
extern object *instancemethodgetself PROTO((object *));
-extern int instance_coerce PROTO((object **, object **));
extern object *instance_convert PROTO((object *, char *));
diff --git a/Include/object.h b/Include/object.h
index d987efb..a66629c 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -142,6 +142,7 @@ typedef struct {
object *(*nb_and) FPROTO((object *, object *));
object *(*nb_xor) FPROTO((object *, object *));
object *(*nb_or) FPROTO((object *, object *));
+ int (*nb_coerce) FPROTO((object **, object **));
} number_methods;
typedef struct {