new names for lots of new functions

gvanrossum · gvanrossum · commit 938178283c29 · 1995-01-17T16:01:01.000Z
diff --git a/Include/accessobject.h b/Include/accessobject.h
@@ -46,19 +46,19 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define AC_R_PUBLIC	0004
 #define AC_W_PUBLIC	0002
 
-extern DL_IMPORT PyTypeObject Accesstype;
+extern DL_IMPORT PyTypeObject PyAccess_Type;
 
-#define PyAccess_Check(v) ((v)->ob_type == &Accesstype)
+#define PyAccess_Check(v) ((v)->ob_type == &PyAccess_Type)
 
-PyObject *newaccessobject Py_PROTO((PyObject *, PyObject *, PyTypeObject *, int));
-PyObject *getaccessvalue Py_PROTO((PyObject *, PyObject *));
-int setaccessvalue Py_PROTO((PyObject *, PyObject *, PyObject *));
+PyObject *PyAccess_FromValue Py_PROTO((PyObject *, PyObject *, PyTypeObject *, int));
+PyObject *PyAccess_AsValue Py_PROTO((PyObject *, PyObject *));
+int PyAccess_SetValue Py_PROTO((PyObject *, PyObject *, PyObject *));
 
-void setaccessowner Py_PROTO((PyObject *, PyObject *));
-PyObject *cloneaccessobject Py_PROTO((PyObject *));
-int hasaccessvalue Py_PROTO((PyObject *));
+void PyAccess_SetOwner Py_PROTO((PyObject *, PyObject *));
+PyObject *PyAccess_Clone Py_PROTO((PyObject *));
+int PyAccess_HasValue Py_PROTO((PyObject *));
 
-extern DL_IMPORT PyTypeObject Anynumbertype, Anysequencetype, Anymappingtype;
+extern DL_IMPORT PyTypeObject PyAnyNumber_Type, PyAnySequence_Type, PyAnyMapping_Type;
 
 #ifdef __cplusplus
 }
diff --git a/Include/allobjects.h b/Include/allobjects.h
@@ -64,7 +64,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "stringobject.h"
 #include "tupleobject.h"
 #include "listobject.h"
-#include "dictobject.h"
+#include "mappingobject.h"
 #include "methodobject.h"
 #include "moduleobject.h"
 #include "funcobject.h"
diff --git a/Include/bltinmodule.h b/Include/bltinmodule.h
@@ -31,6 +31,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* Built-in module interface */
 
 extern PyObject *getbuiltindict Py_PROTO(());
+extern PyObject *getbuiltinmod Py_PROTO(());
 
 #ifdef __cplusplus
 }
diff --git a/Include/dictobject.h b/Include/dictobject.h
@@ -32,20 +32,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "mappingobject.h"
 
-#define PyDict_Check(op) is_mappingobject(op)
-
-#define newdictobject PyDict_New
-
-extern PyObject *PyDict_GetItemString Py_PROTO((PyObject *dp, char *key));
-extern int PyDict_SetItemString Py_PROTO((PyObject *dp, char *key, PyObject *item));
-extern int PyDict_DelItemString Py_PROTO((PyObject *dp, char *key));
-
-#define getdictkeys PyDict_Keys
-
-#define dict2lookup PyDict_GetItem
-#define dict2insert PyDict_SetItem
-#define dict2remove PyDict_DelItem
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/Include/errors.h b/Include/errors.h
@@ -68,7 +68,7 @@ extern PyObject *PyErr_SetFromErrno Py_PROTO((PyObject *));
 
 extern void PyErr_BadInternalCall Py_PROTO((void));
 
-extern int sigcheck Py_PROTO((void)); /* In sigcheck.c or signalmodule.c */
+extern int PyErr_CheckSignals Py_PROTO((void)); /* In sigcheck.c or signalmodule.c */
 
 #ifdef __cplusplus
 }
diff --git a/Include/fileobject.h b/Include/fileobject.h
@@ -35,11 +35,11 @@ extern DL_IMPORT PyTypeObject PyFile_Type;
 #define PyFile_Check(op) ((op)->ob_type == &PyFile_Type)
 
 extern PyObject *PyFile_FromString Py_PROTO((char *, char *));
-extern void setfilebufsize Py_PROTO((PyObject *, int));
+extern void PyFile_SetBufSize Py_PROTO((PyObject *, int));
 extern PyObject *PyFile_FromFile
 	Py_PROTO((FILE *, char *, char *, int (*)Py_FPROTO((FILE *))));
 extern FILE *PyFile_AsFile Py_PROTO((PyObject *));
-extern PyObject *getfilename Py_PROTO((PyObject *));
+extern PyObject *PyFile_Name Py_PROTO((PyObject *));
 extern PyObject *PyFile_GetLine Py_PROTO((PyObject *, int));
 
 #ifdef __cplusplus
diff --git a/Include/frameobject.h b/Include/frameobject.h
@@ -72,7 +72,7 @@ PyFrameObject * PyFrame_New
 
 /* The rest of the interface is specific for frame objects */
 
