[Python-checkins] python/dist/src/Objects bufferobject.c,2.19,2.20 complexobject.c,2.62,2.63 floatobject.c,2.114,2.115 intobject.c,2.91,2.92 stringobject.c,2.180,2.181 tupleobject.c,2.71,2.72

gvanrossum@users.sourceforge.net gvanrossum@users.sourceforge.net
Mon, 19 Aug 2002 12:26:44 -0700


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

Modified Files:
	bufferobject.c complexobject.c floatobject.c intobject.c 
	stringobject.c tupleobject.c 
Log Message:
Call me anal, but there was a particular phrase that was speading to
comments everywhere that bugged me: /* Foo is inlined */ instead of
/* Inline Foo */.  Somehow the "is inlined" phrase always confused me
for half a second (thinking, "No it isn't" until I added the missing
"here").  The new phrase is hopefully unambiguous.


Index: bufferobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/bufferobject.c,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -d -r2.19 -r2.20
*** bufferobject.c	25 Jun 2002 00:25:30 -0000	2.19
--- bufferobject.c	19 Aug 2002 19:26:42 -0000	2.20
***************
*** 139,143 ****
  		return NULL;
  	}
! 	/* PyObject_New is inlined */
  	o = PyObject_MALLOC(sizeof(*b) + size);
  	if ( o == NULL )
--- 139,143 ----
  		return NULL;
  	}
! 	/* Inline PyObject_New */
  	o = PyObject_MALLOC(sizeof(*b) + size);
  	if ( o == NULL )

Index: complexobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/complexobject.c,v
retrieving revision 2.62
retrieving revision 2.63
diff -C2 -d -r2.62 -r2.63
*** complexobject.c	13 Jun 2002 20:32:56 -0000	2.62
--- complexobject.c	19 Aug 2002 19:26:42 -0000	2.63
***************
*** 200,204 ****
  	register PyComplexObject *op;
  
! 	/* PyObject_New is inlined */
  	op = (PyComplexObject *) PyObject_MALLOC(sizeof(PyComplexObject));
  	if (op == NULL)
--- 200,204 ----
  	register PyComplexObject *op;
  
! 	/* Inline PyObject_New */
  	op = (PyComplexObject *) PyObject_MALLOC(sizeof(PyComplexObject));
  	if (op == NULL)

Index: floatobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/floatobject.c,v
retrieving revision 2.114
retrieving revision 2.115
diff -C2 -d -r2.114 -r2.115
*** floatobject.c	17 Jul 2002 16:30:38 -0000	2.114
--- floatobject.c	19 Aug 2002 19:26:42 -0000	2.115
***************
*** 65,69 ****
  			return NULL;
  	}
! 	/* PyObject_New is inlined */
  	op = free_list;
  	free_list = (PyFloatObject *)op->ob_type;
--- 65,69 ----
  			return NULL;
  	}
! 	/* Inline PyObject_New */
  	op = free_list;
  	free_list = (PyFloatObject *)op->ob_type;

Index: intobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/intobject.c,v
retrieving revision 2.91
retrieving revision 2.92
diff -C2 -d -r2.91 -r2.92
*** intobject.c	14 Aug 2002 18:38:27 -0000	2.91
--- intobject.c	19 Aug 2002 19:26:42 -0000	2.92
***************
*** 114,118 ****
  			return NULL;
  	}
! 	/* PyObject_New is inlined */
  	v = free_list;
  	free_list = (PyIntObject *)v->ob_type;
--- 114,118 ----
  			return NULL;
  	}
! 	/* Inline PyObject_New */
  	v = free_list;
  	free_list = (PyIntObject *)v->ob_type;

Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.180
retrieving revision 2.181
diff -C2 -d -r2.180 -r2.181
*** stringobject.c	16 Aug 2002 23:20:39 -0000	2.180
--- stringobject.c	19 Aug 2002 19:26:42 -0000	2.181
***************
*** 63,67 ****
  	}
  
! 	/* PyObject_NewVar is inlined */
  	op = (PyStringObject *)
  		PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
--- 63,67 ----
  	}
  
! 	/* Inline PyObject_NewVar */
  	op = (PyStringObject *)
  		PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
***************
*** 119,123 ****
  	}
  
! 	/* PyObject_NewVar is inlined */
  	op = (PyStringObject *)
  		PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
--- 119,123 ----
  	}
  
! 	/* Inline PyObject_NewVar */
  	op = (PyStringObject *)
  		PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
***************
*** 879,883 ****
  	}
  	size = a->ob_size + b->ob_size;
! 	/* PyObject_NewVar is inlined */
  	op = (PyStringObject *)
  		PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
--- 879,883 ----
  	}
  	size = a->ob_size + b->ob_size;
! 	/* Inline PyObject_NewVar */
  	op = (PyStringObject *)
  		PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));

Index: tupleobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/tupleobject.c,v
retrieving revision 2.71
retrieving revision 2.72
diff -C2 -d -r2.71 -r2.72
*** tupleobject.c	9 Aug 2002 01:30:17 -0000	2.71
--- tupleobject.c	19 Aug 2002 19:26:42 -0000	2.72
***************
*** 49,53 ****
  		fast_tuple_allocs++;
  #endif
! 		/* PyObject_InitVar is inlined */
  #ifdef Py_TRACE_REFS
  		op->ob_size = size;
--- 49,53 ----
  		fast_tuple_allocs++;
  #endif
! 		/* Inline PyObject_InitVar */
  #ifdef Py_TRACE_REFS
  		op->ob_size = size;