[Python-checkins] CVS: python/dist/src/Include object.h,2.79.2.17,2.79.2.18

Guido van Rossum gvanrossum@users.sourceforge.net
Tue, 26 Jun 2001 13:17:00 -0700


Update of /cvsroot/python/python/dist/src/Include
In directory usw-pr-cvs1:/tmp/cvs-serv550/Include

Modified Files:
      Tag: descr-branch
	object.h 
Log Message:
Rename tp_introduced to tp_defined.  It turns out I misread the
definitions: an "introduced" method doesn't override a base class
method; a "defined" method may or may not override a base class.  And
an "inherited" method is defined in a base class and not overridden; a
"supported" method is defined or inherited.  Maybe this diagram helps:


                            | defined here | not defined here
----------------------------+--------------+-----------------
defined in a base class     | overridden   | inherited
----------------------------+--------------+-----------------
not defined in a base class | introduced   | not supported




Index: object.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/object.h,v
retrieving revision 2.79.2.17
retrieving revision 2.79.2.18
diff -C2 -r2.79.2.17 -r2.79.2.18
*** object.h	2001/06/19 12:26:46	2.79.2.17
--- object.h	2001/06/26 20:16:57	2.79.2.18
***************
*** 276,280 ****
  	PyObject *tp_bases;
  	PyObject *tp_mro; /* method resolution order */
! 	PyObject *tp_introduced;
  
  #ifdef COUNT_ALLOCS
--- 276,280 ----
  	PyObject *tp_bases;
  	PyObject *tp_mro; /* method resolution order */
! 	PyObject *tp_defined;
  
  #ifdef COUNT_ALLOCS