-/* List access macros */
+/* Tuple access macros */
 
 #ifdef NDEBUG
 #define GETITEM(v, i) PyTuple_GET_ITEM((PyTupleObject *)(v), (i))
@@ -103,8 +103,8 @@ PyObject **PyFrame_ExtendStack Py_PROTO((PyFrameObject *, int, int));
 
 /* Conversions between "fast locals" and locals in dictionary */
 
-void locals_2_fast Py_PROTO((PyFrameObject *, int));
-void fast_2_locals Py_PROTO((PyFrameObject *));
+void PyFrame_LocalsToFast Py_PROTO((PyFrameObject *, int));
+void PyFrame_FastToLocals Py_PROTO((PyFrameObject *));
 
 #ifdef __cplusplus
 }
diff --git a/Include/funcobject.h b/Include/funcobject.h
@@ -47,8 +47,8 @@ extern DL_IMPORT PyTypeObject PyFunction_Type;
 extern PyObject *PyFunction_New Py_PROTO((PyObject *, PyObject *));
 extern PyObject *PyFunction_GetCode Py_PROTO((PyObject *));
 extern PyObject *PyFunction_GetGlobals Py_PROTO((PyObject *));
-extern PyObject *getfuncargstuff Py_PROTO((PyObject *, int *));
-extern int     setfuncargstuff Py_PROTO((PyObject *, int, PyObject *));
+extern PyObject *PyFunction_GetArgStuff Py_PROTO((PyObject *, int *));
+extern int PyFunction_SetArgStuff Py_PROTO((PyObject *, int, PyObject *));
 
 #ifdef __cplusplus
 }
diff --git a/Include/listobject.h b/Include/listobject.h
@@ -62,6 +62,7 @@ extern int PyList_Append Py_PROTO((PyObject *, PyObject *));
 extern PyObject *PyList_GetSlice Py_PROTO((PyObject *, int, int));
 extern int PyList_SetSlice Py_PROTO((PyObject *, int, int, PyObject *));
 extern int PyList_Sort Py_PROTO((PyObject *));
+extern int PyList_Reverse Py_PROTO((PyObject *));
 extern PyObject *listtuple Py_PROTO((PyObject *));
 
 /* Macro, trading safety for speed */
diff --git a/Include/longobject.h b/Include/longobject.h
@@ -41,8 +41,7 @@ extern PyObject *PyLong_FromDouble Py_PROTO((double));
 extern long PyLong_AsLong Py_PROTO((PyObject *));
 extern double PyLong_AsDouble Py_PROTO((PyObject *));
 
-PyObject *PyLong_FromString Py_PROTO((char *, int));
-PyObject *long_escan Py_PROTO((char *, char **, int));
+PyObject *PyLong_FromString Py_PROTO((char *, char **, int));
 
 #ifdef __cplusplus
 }
diff --git a/Include/mappingobject.h b/Include/mappingobject.h
@@ -28,11 +28,12 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
 
-/* Mapping object type -- mapping from hashable object to object */
+/* Dictionary object type -- mapping from hashable object to object */
+/* NB Should be moved back to dictobject.h */
 
-extern DL_IMPORT PyTypeObject Mappingtype;
+extern DL_IMPORT PyTypeObject PyDict_Type;
 
-#define is_mappingobject(op) ((op)->ob_type == &Mappingtype)
+#define PyDict_Check(op) ((op)->ob_type == &PyDict_Type)
 
 extern PyObject *PyDict_New Py_PROTO((void));
 extern PyObject *PyDict_GetItem Py_PROTO((PyObject *mp, PyObject *key));
@@ -44,7 +45,11 @@ extern int PyDict_Next
 extern PyObject *PyDict_Keys Py_PROTO((PyObject *mp));
 extern PyObject *PyDict_Values Py_PROTO((PyObject *mp));
 extern PyObject *PyDict_Items Py_PROTO((PyObject *mp));
-extern int getmappingsize Py_PROTO((PyObject *mp));
+extern int PyDict_Size Py_PROTO((PyObject *mp));
+
+extern PyObject *PyDict_GetItemString Py_PROTO((PyObject *dp, char *key));
+extern int PyDict_SetItemString Py_PROTO((PyObject *dp, char *key, PyObject *item));
+extern int PyDict_DelItemString Py_PROTO((PyObject *dp, char *key));
 
 #ifdef __cplusplus
 }
diff --git a/Include/marshal.h b/Include/marshal.h
@@ -31,11 +31,11 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* Interface for marshal.c */
 
 void PyMarshal_WriteLongToFile Py_PROTO((long, FILE *));
-void wr_short Py_PROTO((int, FILE *));
+void PyMarshal_WriteShortToFile Py_PROTO((int, FILE *));
 void PyMarshal_WriteObjectToFile Py_PROTO((PyObject *, FILE *));
 
 long PyMarshal_ReadLongFromFile Py_PROTO((FILE *));
