cpython-lru_cache-weakref: Objects/classobject.c annotate

annotate Objects/classobject.c @ 5817:48b94de85bf3 legacy-trunk

Extensive changes by AMK.

author	Guido van Rossum <guido@python.org>
date	Thu, 17 Jul 1997 16:29:42 +0000
parents	10e9cfa010f0
children	40cfc905c776

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	1 /***********************************************************
2059 866c81068dbd Added 1995 to copyright message. Guido van Rossum <guido@python.org> parents: 2053 diff changeset	2 Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
866c81068dbd Added 1995 to copyright message. Guido van Rossum <guido@python.org> parents: 2053 diff changeset	3 The Netherlands.
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	4
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	5 All Rights Reserved
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	6
4503 65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	7 Permission to use, copy, modify, and distribute this software and its
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	8 documentation for any purpose and without fee is hereby granted,
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	9 provided that the above copyright notice appear in all copies and that
4503 65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	10 both that copyright notice and this permission notice appear in
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	11 supporting documentation, and that the names of Stichting Mathematisch
4503 65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	12 Centrum or CWI or Corporation for National Research Initiatives or
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	13 CNRI not be used in advertising or publicity pertaining to
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	14 distribution of the software without specific, written prior
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	15 permission.
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	16
4503 65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	17 While CWI is the initial source for this software, a modified version
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	18 is made available by the Corporation for National Research Initiatives
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	19 (CNRI) at the Internet address ftp://ftp.python.org.
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	20
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	21 STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	22 REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	23 MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	24 CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	25 DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	26 PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	27 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 4426 diff changeset	28 PERFORMANCE OF THIS SOFTWARE.
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	29
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	30 ******************************************************************/
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	31
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	32 /* Class object implementation */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	33
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	34 #include "Python.h"
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	35 #include "structmember.h"
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	36
1861 d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	37 /* Forward */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	38 static PyObject *class_lookup
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	39 Py_PROTO((PyClassObject , PyObject , PyClassObject **));
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	40 static PyObject instance_getattr1 Py_PROTO((PyInstanceObject , PyObject *));
1861 d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	41
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	42 PyObject *
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	43 PyClass_New(bases, dict, name)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	44 PyObject bases; / NULL or tuple of classobjects! */
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	45 PyObject *dict;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	46 PyObject name; / String; NULL if unknown */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	47 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	48 PyClassObject op, dummy;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	49 static PyObject getattrstr, setattrstr, *delattrstr;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	50 static PyObject *docstr;
4086 831b420e411e More efficient handling of "__doc__" lookup. Guido van Rossum <guido@python.org> parents: 4065 diff changeset	51 if (docstr == NULL) {
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	52 docstr= PyString_InternFromString("__doc__");
4086 831b420e411e More efficient handling of "__doc__" lookup. Guido van Rossum <guido@python.org> parents: 4065 diff changeset	53 if (docstr == NULL)
831b420e411e More efficient handling of "__doc__" lookup. Guido van Rossum <guido@python.org> parents: 4065 diff changeset	54 return NULL;
831b420e411e More efficient handling of "__doc__" lookup. Guido van Rossum <guido@python.org> parents: 4065 diff changeset	55 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	56 if (PyDict_GetItem(dict, docstr) == NULL) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	57 if (PyDict_SetItem(dict, docstr, Py_None) < 0)
2084 abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	58 return NULL;
abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	59 }
465 ca0391a812f8 The cl_bases member of a class object is now never NULL. Guido van Rossum <guido@python.org> parents: 441 diff changeset	60 if (bases == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	61 bases = PyTuple_New(0);
465 ca0391a812f8 The cl_bases member of a class object is now never NULL. Guido van Rossum <guido@python.org> parents: 441 diff changeset	62 if (bases == NULL)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1215 diff changeset	63 return NULL;
465 ca0391a812f8 The cl_bases member of a class object is now never NULL. Guido van Rossum <guido@python.org> parents: 441 diff changeset	64 }
ca0391a812f8 The cl_bases member of a class object is now never NULL. Guido van Rossum <guido@python.org> parents: 441 diff changeset	65 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	66 Py_INCREF(bases);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	67 op = PyObject_NEW(PyClassObject, &PyClass_Type);
465 ca0391a812f8 The cl_bases member of a class object is now never NULL. Guido van Rossum <guido@python.org> parents: 441 diff changeset	68 if (op == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	69 Py_DECREF(bases);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	70 return NULL;
465 ca0391a812f8 The cl_bases member of a class object is now never NULL. Guido van Rossum <guido@python.org> parents: 441 diff changeset	71 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	72 op->cl_bases = bases;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	73 Py_INCREF(dict);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	74 op->cl_dict = dict;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	75 Py_XINCREF(name);
386 0598f4f25d04 Add several secret ____ attributes Guido van Rossum <guido@python.org>* parents: 224 diff changeset	76 op->cl_name = name;
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	77 if (getattrstr == NULL) {
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	78 getattrstr = PyString_InternFromString("__getattr__");
f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	79 setattrstr = PyString_InternFromString("__setattr__");
f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	80 delattrstr = PyString_InternFromString("__delattr__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	81 }
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	82 op->cl_getattr = class_lookup(op, getattrstr, &dummy);
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	83 op->cl_setattr = class_lookup(op, setattrstr, &dummy);
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	84 op->cl_delattr = class_lookup(op, delattrstr, &dummy);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	85 Py_XINCREF(op->cl_getattr);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	86 Py_XINCREF(op->cl_setattr);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	87 Py_XINCREF(op->cl_delattr);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	88 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	89 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	90
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	91 /* Class methods */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	92
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	93 static void
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	94 class_dealloc(op)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	95 PyClassObject *op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	96 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	97 Py_DECREF(op->cl_bases);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	98 Py_DECREF(op->cl_dict);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	99 Py_XDECREF(op->cl_name);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	100 free((ANY *)op);
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	101 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	102
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	103 static PyObject *
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	104 class_lookup(cp, name, pclass)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	105 PyClassObject *cp;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	106 PyObject *name;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	107 PyClassObject **pclass;
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	108 {
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	109 int i, n;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	110 PyObject *value = PyDict_GetItem(cp->cl_dict, name);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	111 if (value != NULL) {
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	112 *pclass = cp;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	113 return value;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	114 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	115 n = PyTuple_Size(cp->cl_bases);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	116 for (i = 0; i < n; i++) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	117 PyObject *v = class_lookup(
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	118 (PyClassObject *)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	119 PyTuple_GetItem(cp->cl_bases, i), name, pclass);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	120 if (v != NULL)
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	121 return v;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	122 }
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	123 return NULL;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	124 }
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	125
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	126 static PyObject *
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	127 class_getattr(op, name)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	128 register PyClassObject *op;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	129 PyObject *name;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	130 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	131 register PyObject *v;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	132 register char *sname = PyString_AsString(name);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	133 PyClassObject *class;
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	134 if (sname[0] == '_' && sname[1] == '_') {
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	135 if (strcmp(sname, "__dict__") == 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	136 if (PyEval_GetRestricted()) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	137 PyErr_SetString(PyExc_RuntimeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	138 "class.__dict__ not accessible in restricted mode");
2105 ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	139 return NULL;
ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	140 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	141 Py_INCREF(op->cl_dict);
2105 ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	142 return op->cl_dict;
ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	143 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	144 if (strcmp(sname, "__bases__") == 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	145 Py_INCREF(op->cl_bases);
2105 ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	146 return op->cl_bases;
ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	147 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	148 if (strcmp(sname, "__name__") == 0) {
2105 ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	149 if (op->cl_name == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	150 v = Py_None;
2105 ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	151 else
ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	152 v = op->cl_name;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	153 Py_INCREF(v);
2105 ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	154 return v;
ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	155 }
386 0598f4f25d04 Add several secret ____ attributes Guido van Rossum <guido@python.org>* parents: 224 diff changeset	156 }
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	157 v = class_lookup(op, name, &class);
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	158 if (v == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	159 PyErr_SetObject(PyExc_AttributeError, name);
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	160 return NULL;
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	161 }
5456 7316eecb1e6b removed last #ifdef SUPPORT_OBSOLETE_ACCESS bits. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	162 Py_INCREF(v);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	163 if (PyFunction_Check(v)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	164 PyObject w = PyMethod_New(v, (PyObject )NULL,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	165 (PyObject *)class);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	166 Py_DECREF(v);
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	167 v = w;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	168 }
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	169 return v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	170 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	171
386 0598f4f25d04 Add several secret ____ attributes Guido van Rossum <guido@python.org>* parents: 224 diff changeset	172 static int
0598f4f25d04 Add several secret ____ attributes Guido van Rossum <guido@python.org>* parents: 224 diff changeset	173 class_setattr(op, name, v)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	174 PyClassObject *op;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	175 PyObject *name;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	176 PyObject *v;
386 0598f4f25d04 Add several secret ____ attributes Guido van Rossum <guido@python.org>* parents: 224 diff changeset	177 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	178 char *sname = PyString_AsString(name);
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	179 if (sname[0] == '_' && sname[1] == '_') {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	180 int n = PyString_Size(name);
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	181 if (sname[n-1] == '_' && sname[n-2] == '_') {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	182 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	183 "read-only special attribute");
791 77ee9b222fdb Don't allow assignment to attributes named ____ Guido van Rossum <guido@python.org>* parents: 735 diff changeset	184 return -1;
77ee9b222fdb Don't allow assignment to attributes named ____ Guido van Rossum <guido@python.org>* parents: 735 diff changeset	185 }
77ee9b222fdb Don't allow assignment to attributes named ____ Guido van Rossum <guido@python.org>* parents: 735 diff changeset	186 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	187 if (PyEval_GetRestricted()) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	188 PyErr_SetString(PyExc_RuntimeError,
2889 e513f0d65368 class objects are read-only in restricted mode Guido van Rossum <guido@python.org> parents: 2864 diff changeset	189 "classes are read-only in restricted mode");
e513f0d65368 class objects are read-only in restricted mode Guido van Rossum <guido@python.org> parents: 2864 diff changeset	190 return -1;
e513f0d65368 class objects are read-only in restricted mode Guido van Rossum <guido@python.org> parents: 2864 diff changeset	191 }
1031 7a11a70f7f44 classobject.c moduleobject.c stdwinmodule.c xxobject.c: Guido van Rossum <guido@python.org> parents: 1021 diff changeset	192 if (v == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	193 int rv = PyDict_DelItem(op->cl_dict, name);
1031 7a11a70f7f44 classobject.c moduleobject.c stdwinmodule.c xxobject.c: Guido van Rossum <guido@python.org> parents: 1021 diff changeset	194 if (rv < 0)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	195 PyErr_SetString(PyExc_AttributeError,
1031 7a11a70f7f44 classobject.c moduleobject.c stdwinmodule.c xxobject.c: Guido van Rossum <guido@python.org> parents: 1021 diff changeset	196 "delete non-existing class attribute");
7a11a70f7f44 classobject.c moduleobject.c stdwinmodule.c xxobject.c: Guido van Rossum <guido@python.org> parents: 1021 diff changeset	197 return rv;
7a11a70f7f44 classobject.c moduleobject.c stdwinmodule.c xxobject.c: Guido van Rossum <guido@python.org> parents: 1021 diff changeset	198 }
386 0598f4f25d04 Add several secret ____ attributes Guido van Rossum <guido@python.org>* parents: 224 diff changeset	199 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	200 return PyDict_SetItem(op->cl_dict, name, v);
386 0598f4f25d04 Add several secret ____ attributes Guido van Rossum <guido@python.org>* parents: 224 diff changeset	201 }
0598f4f25d04 Add several secret ____ attributes Guido van Rossum <guido@python.org>* parents: 224 diff changeset	202
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	203 static PyObject *
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	204 class_repr(op)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	205 PyClassObject *op;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	206 {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	207 char buf[140];
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	208 char *name;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	209 if (op->cl_name == NULL \|\| !PyString_Check(op->cl_name))
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	210 name = "?";
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	211 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	212 name = PyString_AsString(op->cl_name);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	213 sprintf(buf, "<class %.100s at %lx>", name, (long)op);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	214 return PyString_FromString(buf);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	215 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	216
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	217 PyTypeObject PyClass_Type = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	218 PyObject_HEAD_INIT(&PyType_Type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	219 0,
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	220 "class",
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	221 sizeof(PyClassObject),
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	222 0,
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	223 (destructor)class_dealloc, /tp_dealloc/
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	224 0, /tp_print/
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	225 0, /tp_getattr/
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	226 0, /tp_setattr/
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	227 0, /tp_compare/
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	228 (reprfunc)class_repr, /tp_repr/
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	229 0, /tp_as_number/
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	230 0, /tp_as_sequence/
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	231 0, /tp_as_mapping/
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	232 0, /tp_hash/
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	233 0, /tp_call/
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	234 0, /tp_str/
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	235 (getattrofunc)class_getattr, /tp_getattro/
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	236 (setattrofunc)class_setattr, /tp_setattro/
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	237 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	238
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	239 int
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	240 PyClass_IsSubclass(class, base)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	241 PyObject *class;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	242 PyObject *base;
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	243 {
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	244 int i, n;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	245 PyClassObject *cp;
1293 ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1290 diff changeset	246 if (class == base)
ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1290 diff changeset	247 return 1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	248 if (class == NULL \|\| !PyClass_Check(class))
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	249 return 0;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	250 cp = (PyClassObject *)class;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	251 n = PyTuple_Size(cp->cl_bases);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	252 for (i = 0; i < n; i++) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	253 if (PyClass_IsSubclass(PyTuple_GetItem(cp->cl_bases, i), base))
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	254 return 1;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	255 }
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	256 return 0;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	257 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	258
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	259
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	260 /* Instance objects */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	261
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	262 PyObject *
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	263 PyInstance_New(class, arg, kw)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	264 PyObject *class;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	265 PyObject *arg;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	266 PyObject *kw;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	267 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	268 register PyInstanceObject *inst;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	269 PyObject *init;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	270 static PyObject *initstr;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	271 if (!PyClass_Check(class)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	272 PyErr_BadInternalCall();
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	273 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	274 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	275 inst = PyObject_NEW(PyInstanceObject, &PyInstance_Type);
224 e71b6fec86e5 Renamed class methods to instance methods (which they are) Guido van Rossum <guido@python.org> parents: 202 diff changeset	276 if (inst == NULL)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	277 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	278 Py_INCREF(class);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	279 inst->in_class = (PyClassObject *)class;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	280 inst->in_dict = PyDict_New();
5456 7316eecb1e6b removed last #ifdef SUPPORT_OBSOLETE_ACCESS bits. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	281 if (inst->in_dict == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	282 Py_DECREF(inst);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	283 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	284 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	285 if (initstr == NULL)
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	286 initstr = PyString_InternFromString("__init__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	287 init = instance_getattr1(inst, initstr);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	288 if (init == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	289 PyErr_Clear();
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	290 if ((arg != NULL && (!PyTuple_Check(arg) \|\|
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	291 PyTuple_Size(arg) != 0))
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	292 \|\| (kw != NULL && (!PyDict_Check(kw) \|\|
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	293 PyDict_Size(kw) != 0))) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	294 PyErr_SetString(PyExc_TypeError,
2864 5f951912e995 changes for keyword args to built-in functions and classes Guido van Rossum <guido@python.org> parents: 2827 diff changeset	295 "this constructor takes no arguments");
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	296 Py_DECREF(inst);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	297 inst = NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	298 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	299 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	300 else {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	301 PyObject *res = PyEval_CallObjectWithKeywords(init, arg, kw);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	302 Py_DECREF(init);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	303 if (res == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	304 Py_DECREF(inst);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	305 inst = NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	306 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	307 else {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	308 if (res != Py_None) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	309 PyErr_SetString(PyExc_TypeError,
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	310 "__init__() should return None");
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	311 Py_DECREF(inst);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	312 inst = NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	313 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	314 Py_DECREF(res);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	315 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	316 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	317 return (PyObject *)inst;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	318 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	319
174 20fee4e2eecd Change ugly 'class member' to more normal 'instance'. Guido van Rossum <guido@python.org> parents: 145 diff changeset	320 /* Instance methods */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	321
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	322 static void
224 e71b6fec86e5 Renamed class methods to instance methods (which they are) Guido van Rossum <guido@python.org> parents: 202 diff changeset	323 instance_dealloc(inst)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	324 register PyInstanceObject *inst;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	325 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	326 PyObject error_type, error_value, *error_traceback;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	327 PyObject *del;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	328 static PyObject *delstr;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	329 /* Call the __del__ method if it exists. First temporarily
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	330 revive the object and save the current exception, if any. */
3586 36cc3ee54f28 new debugger symbol names Guido van Rossum <guido@python.org> parents: 3549 diff changeset	331 #ifdef Py_TRACE_REFS
36cc3ee54f28 new debugger symbol names Guido van Rossum <guido@python.org> parents: 3549 diff changeset	332 /* much too complicated if Py_TRACE_REFS defined */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	333 extern long _Py_RefTotal;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	334 inst->ob_type = &PyInstance_Type;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	335 _Py_NewReference(inst);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	336 _Py_RefTotal--; /* compensate for increment in NEWREF */
3022 c5d852735e7f Fixed calling of __del__ method with TRACE_REFS defined. Sjoerd Mullender <sjoerd@acm.org> parents: 2889 diff changeset	337 #ifdef COUNT_ALLOCS
c5d852735e7f Fixed calling of __del__ method with TRACE_REFS defined. Sjoerd Mullender <sjoerd@acm.org> parents: 2889 diff changeset	338 inst->ob_type->tp_alloc--; /* ditto */
c5d852735e7f Fixed calling of __del__ method with TRACE_REFS defined. Sjoerd Mullender <sjoerd@acm.org> parents: 2889 diff changeset	339 #endif
3586 36cc3ee54f28 new debugger symbol names Guido van Rossum <guido@python.org> parents: 3549 diff changeset	340 #else /* !Py_TRACE_REFS */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	341 Py_INCREF(inst);
3586 36cc3ee54f28 new debugger symbol names Guido van Rossum <guido@python.org> parents: 3549 diff changeset	342 #endif /* !Py_TRACE_REFS */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	343 PyErr_Fetch(&error_type, &error_value, &error_traceback);
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	344 if (delstr == NULL)
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	345 delstr = PyString_InternFromString("__del__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	346 if ((del = instance_getattr1(inst, delstr)) != NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	347 PyObject res = PyEval_CallObject(del, (PyObject )NULL);
4003 138fa15a1032 Disable support for access statement Guido van Rossum <guido@python.org> parents: 3987 diff changeset	348 if (res == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	349 PyObject f, t, v, tb;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	350 PyErr_Fetch(&t, &v, &tb);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	351 f = PySys_GetObject("stderr");
4289 0036dcf28402 More detailed error message about exception in __del__ Guido van Rossum <guido@python.org> parents: 4142 diff changeset	352 if (f != NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	353 PyFile_WriteString("Exception ", f);
4583 4f644ecc5bac Yet more elaborate message for exception in __del__. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	354 if (t) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	355 PyFile_WriteObject(t, f, Py_PRINT_RAW);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	356 if (v && v != Py_None) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	357 PyFile_WriteString(": ", f);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	358 PyFile_WriteObject(v, f, 0);
4583 4f644ecc5bac Yet more elaborate message for exception in __del__. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	359 }
4f644ecc5bac Yet more elaborate message for exception in __del__. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	360 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	361 PyFile_WriteString(" in ", f);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	362 PyFile_WriteObject(del, f, 0);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	363 PyFile_WriteString(" ignored\n", f);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	364 PyErr_Clear(); /* Just in case */
4289 0036dcf28402 More detailed error message about exception in __del__ Guido van Rossum <guido@python.org> parents: 4142 diff changeset	365 }
4583 4f644ecc5bac Yet more elaborate message for exception in __del__. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	366 Py_XDECREF(t);
4f644ecc5bac Yet more elaborate message for exception in __del__. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	367 Py_XDECREF(v);
4f644ecc5bac Yet more elaborate message for exception in __del__. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	368 Py_XDECREF(tb);
4003 138fa15a1032 Disable support for access statement Guido van Rossum <guido@python.org> parents: 3987 diff changeset	369 }
138fa15a1032 Disable support for access statement Guido van Rossum <guido@python.org> parents: 3987 diff changeset	370 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	371 Py_DECREF(res);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	372 Py_DECREF(del);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	373 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	374 /* Restore the saved exception and undo the temporary revival */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	375 PyErr_Restore(error_type, error_value, error_traceback);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	376 /* Can't use DECREF here, it would cause a recursive call */
3022 c5d852735e7f Fixed calling of __del__ method with TRACE_REFS defined. Sjoerd Mullender <sjoerd@acm.org> parents: 2889 diff changeset	377 if (--inst->ob_refcnt > 0) {
c5d852735e7f Fixed calling of __del__ method with TRACE_REFS defined. Sjoerd Mullender <sjoerd@acm.org> parents: 2889 diff changeset	378 #ifdef COUNT_ALLOCS
c5d852735e7f Fixed calling of __del__ method with TRACE_REFS defined. Sjoerd Mullender <sjoerd@acm.org> parents: 2889 diff changeset	379 inst->ob_type->tp_free--;
c5d852735e7f Fixed calling of __del__ method with TRACE_REFS defined. Sjoerd Mullender <sjoerd@acm.org> parents: 2889 diff changeset	380 #endif
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	381 return; /* __del__ added a reference; don't delete now */
3022 c5d852735e7f Fixed calling of __del__ method with TRACE_REFS defined. Sjoerd Mullender <sjoerd@acm.org> parents: 2889 diff changeset	382 }
3586 36cc3ee54f28 new debugger symbol names Guido van Rossum <guido@python.org> parents: 3549 diff changeset	383 #ifdef Py_TRACE_REFS
3022 c5d852735e7f Fixed calling of __del__ method with TRACE_REFS defined. Sjoerd Mullender <sjoerd@acm.org> parents: 2889 diff changeset	384 #ifdef COUNT_ALLOCS
c5d852735e7f Fixed calling of __del__ method with TRACE_REFS defined. Sjoerd Mullender <sjoerd@acm.org> parents: 2889 diff changeset	385 inst->ob_type->tp_free--; /* compensate for increment in UNREF */
c5d852735e7f Fixed calling of __del__ method with TRACE_REFS defined. Sjoerd Mullender <sjoerd@acm.org> parents: 2889 diff changeset	386 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	387 _Py_ForgetReference(inst);
3022 c5d852735e7f Fixed calling of __del__ method with TRACE_REFS defined. Sjoerd Mullender <sjoerd@acm.org> parents: 2889 diff changeset	388 inst->ob_type = NULL;
3586 36cc3ee54f28 new debugger symbol names Guido van Rossum <guido@python.org> parents: 3549 diff changeset	389 #endif /* Py_TRACE_REFS */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	390 Py_DECREF(inst->in_class);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	391 Py_XDECREF(inst->in_dict);
224 e71b6fec86e5 Renamed class methods to instance methods (which they are) Guido van Rossum <guido@python.org> parents: 202 diff changeset	392 free((ANY *)inst);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	393 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	394
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	395 static PyObject *
1860 78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	396 instance_getattr1(inst, name)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	397 register PyInstanceObject *inst;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	398 PyObject *name;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	399 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	400 register PyObject *v;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	401 register char *sname = PyString_AsString(name);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	402 PyClassObject *class;
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	403 if (sname[0] == '_' && sname[1] == '_') {
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	404 if (strcmp(sname, "__dict__") == 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	405 if (PyEval_GetRestricted()) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	406 PyErr_SetString(PyExc_RuntimeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	407 "instance.__dict__ not accessible in restricted mode");
2105 ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	408 return NULL;
ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	409 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	410 Py_INCREF(inst->in_dict);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1351 diff changeset	411 return inst->in_dict;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1351 diff changeset	412 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	413 if (strcmp(sname, "__class__") == 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	414 Py_INCREF(inst->in_class);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	415 return (PyObject *)inst->in_class;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1351 diff changeset	416 }
386 0598f4f25d04 Add several secret ____ attributes Guido van Rossum <guido@python.org>* parents: 224 diff changeset	417 }
1293 ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1290 diff changeset	418 class = NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	419 v = PyDict_GetItem(inst->in_dict, name);
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	420 if (v == NULL) {
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	421 v = class_lookup(inst->in_class, name, &class);
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	422 if (v == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	423 PyErr_SetObject(PyExc_AttributeError, name);
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	424 return NULL;
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	425 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	426 }
5456 7316eecb1e6b removed last #ifdef SUPPORT_OBSOLETE_ACCESS bits. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	427 Py_INCREF(v);
1351 e149c77d173c Makefile, import.c: Lance's alternative module search (allow .pyc file Guido van Rossum <guido@python.org> parents: 1293 diff changeset	428 if (class != NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	429 if (PyFunction_Check(v)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	430 PyObject w = PyMethod_New(v, (PyObject )inst,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	431 (PyObject *)class);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	432 Py_DECREF(v);
1351 e149c77d173c Makefile, import.c: Lance's alternative module search (allow .pyc file Guido van Rossum <guido@python.org> parents: 1293 diff changeset	433 v = w;
e149c77d173c Makefile, import.c: Lance's alternative module search (allow .pyc file Guido van Rossum <guido@python.org> parents: 1293 diff changeset	434 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	435 else if (PyMethod_Check(v)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	436 PyObject *im_class = PyMethod_Class(v);
1351 e149c77d173c Makefile, import.c: Lance's alternative module search (allow .pyc file Guido van Rossum <guido@python.org> parents: 1293 diff changeset	437 /* Only if classes are compatible */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	438 if (PyClass_IsSubclass((PyObject *)class, im_class)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	439 PyObject *im_func = PyMethod_Function(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	440 PyObject *w = PyMethod_New(im_func,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	441 (PyObject *)inst, im_class);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	442 Py_DECREF(v);
1351 e149c77d173c Makefile, import.c: Lance's alternative module search (allow .pyc file Guido van Rossum <guido@python.org> parents: 1293 diff changeset	443 v = w;
e149c77d173c Makefile, import.c: Lance's alternative module search (allow .pyc file Guido van Rossum <guido@python.org> parents: 1293 diff changeset	444 }
e149c77d173c Makefile, import.c: Lance's alternative module search (allow .pyc file Guido van Rossum <guido@python.org> parents: 1293 diff changeset	445 }
1290 7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	446 }
7971fecbf28e * Lots of small changes related to access. Guido van Rossum <guido@python.org> parents: 1289 diff changeset	447 return v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	448 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	449
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	450 static PyObject *
1860 78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	451 instance_getattr(inst, name)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	452 register PyInstanceObject *inst;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	453 PyObject *name;
1860 78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	454 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	455 register PyObject func, res;
1861 d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	456 res = instance_getattr1(inst, name);
d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	457 if (res == NULL && (func = inst->in_class->cl_getattr) != NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	458 PyObject *args;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	459 PyErr_Clear();
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	460 args = Py_BuildValue("(OO)", inst, name);
1861 d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	461 if (args == NULL)
1860 78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	462 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	463 res = PyEval_CallObject(func, args);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	464 Py_DECREF(args);
1860 78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	465 }
78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	466 return res;
78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	467 }
78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	468
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	469 static int
1860 78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	470 instance_setattr1(inst, name, v)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	471 PyInstanceObject *inst;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	472 PyObject *name;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	473 PyObject *v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	474 {
1031 7a11a70f7f44 classobject.c moduleobject.c stdwinmodule.c xxobject.c: Guido van Rossum <guido@python.org> parents: 1021 diff changeset	475 if (v == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	476 int rv = PyDict_DelItem(inst->in_dict, name);
1031 7a11a70f7f44 classobject.c moduleobject.c stdwinmodule.c xxobject.c: Guido van Rossum <guido@python.org> parents: 1021 diff changeset	477 if (rv < 0)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	478 PyErr_SetString(PyExc_AttributeError,
1031 7a11a70f7f44 classobject.c moduleobject.c stdwinmodule.c xxobject.c: Guido van Rossum <guido@python.org> parents: 1021 diff changeset	479 "delete non-existing instance attribute");
7a11a70f7f44 classobject.c moduleobject.c stdwinmodule.c xxobject.c: Guido van Rossum <guido@python.org> parents: 1021 diff changeset	480 return rv;
7a11a70f7f44 classobject.c moduleobject.c stdwinmodule.c xxobject.c: Guido van Rossum <guido@python.org> parents: 1021 diff changeset	481 }
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	482 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	483 return PyDict_SetItem(inst->in_dict, name, v);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	484 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	485
1860 78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	486 static int
78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	487 instance_setattr(inst, name, v)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	488 PyInstanceObject *inst;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	489 PyObject *name;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	490 PyObject *v;
1860 78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	491 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	492 PyObject func, args, *res;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	493 char *sname = PyString_AsString(name);
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	494 if (sname[0] == '_' && sname[1] == '_'
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	495 && (strcmp(sname, "__dict__") == 0 \|\|
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	496 strcmp(sname, "__class__") == 0)) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	497 int n = PyString_Size(name);
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	498 if (sname[n-1] == '_' && sname[n-2] == '_') {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	499 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	500 "read-only special attribute");
1860 78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	501 return -1;
78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	502 }
78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	503 }
1861 d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	504 if (v == NULL)
d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	505 func = inst->in_class->cl_delattr;
d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	506 else
d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	507 func = inst->in_class->cl_setattr;
d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	508 if (func == NULL)
d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	509 return instance_setattr1(inst, name, v);
d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	510 if (v == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	511 args = Py_BuildValue("(OO)", inst, name);
1861 d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	512 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	513 args = Py_BuildValue("(OOO)", inst, name, v);
1861 d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	514 if (args == NULL)
d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	515 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	516 res = PyEval_CallObject(func, args);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	517 Py_DECREF(args);
1861 d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	518 if (res == NULL)
d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	519 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	520 Py_DECREF(res);
1860 78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	521 return 0;
78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	522 }
78898b04a65b Mods (really diffs to 2.29) by Michael Scharf for alternative __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1781 diff changeset	523
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	524 static PyObject *
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	525 instance_repr(inst)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	526 PyInstanceObject *inst;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	527 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	528 PyObject *func;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	529 PyObject *res;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	530 static PyObject *reprstr;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	531
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	532 if (reprstr == NULL)
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	533 reprstr = PyString_InternFromString("__repr__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	534 func = instance_getattr(inst, reprstr);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	535 if (func == NULL) {
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	536 char buf[140];
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	537 PyObject *classname = inst->in_class->cl_name;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	538 char *cname;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	539 if (classname != NULL && PyString_Check(classname))
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	540 cname = PyString_AsString(classname);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	541 else
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	542 cname = "?";
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	543 PyErr_Clear();
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	544 sprintf(buf, "<%.100s instance at %lx>", cname, (long)inst);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	545 return PyString_FromString(buf);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	546 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	547 res = PyEval_CallObject(func, (PyObject *)NULL);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	548 Py_DECREF(func);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	549 return res;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	550 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	551
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	552 static PyObject *
2084 abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	553 instance_compare1(inst, other)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	554 PyObject inst, other;
2084 abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	555 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	556 return PyInstance_DoBinOp(inst, other, "__cmp__", "__rcmp__",
2084 abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	557 instance_compare1);
abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	558 }
abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	559
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	560 static int
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	561 instance_compare(inst, other)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	562 PyObject inst, other;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	563 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	564 PyObject *result;
2084 abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	565 long outcome;
abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	566 result = instance_compare1(inst, other);
5610 10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5456 diff changeset	567 if (result == NULL)
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5456 diff changeset	568 return -1;
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5456 diff changeset	569 if (!PyInt_Check(result)) {
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5456 diff changeset	570 Py_DECREF(result);
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5456 diff changeset	571 PyErr_SetString(PyExc_TypeError,
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5456 diff changeset	572 "comparison did not return an int");
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5456 diff changeset	573 return -1;
1982 33515485ead0 Comparison of two class instances without __cmp__ or __rcmp__ methods Sjoerd Mullender <sjoerd@acm.org> parents: 1908 diff changeset	574 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	575 outcome = PyInt_AsLong(result);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	576 Py_DECREF(result);
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	577 if (outcome < 0)
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	578 return -1;
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	579 else if (outcome > 0)
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	580 return 1;
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	581 return 0;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	582 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	583
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	584 static long
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	585 instance_hash(inst)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	586 PyInstanceObject *inst;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	587 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	588 PyObject *func;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	589 PyObject *res;
1272 7b7411f9b116 Fix bug in class instance hash (forgot to clear error condition). Guido van Rossum <guido@python.org> parents: 1257 diff changeset	590 long outcome;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	591 static PyObject hashstr, cmpstr;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	592
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	593 if (hashstr == NULL)
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	594 hashstr = PyString_InternFromString("__hash__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	595 func = instance_getattr(inst, hashstr);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	596 if (func == NULL) {
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	597 /* If there is no __cmp__ method, we hash on the address.
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	598 If a __cmp__ method exists, there must be a __hash__. */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	599 PyErr_Clear();
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	600 if (cmpstr == NULL)
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	601 cmpstr = PyString_InternFromString("__cmp__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	602 func = instance_getattr(inst, cmpstr);
1272 7b7411f9b116 Fix bug in class instance hash (forgot to clear error condition). Guido van Rossum <guido@python.org> parents: 1257 diff changeset	603 if (func == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	604 PyErr_Clear();
1272 7b7411f9b116 Fix bug in class instance hash (forgot to clear error condition). Guido van Rossum <guido@python.org> parents: 1257 diff changeset	605 outcome = (long)inst;
7b7411f9b116 Fix bug in class instance hash (forgot to clear error condition). Guido van Rossum <guido@python.org> parents: 1257 diff changeset	606 if (outcome == -1)
7b7411f9b116 Fix bug in class instance hash (forgot to clear error condition). Guido van Rossum <guido@python.org> parents: 1257 diff changeset	607 outcome = -2;
7b7411f9b116 Fix bug in class instance hash (forgot to clear error condition). Guido van Rossum <guido@python.org> parents: 1257 diff changeset	608 return outcome;
7b7411f9b116 Fix bug in class instance hash (forgot to clear error condition). Guido van Rossum <guido@python.org> parents: 1257 diff changeset	609 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	610 PyErr_SetString(PyExc_TypeError, "unhashable instance");
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	611 return -1;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	612 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	613 res = PyEval_CallObject(func, (PyObject *)NULL);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	614 Py_DECREF(func);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	615 if (res == NULL)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	616 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	617 if (PyInt_Check(res)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	618 outcome = PyInt_AsLong(res);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	619 if (outcome == -1)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	620 outcome = -2;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	621 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	622 else {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	623 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	624 "__hash__() should return an int");
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	625 outcome = -1;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	626 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	627 Py_DECREF(res);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	628 return outcome;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	629 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	630
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	631 static PyObject getitemstr, setitemstr, delitemstr, lenstr;
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	632
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	633 static int
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	634 instance_length(inst)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	635 PyInstanceObject *inst;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	636 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	637 PyObject *func;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	638 PyObject *res;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	639 int outcome;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	640
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	641 if (lenstr == NULL)
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	642 lenstr = PyString_InternFromString("__len__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	643 func = instance_getattr(inst, lenstr);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	644 if (func == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	645 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	646 res = PyEval_CallObject(func, (PyObject *)NULL);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	647 Py_DECREF(func);
1096 ce718457b172 * classobject.c: in instance_lenth, test result of call_object Guido van Rossum <guido@python.org> parents: 1051 diff changeset	648 if (res == NULL)
ce718457b172 * classobject.c: in instance_lenth, test result of call_object Guido van Rossum <guido@python.org> parents: 1051 diff changeset	649 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	650 if (PyInt_Check(res)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	651 outcome = PyInt_AsLong(res);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	652 if (outcome < 0)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	653 PyErr_SetString(PyExc_ValueError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	654 "__len__() should return >= 0");
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	655 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	656 else {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	657 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	658 "__len__() should return an int");
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	659 outcome = -1;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	660 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	661 Py_DECREF(res);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	662 return outcome;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	663 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	664
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	665 static PyObject *
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	666 instance_subscript(inst, key)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	667 PyInstanceObject *inst;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	668 PyObject *key;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	669 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	670 PyObject *func;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	671 PyObject *arg;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	672 PyObject *res;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	673
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	674 if (getitemstr == NULL)
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	675 getitemstr = PyString_InternFromString("__getitem__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	676 func = instance_getattr(inst, getitemstr);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	677 if (func == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	678 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	679 arg = Py_BuildValue("(O)", key);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	680 if (arg == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	681 Py_DECREF(func);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	682 return NULL;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	683 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	684 res = PyEval_CallObject(func, arg);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	685 Py_DECREF(func);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	686 Py_DECREF(arg);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	687 return res;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	688 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	689
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	690 static int
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	691 instance_ass_subscript(inst, key, value)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	692 PyInstanceObject*inst;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	693 PyObject *key;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	694 PyObject *value;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	695 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	696 PyObject *func;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	697 PyObject *arg;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	698 PyObject *res;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	699
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	700 if (value == NULL) {
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	701 if (delitemstr == NULL)
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	702 delitemstr = PyString_InternFromString("__delitem__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	703 func = instance_getattr(inst, delitemstr);
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	704 }
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	705 else {
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	706 if (setitemstr == NULL)
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	707 setitemstr = PyString_InternFromString("__setitem__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	708 func = instance_getattr(inst, setitemstr);
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	709 }
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	710 if (func == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	711 return -1;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	712 if (value == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	713 arg = Py_BuildValue("(O)", key);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	714 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	715 arg = Py_BuildValue("(OO)", key, value);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	716 if (arg == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	717 Py_DECREF(func);
956 a60cb5321211 * macmodule.c: include allobjects.h, not .c Guido van Rossum <guido@python.org> parents: 955 diff changeset	718 return -1;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	719 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	720 res = PyEval_CallObject(func, arg);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	721 Py_DECREF(func);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	722 Py_DECREF(arg);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	723 if (res == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	724 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	725 Py_DECREF(res);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	726 return 0;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	727 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	728
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	729 static PyMappingMethods instance_as_mapping = {
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	730 (inquiry)instance_length, /mp_length/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	731 (binaryfunc)instance_subscript, /mp_subscript/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	732 (objobjargproc)instance_ass_subscript, /mp_ass_subscript/
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	733 };
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	734
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	735 static PyObject *
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	736 instance_item(inst, i)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	737 PyInstanceObject *inst;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	738 int i;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	739 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	740 PyObject func, arg, *res;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	741
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	742 if (getitemstr == NULL)
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	743 getitemstr = PyString_InternFromString("__getitem__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	744 func = instance_getattr(inst, getitemstr);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	745 if (func == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	746 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	747 arg = Py_BuildValue("(i)", i);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	748 if (arg == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	749 Py_DECREF(func);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	750 return NULL;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	751 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	752 res = PyEval_CallObject(func, arg);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	753 Py_DECREF(func);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	754 Py_DECREF(arg);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	755 return res;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	756 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	757
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	758 static PyObject *
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	759 instance_slice(inst, i, j)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	760 PyInstanceObject *inst;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	761 int i, j;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	762 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	763 PyObject func, arg, *res;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	764 static PyObject *getslicestr;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	765
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	766 if (getslicestr == NULL)
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	767 getslicestr = PyString_InternFromString("__getslice__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	768 func = instance_getattr(inst, getslicestr);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	769 if (func == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	770 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	771 arg = Py_BuildValue("(ii)", i, j);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	772 if (arg == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	773 Py_DECREF(func);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	774 return NULL;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	775 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	776 res = PyEval_CallObject(func, arg);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	777 Py_DECREF(func);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	778 Py_DECREF(arg);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	779 return res;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	780 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	781
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	782 static int
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	783 instance_ass_item(inst, i, item)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	784 PyInstanceObject *inst;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	785 int i;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	786 PyObject *item;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	787 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	788 PyObject func, arg, *res;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	789
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	790 if (item == NULL) {
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	791 if (delitemstr == NULL)
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	792 delitemstr = PyString_InternFromString("__delitem__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	793 func = instance_getattr(inst, delitemstr);
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	794 }
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	795 else {
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	796 if (setitemstr == NULL)
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	797 setitemstr = PyString_InternFromString("__setitem__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	798 func = instance_getattr(inst, setitemstr);
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	799 }
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	800 if (func == NULL)
956 a60cb5321211 * macmodule.c: include allobjects.h, not .c Guido van Rossum <guido@python.org> parents: 955 diff changeset	801 return -1;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	802 if (item == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	803 arg = Py_BuildValue("i", i);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	804 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	805 arg = Py_BuildValue("(iO)", i, item);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	806 if (arg == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	807 Py_DECREF(func);
956 a60cb5321211 * macmodule.c: include allobjects.h, not .c Guido van Rossum <guido@python.org> parents: 955 diff changeset	808 return -1;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	809 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	810 res = PyEval_CallObject(func, arg);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	811 Py_DECREF(func);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	812 Py_DECREF(arg);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	813 if (res == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	814 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	815 Py_DECREF(res);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	816 return 0;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	817 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	818
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	819 static int
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	820 instance_ass_slice(inst, i, j, value)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	821 PyInstanceObject *inst;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	822 int i, j;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	823 PyObject *value;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	824 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	825 PyObject func, arg, *res;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	826 static PyObject setslicestr, delslicestr;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	827
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	828 if (value == NULL) {
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	829 if (delslicestr == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	830 delslicestr =
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	831 PyString_InternFromString("__delslice__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	832 func = instance_getattr(inst, delslicestr);
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	833 }
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	834 else {
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	835 if (setslicestr == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	836 setslicestr =
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	837 PyString_InternFromString("__setslice__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	838 func = instance_getattr(inst, setslicestr);
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	839 }
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	840 if (func == NULL)
956 a60cb5321211 * macmodule.c: include allobjects.h, not .c Guido van Rossum <guido@python.org> parents: 955 diff changeset	841 return -1;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	842 if (value == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	843 arg = Py_BuildValue("(ii)", i, j);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	844 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	845 arg = Py_BuildValue("(iiO)", i, j, value);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	846 if (arg == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	847 Py_DECREF(func);
956 a60cb5321211 * macmodule.c: include allobjects.h, not .c Guido van Rossum <guido@python.org> parents: 955 diff changeset	848 return -1;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	849 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	850 res = PyEval_CallObject(func, arg);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	851 Py_DECREF(func);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	852 Py_DECREF(arg);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	853 if (res == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	854 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	855 Py_DECREF(res);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	856 return 0;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	857 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	858
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	859 static PySequenceMethods instance_as_sequence = {
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	860 (inquiry)instance_length, /sq_length/
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	861 0, /sq_concat/
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	862 0, /sq_repeat/
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	863 (intargfunc)instance_item, /sq_item/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	864 (intintargfunc)instance_slice, /sq_slice/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	865 (intobjargproc)instance_ass_item, /sq_ass_item/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	866 (intintobjargproc)instance_ass_slice, /sq_ass_slice/
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	867 };
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	868
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	869 static PyObject *
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	870 generic_unary_op(self, methodname)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	871 PyInstanceObject *self;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	872 PyObject *methodname;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	873 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	874 PyObject func, res;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	875
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	876 if ((func = instance_getattr(self, methodname)) == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	877 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	878 res = PyEval_CallObject(func, (PyObject *)NULL);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	879 Py_DECREF(func);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	880 return res;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	881 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	882
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	883
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	884 /* Forward */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	885 static int halfbinop Py_PROTO((PyObject , PyObject , char , PyObject *,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	886 PyObject * () Py_PROTO((PyObject , PyObject *)), int ));
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	887
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	888
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	889 /* Implement a binary operator involving at least one class instance. */
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	890
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	891 PyObject *
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	892 PyInstance_DoBinOp(v, w, opname, ropname, thisfunc)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	893 PyObject *v;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	894 PyObject *w;
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	895 char *opname;
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	896 char *ropname;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	897 PyObject * (thisfunc) Py_PROTO((PyObject , PyObject *));
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	898 {
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	899 char buf[256];
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	900 PyObject *result = NULL;
2084 abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	901 if (halfbinop(v, w, opname, &result, thisfunc, 0) <= 0)
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	902 return result;
2084 abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	903 if (halfbinop(w, v, ropname, &result, thisfunc, 1) <= 0)
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	904 return result;
5610 10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5456 diff changeset	905 /* Sigh -- special case for comnparisons */
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5456 diff changeset	906 if (strcmp(opname, "__cmp__") == 0) {
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5456 diff changeset	907 long c = (v < w) ? -1 : (v > w) ? 1 : 0;
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5456 diff changeset	908 return PyInt_FromLong(c);
10e9cfa010f0 PyObject_Compare can raise an exception now. Guido van Rossum <guido@python.org> parents: 5456 diff changeset	909 }
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	910 sprintf(buf, "%s nor %s defined for these operands", opname, ropname);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	911 PyErr_SetString(PyExc_TypeError, buf);
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	912 return NULL;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	913 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	914
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	915
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	916 /* Try one half of a binary operator involving a class instance.
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	917 Return value:
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	918 -1 if an exception is to be reported right away
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	919 0 if we have a valid result
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	920 1 if we could try another operation
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	921 */
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	922
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	923 static PyObject *coerce_obj;
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	924
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	925 static int
2084 abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	926 halfbinop(v, w, opname, r_result, thisfunc, swapped)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	927 PyObject *v;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	928 PyObject *w;
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	929 char *opname;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	930 PyObject **r_result;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	931 PyObject * (thisfunc) Py_PROTO((PyObject , PyObject *));
2084 abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	932 int swapped;
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	933 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	934 PyObject *func;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	935 PyObject *args;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	936 PyObject *PyNumber_Coerce;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	937 PyObject *coerced = NULL;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	938 PyObject *v1;
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	939
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	940 if (!PyInstance_Check(v))
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	941 return 1;
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	942 if (coerce_obj == NULL) {
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	943 coerce_obj = PyString_InternFromString("__coerce__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	944 if (coerce_obj == NULL)
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	945 return -1;
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	946 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	947 PyNumber_Coerce = PyObject_GetAttr(v, coerce_obj);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	948 if (PyNumber_Coerce == NULL) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	949 PyErr_Clear();
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	950 }
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	951 else {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	952 args = Py_BuildValue("(O)", w);
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	953 if (args == NULL) {
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	954 return -1;
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	955 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	956 coerced = PyEval_CallObject(PyNumber_Coerce, args);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	957 Py_DECREF(args);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	958 Py_DECREF(PyNumber_Coerce);
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	959 if (coerced == NULL) {
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	960 return -1;
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	961 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	962 if (coerced == Py_None) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	963 Py_DECREF(coerced);
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	964 return 1;
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	965 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	966 if (!PyTuple_Check(coerced) \|\| PyTuple_Size(coerced) != 2) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	967 Py_DECREF(coerced);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	968 PyErr_SetString(PyExc_TypeError,
2084 abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	969 "coercion should return None or 2-tuple");
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	970 return -1;
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	971 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	972 v1 = PyTuple_GetItem(coerced, 0);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	973 w = PyTuple_GetItem(coerced, 1);
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	974 if (v1 != v) {
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	975 v = v1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	976 if (!PyInstance_Check(v) && !PyInstance_Check(w)) {
2084 abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	977 if (swapped)
abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	978 r_result = (thisfunc)(w, v);
abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	979 else
abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	980 r_result = (thisfunc)(v, w);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	981 Py_DECREF(coerced);
2084 abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	982 return *r_result == NULL ? -1 : 0;
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	983 }
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	984 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	985 w = PyTuple_GetItem(coerced, 1);
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	986 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	987 func = PyObject_GetAttrString(v, opname);
2084 abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	988 if (func == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	989 Py_XDECREF(coerced);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	990 if (PyErr_Occurred() != PyExc_AttributeError)
2084 abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	991 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	992 PyErr_Clear();
2084 abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	993 return 1;
abbf2a4b488b * Objects/classobject.c: added 5th (function) parameter to Guido van Rossum <guido@python.org> parents: 2059 diff changeset	994 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	995 args = Py_BuildValue("(O)", w);
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	996 if (args == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	997 Py_DECREF(func);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	998 Py_XDECREF(coerced);
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	999 return -1;
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1000 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1001 *r_result = PyEval_CallObject(func, args);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1002 Py_DECREF(args);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1003 Py_DECREF(func);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1004 Py_XDECREF(coerced);
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1005 return *r_result == NULL ? -1 : 0;
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1006 }
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1007
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1008 static int
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1009 instance_coerce(pv, pw)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1010 PyObject **pv;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1011 PyObject **pw;
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1012 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1013 PyObject v = pv;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1014 PyObject w = pw;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1015 PyObject *PyNumber_Coerce;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1016 PyObject *args;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1017 PyObject *coerced;
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1018
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1019 if (coerce_obj == NULL) {
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	1020 coerce_obj = PyString_InternFromString("__coerce__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1021 if (coerce_obj == NULL)
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1022 return -1;
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1023 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1024 PyNumber_Coerce = PyObject_GetAttr(v, coerce_obj);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1025 if (PyNumber_Coerce == NULL) {
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1026 /* No __coerce__ method: always OK */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1027 PyErr_Clear();
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1028 Py_INCREF(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1029 Py_INCREF(w);
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1030 return 0;
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1031 }
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1032 /* Has __coerce__ method: call it */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1033 args = Py_BuildValue("(O)", w);
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1034 if (args == NULL) {
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1035 return -1;
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1036 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1037 coerced = PyEval_CallObject(PyNumber_Coerce, args);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1038 Py_DECREF(args);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1039 Py_DECREF(PyNumber_Coerce);
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1040 if (coerced == NULL) {
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1041 /* __coerce__ call raised an exception */
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1042 return -1;
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1043 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1044 if (coerced == Py_None) {
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1045 /* __coerce__ says "I can't do it" */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1046 Py_DECREF(coerced);
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1047 return 1;
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1048 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1049 if (!PyTuple_Check(coerced) \|\| PyTuple_Size(coerced) != 2) {
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1050 /* __coerce__ return value is malformed */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1051 Py_DECREF(coerced);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1052 PyErr_SetString(PyExc_TypeError,
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1053 "coercion should return None or 2-tuple");
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1054 return -1;
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1055 }
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1056 /* __coerce__ returned two new values */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1057 *pv = PyTuple_GetItem(coerced, 0);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1058 *pw = PyTuple_GetItem(coerced, 1);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1059 Py_INCREF(*pv);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1060 Py_INCREF(*pw);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1061 Py_DECREF(coerced);
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1062 return 0;
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1063 }
2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1064
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1065
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1066 #define UNARY(funcname, methodname) \
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1067 static PyObject funcname(self) PyInstanceObject self; { \
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1068 static PyObject *o; \
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	1069 if (o == NULL) o = PyString_InternFromString(methodname); \
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1070 return generic_unary_op(self, o); \
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1071 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1072
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1073 UNARY(instance_neg, "__neg__")
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1074 UNARY(instance_pos, "__pos__")
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1075 UNARY(instance_abs, "__abs__")
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1076
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1077 static int
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1078 instance_nonzero(self)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1079 PyInstanceObject *self;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1080 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1081 PyObject func, res;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1082 long outcome;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1083 static PyObject *nonzerostr;
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1084
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1085 if (nonzerostr == NULL)
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	1086 nonzerostr = PyString_InternFromString("__nonzero__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1087 if ((func = instance_getattr(self, nonzerostr)) == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1088 PyErr_Clear();
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1089 if (lenstr == NULL)
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	1090 lenstr = PyString_InternFromString("__len__");
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1091 if ((func = instance_getattr(self, lenstr)) == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1092 PyErr_Clear();
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1093 /* Fall back to the default behavior:
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1094 all instances are nonzero */
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1095 return 1;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1096 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1097 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1098 res = PyEval_CallObject(func, (PyObject *)NULL);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1099 Py_DECREF(func);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1100 if (res == NULL)
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1101 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1102 if (!PyInt_Check(res)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1103 Py_DECREF(res);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1104 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1105 "__nonzero__ should return an int");
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1106 return -1;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1107 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1108 outcome = PyInt_AsLong(res);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1109 Py_DECREF(res);
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1110 if (outcome < 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1111 PyErr_SetString(PyExc_ValueError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1112 "__nonzero__ should return >= 0");
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1113 return -1;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1114 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1115 return outcome > 0;
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1116 }
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1117
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1118 UNARY(instance_invert, "__invert__")
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 1031 diff changeset	1119 UNARY(instance_int, "__int__")
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 1031 diff changeset	1120 UNARY(instance_long, "__long__")
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 1031 diff changeset	1121 UNARY(instance_float, "__float__")
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 1031 diff changeset	1122 UNARY(instance_oct, "__oct__")
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 1031 diff changeset	1123 UNARY(instance_hex, "__hex__")
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 1031 diff changeset	1124
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1125 /* This version is for ternary calls only (z != None) */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1126 static PyObject *
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1127 instance_pow(v, w, z)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1128 PyObject *v;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1129 PyObject *w;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1130 PyObject *z;
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1131 {
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1132 /* XXX Doesn't do coercions... */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1133 PyObject *func;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1134 PyObject *args;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1135 PyObject *result;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1136 static PyObject *powstr;
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1137
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1138 if (powstr == NULL)
5008 f55e82e1e565 Intern the various string objects created to speed up lookups. Guido van Rossum <guido@python.org> parents: 4583 diff changeset	1139 powstr = PyString_InternFromString("__pow__");
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1140 func = PyObject_GetAttr(v, powstr);
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1141 if (func == NULL)
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1142 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1143 args = Py_BuildValue("(OO)", w, z);
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1144 if (args == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1145 Py_DECREF(func);
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1146 return NULL;
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1147 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1148 result = PyEval_CallObject(func, args);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1149 Py_DECREF(func);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1150 Py_DECREF(args);
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1151 return result;
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1152 }
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1153
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1154 static PyNumberMethods instance_as_number = {
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1155 0, /nb_add/
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1156 0, /nb_subtract/
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1157 0, /nb_multiply/
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1158 0, /nb_divide/
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1159 0, /nb_remainder/
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1160 0, /nb_divmod/
1861 d405e3e8ffd3 Yet another version (by me) of __getattr__ etc. Guido van Rossum <guido@python.org> parents: 1860 diff changeset	1161 (ternaryfunc)instance_pow, /nb_power/
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1162 (unaryfunc)instance_neg, /nb_negative/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1163 (unaryfunc)instance_pos, /nb_positive/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1164 (unaryfunc)instance_abs, /nb_absolute/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1165 (inquiry)instance_nonzero, /nb_nonzero/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1166 (unaryfunc)instance_invert, /nb_invert/
1908 0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1167 0, /nb_lshift/
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1168 0, /nb_rshift/
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1169 0, /nb_and/
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1170 0, /nb_xor/
0437738279a8 * Include/classobject.h, Objects/classobject.c, Python/ceval.c: Guido van Rossum <guido@python.org> parents: 1861 diff changeset	1171 0, /nb_or/
2112 2669ef14c205 implement coercions involving instances properly Guido van Rossum <guido@python.org> parents: 2105 diff changeset	1172 (coercion)instance_coerce, /nb_coerce/
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1173 (unaryfunc)instance_int, /nb_int/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1174 (unaryfunc)instance_long, /nb_long/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1175 (unaryfunc)instance_float, /nb_float/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1176 (unaryfunc)instance_oct, /nb_oct/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1177 (unaryfunc)instance_hex, /nb_hex/
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1178 };
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1179
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1180 PyTypeObject PyInstance_Type = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1181 PyObject_HEAD_INIT(&PyType_Type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1182 0,
174 20fee4e2eecd Change ugly 'class member' to more normal 'instance'. Guido van Rossum <guido@python.org> parents: 145 diff changeset	1183 "instance",
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1184 sizeof(PyInstanceObject),
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1185 0,
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1186 (destructor)instance_dealloc, /tp_dealloc/
1051 f54e64c8b9b7 * Makefile: added IMGFILE; moved some stuff around. Guido van Rossum <guido@python.org> parents: 1049 diff changeset	1187 0, /tp_print/
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1188 0, /tp_getattr/
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1189 0, /tp_setattr/
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1190 instance_compare, /tp_compare/
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1191 (reprfunc)instance_repr, /tp_repr/
944 222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1192 &instance_as_number, /tp_as_number/
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1193 &instance_as_sequence, /tp_as_sequence/
222f04f55083 Changes so that user-defined classes can implement operations invoked Guido van Rossum <guido@python.org> parents: 791 diff changeset	1194 &instance_as_mapping, /tp_as_mapping/
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1195 (hashfunc)instance_hash, /tp_hash/
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1196 0, /tp_call/
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1197 0, /tp_str/
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1198 (getattrofunc)instance_getattr, /tp_getattro/
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1199 (setattrofunc)instance_setattr, /tp_setattro/
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1200 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1201
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1202
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1203 /* Instance method objects are used for two purposes:
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1204 (a) as bound instance methods (returned by instancename.methodname)
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1205 (b) as unbound methods (returned by ClassName.methodname)
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1206 In case (b), im_self is NULL
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1207 */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1208
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1209 typedef struct {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1210 PyObject_HEAD
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1211 PyObject im_func; / The function implementing the method */
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1212 PyObject im_self; / The instance it is bound to, or NULL */
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1213 PyObject im_class; / The class that defined the method */
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1214 } PyMethodObject;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1215
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1216 PyObject *
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1217 PyMethod_New(func, self, class)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1218 PyObject *func;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1219 PyObject *self;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1220 PyObject *class;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1221 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1222 register PyMethodObject *im;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1223 if (!PyFunction_Check(func)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1224 PyErr_BadInternalCall();
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1225 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1226 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1227 im = PyObject_NEW(PyMethodObject, &PyMethod_Type);
224 e71b6fec86e5 Renamed class methods to instance methods (which they are) Guido van Rossum <guido@python.org> parents: 202 diff changeset	1228 if (im == NULL)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1229 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1230 Py_INCREF(func);
224 e71b6fec86e5 Renamed class methods to instance methods (which they are) Guido van Rossum <guido@python.org> parents: 202 diff changeset	1231 im->im_func = func;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1232 Py_XINCREF(self);
224 e71b6fec86e5 Renamed class methods to instance methods (which they are) Guido van Rossum <guido@python.org> parents: 202 diff changeset	1233 im->im_self = self;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1234 Py_INCREF(class);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1235 im->im_class = class;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1236 return (PyObject *)im;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1237 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1238
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1239 PyObject *
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1240 PyMethod_Function(im)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1241 register PyObject *im;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1242 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1243 if (!PyMethod_Check(im)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1244 PyErr_BadInternalCall();
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1245 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1246 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1247 return ((PyMethodObject *)im)->im_func;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1248 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1249
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1250 PyObject *
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1251 PyMethod_Self(im)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1252 register PyObject *im;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1253 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1254 if (!PyMethod_Check(im)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1255 PyErr_BadInternalCall();
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1256 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1257 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1258 return ((PyMethodObject *)im)->im_self;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1259 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1260
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1261 PyObject *
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1262 PyMethod_Class(im)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1263 register PyObject *im;
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1264 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1265 if (!PyMethod_Check(im)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1266 PyErr_BadInternalCall();
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1267 return NULL;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1268 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1269 return ((PyMethodObject *)im)->im_class;
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1270 }
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1271
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1272 /* Class method methods */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1273
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1274 #define OFF(x) offsetof(PyMethodObject, x)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 27 diff changeset	1275
224 e71b6fec86e5 Renamed class methods to instance methods (which they are) Guido van Rossum <guido@python.org> parents: 202 diff changeset	1276 static struct memberlist instancemethod_memberlist[] = {
e71b6fec86e5 Renamed class methods to instance methods (which they are) Guido van Rossum <guido@python.org> parents: 202 diff changeset	1277 {"im_func", T_OBJECT, OFF(im_func)},
e71b6fec86e5 Renamed class methods to instance methods (which they are) Guido van Rossum <guido@python.org> parents: 202 diff changeset	1278 {"im_self", T_OBJECT, OFF(im_self)},
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1279 {"im_class", T_OBJECT, OFF(im_class)},
3549 f66306bc0663 Added __name__ attribute to class instance method objects. Guido van Rossum <guido@python.org> parents: 3096 diff changeset	1280 /* Dummies that are not handled by getattr() except for __members__ */
f66306bc0663 Added __name__ attribute to class instance method objects. Guido van Rossum <guido@python.org> parents: 3096 diff changeset	1281 {"__doc__", T_INT, 0},
f66306bc0663 Added __name__ attribute to class instance method objects. Guido van Rossum <guido@python.org> parents: 3096 diff changeset	1282 {"__name__", T_INT, 0},
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 27 diff changeset	1283 {NULL} /* Sentinel */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 27 diff changeset	1284 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 27 diff changeset	1285
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1286 static PyObject *
224 e71b6fec86e5 Renamed class methods to instance methods (which they are) Guido van Rossum <guido@python.org> parents: 202 diff changeset	1287 instancemethod_getattr(im, name)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1288 register PyMethodObject *im;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1289 PyObject *name;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 27 diff changeset	1290 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1291 char *sname = PyString_AsString(name);
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1292 if (sname[0] == '_') {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1293 PyFunctionObject func = (PyFunctionObject )(im->im_func);
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1294 if (strcmp(sname, "__name__") == 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1295 Py_INCREF(func->func_name);
3549 f66306bc0663 Added __name__ attribute to class instance method objects. Guido van Rossum <guido@python.org> parents: 3096 diff changeset	1296 return func->func_name;
f66306bc0663 Added __name__ attribute to class instance method objects. Guido van Rossum <guido@python.org> parents: 3096 diff changeset	1297 }
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1298 if (strcmp(sname, "__doc__") == 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1299 Py_INCREF(func->func_doc);
3549 f66306bc0663 Added __name__ attribute to class instance method objects. Guido van Rossum <guido@python.org> parents: 3096 diff changeset	1300 return func->func_doc;
f66306bc0663 Added __name__ attribute to class instance method objects. Guido van Rossum <guido@python.org> parents: 3096 diff changeset	1301 }
f66306bc0663 Added __name__ attribute to class instance method objects. Guido van Rossum <guido@python.org> parents: 3096 diff changeset	1302 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1303 if (PyEval_GetRestricted()) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1304 PyErr_SetString(PyExc_RuntimeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1305 "instance-method attributes not accessible in restricted mode");
2105 ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	1306 return NULL;
ea7b2bf0b521 add restrictions in restricted mode Guido van Rossum <guido@python.org> parents: 2084 diff changeset	1307 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1308 return PyMember_Get((char *)im, instancemethod_memberlist, sname);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 27 diff changeset	1309 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 27 diff changeset	1310
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1311 static void
224 e71b6fec86e5 Renamed class methods to instance methods (which they are) Guido van Rossum <guido@python.org> parents: 202 diff changeset	1312 instancemethod_dealloc(im)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1313 register PyMethodObject *im;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1314 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1315 Py_DECREF(im->im_func);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1316 Py_XDECREF(im->im_self);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1317 Py_DECREF(im->im_class);
224 e71b6fec86e5 Renamed class methods to instance methods (which they are) Guido van Rossum <guido@python.org> parents: 202 diff changeset	1318 free((ANY *)im);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1319 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1320
1021 0d7c82366704 Compare instance methods by comparing the object and the function. Guido van Rossum <guido@python.org> parents: 956 diff changeset	1321 static int
0d7c82366704 Compare instance methods by comparing the object and the function. Guido van Rossum <guido@python.org> parents: 956 diff changeset	1322 instancemethod_compare(a, b)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1323 PyMethodObject a, b;
1021 0d7c82366704 Compare instance methods by comparing the object and the function. Guido van Rossum <guido@python.org> parents: 956 diff changeset	1324 {
2641 f98a2233b337 change comparing instance methods Guido van Rossum <guido@python.org> parents: 2239 diff changeset	1325 if (a->im_self != b->im_self)
f98a2233b337 change comparing instance methods Guido van Rossum <guido@python.org> parents: 2239 diff changeset	1326 return (a->im_self < b->im_self) ? -1 : 1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1327 return PyObject_Compare(a->im_func, b->im_func);
1021 0d7c82366704 Compare instance methods by comparing the object and the function. Guido van Rossum <guido@python.org> parents: 956 diff changeset	1328 }
0d7c82366704 Compare instance methods by comparing the object and the function. Guido van Rossum <guido@python.org> parents: 956 diff changeset	1329
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1330 static PyObject *
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	1331 instancemethod_repr(a)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1332 PyMethodObject *a;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	1333 {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	1334 char buf[240];
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1335 PyInstanceObject self = (PyInstanceObject )(a->im_self);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1336 PyFunctionObject func = (PyFunctionObject )(a->im_func);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1337 PyClassObject class = (PyClassObject )(a->im_class);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1338 PyObject fclassname, iclassname, *funcname;
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1339 char fcname, icname, *fname;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1340 fclassname = class->cl_name;
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1341 funcname = func->func_name;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1342 if (fclassname != NULL && PyString_Check(fclassname))
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1343 fcname = PyString_AsString(fclassname);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	1344 else
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1345 fcname = "?";
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1346 if (funcname != NULL && PyString_Check(funcname))
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1347 fname = PyString_AsString(funcname);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	1348 else
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	1349 fname = "?";
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1350 if (self == NULL)
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1351 sprintf(buf, "<unbound method %.100s.%.100s>", fcname, fname);
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1352 else {
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1353 iclassname = self->in_class->cl_name;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1354 if (iclassname != NULL && PyString_Check(iclassname))
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1355 icname = PyString_AsString(iclassname);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1356 else
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1357 icname = "?";
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1358 sprintf(buf, "<method %.60s.%.60s of %.60s instance at %lx>",
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1359 fcname, fname, icname, (long)self);
4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1360 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1361 return PyString_FromString(buf);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	1362 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1272 diff changeset	1363
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1364 static long
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1365 instancemethod_hash(a)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1366 PyMethodObject *a;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1367 {
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1368 long x, y;
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1369 if (a->im_self == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1370 x = PyObject_Hash(Py_None);
1289 4d292c7857d4 Access checks now work, at least for instance data (not for methods Guido van Rossum <guido@python.org> parents: 1288 diff changeset	1371 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1372 x = PyObject_Hash(a->im_self);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1373 if (x == -1)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1374 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1375 y = PyObject_Hash(a->im_func);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1376 if (y == -1)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1377 return -1;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1378 return x ^ y;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1379 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1380
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1381 PyTypeObject PyMethod_Type = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1382 PyObject_HEAD_INIT(&PyType_Type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1383 0,
202 bfffc7e0fcc3 Rename class methods to instance methods (at least where user-visible) Guido van Rossum <guido@python.org> parents: 174 diff changeset	1384 "instance method",
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5008 diff changeset	1385 sizeof(PyMethodObject),
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1386 0,
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1387 (destructor)instancemethod_dealloc, /tp_dealloc/
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1388 0, /tp_print/
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1389 0, /tp_getattr/
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1390 0, /tp_setattr/
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1391 (cmpfunc)instancemethod_compare, /tp_compare/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1392 (reprfunc)instancemethod_repr, /tp_repr/
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1393 0, /tp_as_number/
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1394 0, /tp_as_sequence/
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1395 0, /tp_as_mapping/
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1396 (hashfunc)instancemethod_hash, /tp_hash/
3987 6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1397 0, /tp_call/
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1398 0, /tp_str/
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1399 (getattrofunc)instancemethod_getattr, /tp_getattro/
6fbc5c665812 Optimizations by Sjoerd: Guido van Rossum <guido@python.org> parents: 3769 diff changeset	1400 0, /tp_setattro/
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1401 };

Mercurial > cpython-lru_cache-weakref

annotate Objects/classobject.c @ 5817:48b94de85bf3 legacy-trunk