-int rd_short Py_PROTO((FILE *));
+int PyMarshal_ReadShortFromFile Py_PROTO((FILE *));
 PyObject *PyMarshal_ReadObjectFromFile Py_PROTO((FILE *));
 PyObject *PyMarshal_ReadObjectFromString Py_PROTO((char *, int));
 
diff --git a/Include/object.h b/Include/object.h
@@ -244,10 +244,10 @@ extern DL_IMPORT PyTypeObject PyType_Type; /* The type of type objects */
 /* Generic operations on objects */
 extern int PyObject_Print Py_PROTO((PyObject *, FILE *, int));
 extern PyObject * PyObject_Repr Py_PROTO((PyObject *));
-extern PyObject * strobject Py_PROTO((PyObject *));
+extern PyObject * PyObject_Str Py_PROTO((PyObject *));
 extern int PyObject_Compare Py_PROTO((PyObject *, PyObject *));
 extern PyObject *PyObject_GetAttrString Py_PROTO((PyObject *, char *));
-extern int hasattr Py_PROTO((PyObject *, char *));
+extern int PyObject_HasAttrString Py_PROTO((PyObject *, char *));
 extern PyObject *PyObject_GetAttr Py_PROTO((PyObject *, PyObject *));
 extern int PyObject_SetAttr Py_PROTO((PyObject *, PyObject *, PyObject *));
 extern long PyObject_Hash Py_PROTO((PyObject *));
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
@@ -68,7 +68,7 @@ extern PyObject *PyErr_SetFromErrno Py_PROTO((PyObject *));
 
 extern void PyErr_BadInternalCall Py_PROTO((void));
 
-extern int sigcheck Py_PROTO((void)); /* In sigcheck.c or signalmodule.c */
+extern int PyErr_CheckSignals Py_PROTO((void)); /* In sigcheck.c or signalmodule.c */
 
 #ifdef __cplusplus
 }
diff --git a/Include/pythonrun.h b/Include/pythonrun.h
@@ -54,7 +54,7 @@ int Py_AtExit Py_PROTO((void (*func) Py_PROTO((void))));
 
 void Py_Exit Py_PROTO((int));
 
-void cleanup Py_PROTO((void));
+void Py_Cleanup Py_PROTO((void));
 
 #ifdef __cplusplus
 }
diff --git a/Include/rangeobject.h b/Include/rangeobject.h
@@ -25,17 +25,15 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* Range object interface */
 
 /*
-123456789-123456789-123456789-123456789-123456789-123456789-123456789-12
-
-rangeobject represents an integer range.  This is an immutable object;
+A range object represents an integer range.  This is an immutable object;
 a range cannot change its value after creation.
 
 Range objects behave like the corresponding tuple objects except that
 they are represented by a start, stop, and step datamembers.
 */
 
-extern DL_IMPORT PyTypeObject Rangetype;
+extern DL_IMPORT PyTypeObject PyRange_Type;
 
-#define is_rangeobject(op) ((op)->ob_type == &Rangetype)
+#define PyRange_Check(op) ((op)->ob_type == &PyRange_Type)
 
-extern PyObject *newrangeobject Py_PROTO((long, long, long, int));
+extern PyObject *PyRange_New Py_PROTO((long, long, long, int));
diff --git a/Include/rename2.h b/Include/rename2.h
diff --git a/Include/stringobject.h b/Include/stringobject.h
diff --git a/Include/tupleobject.h b/Include/tupleobject.h

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.`
`31`	`31`	`/* Built-in module interface */`
`32`	`32`
`33`	`33`	`extern PyObject *getbuiltindict Py_PROTO(());`
	`34`	`+extern PyObject *getbuiltinmod Py_PROTO(());`
`34`	`35`
`35`	`36`	`#ifdef __cplusplus`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ extern PyObject PyErr_SetFromErrno Py_PROTO((PyObject ));`
`68`	`68`
`69`	`69`	`extern void PyErr_BadInternalCall Py_PROTO((void));`
`70`	`70`
`71`		`-extern int sigcheck Py_PROTO((void)); /* In sigcheck.c or signalmodule.c */`
	`71`	`+extern int PyErr_CheckSignals Py_PROTO((void)); /* In sigcheck.c or signalmodule.c */`
`72`	`72`
`73`	`73`	`#ifdef __cplusplus`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,7 @@ extern PyObject *PyLong_FromDouble Py_PROTO((double));`
`41`	`41`	`extern long PyLong_AsLong Py_PROTO((PyObject *));`
`42`	`42`	`extern double PyLong_AsDouble Py_PROTO((PyObject *));`
`43`	`43`
`44`		`-PyObject PyLong_FromString Py_PROTO((char , int));`
`45`		`-PyObject long_escan Py_PROTO((char , char **, int));`
	`44`	`+PyObject PyLong_FromString Py_PROTO((char , char **, int));`
`46`	`45`
`47`	`46`	`#ifdef __cplusplus`
`48`	`47`	`}`