[Python-checkins] python/dist/src/Include compile.h,2.38,2.39 parsetok.h,2.19,2.20 pyerrors.h,2.63,2.64 pythonrun.h,2.55,2.56 symtable.h,2.10,2.11
loewis@users.sourceforge.net
loewis@users.sourceforge.net
2002年12月11日 06:05:00 -0800
Update of /cvsroot/python/python/dist/src/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv15966/Include
Modified Files:
compile.h parsetok.h pyerrors.h pythonrun.h symtable.h
Log Message:
Constify filenames and scripts. Fixes #651362.
Index: compile.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/compile.h,v
retrieving revision 2.38
retrieving revision 2.39
diff -C2 -d -r2.38 -r2.39
*** compile.h 12 Aug 2002 07:21:56 -0000 2.38
--- compile.h 11 Dec 2002 14:04:57 -0000 2.39
***************
*** 53,57 ****
/* Public interface */
struct _node; /* Declare the existence of this type */
! PyAPI_FUNC(PyCodeObject *) PyNode_Compile(struct _node *, char *);
PyAPI_FUNC(PyCodeObject *) PyCode_New(
int, int, int, int, PyObject *, PyObject *, PyObject *, PyObject *,
--- 53,57 ----
/* Public interface */
struct _node; /* Declare the existence of this type */
! PyAPI_FUNC(PyCodeObject *) PyNode_Compile(struct _node *, const char *);
PyAPI_FUNC(PyCodeObject *) PyCode_New(
int, int, int, int, PyObject *, PyObject *, PyObject *, PyObject *,
***************
*** 68,73 ****
} PyFutureFeatures;
! PyAPI_FUNC(PyFutureFeatures *) PyNode_Future(struct _node *, char *);
! PyAPI_FUNC(PyCodeObject *) PyNode_CompileFlags(struct _node *, char *,
PyCompilerFlags *);
--- 68,73 ----
} PyFutureFeatures;
! PyAPI_FUNC(PyFutureFeatures *) PyNode_Future(struct _node *, const char *);
! PyAPI_FUNC(PyCodeObject *) PyNode_CompileFlags(struct _node *, const char *,
PyCompilerFlags *);
Index: parsetok.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/parsetok.h,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -d -r2.19 -r2.20
*** parsetok.h 12 Aug 2002 07:21:57 -0000 2.19
--- parsetok.h 11 Dec 2002 14:04:57 -0000 2.20
***************
*** 10,14 ****
typedef struct {
int error;
! char *filename;
int lineno;
int offset;
--- 10,14 ----
typedef struct {
int error;
! const char *filename;
int lineno;
int offset;
***************
*** 22,38 ****
#endif
! PyAPI_FUNC(node *) PyParser_ParseString(char *, grammar *, int,
perrdetail *);
! PyAPI_FUNC(node *) PyParser_ParseFile (FILE *, char *, grammar *, int,
char *, char *, perrdetail *);
! PyAPI_FUNC(node *) PyParser_ParseStringFlags(char *, grammar *, int,
perrdetail *, int);
! PyAPI_FUNC(node *) PyParser_ParseFileFlags(FILE *, char *, grammar *,
int, char *, char *,
perrdetail *, int);
! PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilename(char *,
! char *,
grammar *, int,
perrdetail *, int);
--- 22,38 ----
#endif
! PyAPI_FUNC(node *) PyParser_ParseString(const char *, grammar *, int,
perrdetail *);
! PyAPI_FUNC(node *) PyParser_ParseFile (FILE *, const char *, grammar *, int,
char *, char *, perrdetail *);
! PyAPI_FUNC(node *) PyParser_ParseStringFlags(const char *, grammar *, int,
perrdetail *, int);
! PyAPI_FUNC(node *) PyParser_ParseFileFlags(FILE *, const char *, grammar *,
int, char *, char *,
perrdetail *, int);
! PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilename(const char *,
! const char *,
grammar *, int,
perrdetail *, int);
Index: pyerrors.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pyerrors.h,v
retrieving revision 2.63
retrieving revision 2.64
diff -C2 -d -r2.63 -r2.64
*** pyerrors.h 6 Dec 2002 12:48:44 -0000 2.63
--- pyerrors.h 11 Dec 2002 14:04:57 -0000 2.64
***************
*** 131,136 ****
/* Issue a warning or exception */
PyAPI_FUNC(int) PyErr_Warn(PyObject *, char *);
! PyAPI_FUNC(int) PyErr_WarnExplicit(PyObject *, char *,
! char *, int, char *, PyObject *);
/* In sigcheck.c or signalmodule.c */
--- 131,137 ----
/* Issue a warning or exception */
PyAPI_FUNC(int) PyErr_Warn(PyObject *, char *);
! PyAPI_FUNC(int) PyErr_WarnExplicit(PyObject *, const char *,
! const char *, int,
! const char *, PyObject *);
/* In sigcheck.c or signalmodule.c */
***************
*** 139,144 ****
/* Support for adding program text to SyntaxErrors */
! PyAPI_FUNC(void) PyErr_SyntaxLocation(char *, int);
! PyAPI_FUNC(PyObject *) PyErr_ProgramText(char *, int);
#ifdef Py_USING_UNICODE
--- 140,145 ----
/* Support for adding program text to SyntaxErrors */
! PyAPI_FUNC(void) PyErr_SyntaxLocation(const char *, int);
! PyAPI_FUNC(PyObject *) PyErr_ProgramText(const char *, int);
#ifdef Py_USING_UNICODE
Index: pythonrun.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pythonrun.h,v
retrieving revision 2.55
retrieving revision 2.56
diff -C2 -d -r2.55 -r2.56
*** pythonrun.h 26 Oct 2002 14:39:09 -0000 2.55
--- pythonrun.h 11 Dec 2002 14:04:58 -0000 2.56
***************
*** 27,71 ****
PyAPI_FUNC(void) Py_EndInterpreter(PyThreadState *);
! PyAPI_FUNC(int) PyRun_AnyFile(FILE *, char *);
! PyAPI_FUNC(int) PyRun_AnyFileEx(FILE *, char *, int);
! PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, char *, PyCompilerFlags *);
! PyAPI_FUNC(int) PyRun_AnyFileExFlags(FILE *, char *, int, PyCompilerFlags *);
! PyAPI_FUNC(int) PyRun_SimpleString(char *);
! PyAPI_FUNC(int) PyRun_SimpleStringFlags(char *, PyCompilerFlags *);
! PyAPI_FUNC(int) PyRun_SimpleFile(FILE *, char *);
! PyAPI_FUNC(int) PyRun_SimpleFileEx(FILE *, char *, int);
! PyAPI_FUNC(int) PyRun_SimpleFileExFlags(FILE *, char *, int, PyCompilerFlags *);
! PyAPI_FUNC(int) PyRun_InteractiveOne(FILE *, char *);
! PyAPI_FUNC(int) PyRun_InteractiveOneFlags(FILE *, char *, PyCompilerFlags *);
! PyAPI_FUNC(int) PyRun_InteractiveLoop(FILE *, char *);
! PyAPI_FUNC(int) PyRun_InteractiveLoopFlags(FILE *, char *, PyCompilerFlags *);
! PyAPI_FUNC(struct _node *) PyParser_SimpleParseString(char *, int);
! PyAPI_FUNC(struct _node *) PyParser_SimpleParseFile(FILE *, char *, int);
! PyAPI_FUNC(struct _node *) PyParser_SimpleParseStringFlags(char *, int, int);
! PyAPI_FUNC(struct _node *) PyParser_SimpleParseStringFlagsFilename(char *,
! char *,
int,
int);
! PyAPI_FUNC(struct _node *) PyParser_SimpleParseFileFlags(FILE *, char *,
int, int);
! PyAPI_FUNC(PyObject *) PyRun_String(char *, int, PyObject *, PyObject *);
! PyAPI_FUNC(PyObject *) PyRun_File(FILE *, char *, int, PyObject *, PyObject *);
! PyAPI_FUNC(PyObject *) PyRun_FileEx(FILE *, char *, int,
PyObject *, PyObject *, int);
! PyAPI_FUNC(PyObject *) PyRun_StringFlags(char *, int, PyObject *, PyObject *,
PyCompilerFlags *);
! PyAPI_FUNC(PyObject *) PyRun_FileFlags(FILE *, char *, int, PyObject *,
PyObject *, PyCompilerFlags *);
! PyAPI_FUNC(PyObject *) PyRun_FileExFlags(FILE *, char *, int, PyObject *,
PyObject *, int, PyCompilerFlags *);
! PyAPI_FUNC(PyObject *) Py_CompileString(char *, char *, int);
! PyAPI_FUNC(PyObject *) Py_CompileStringFlags(char *, char *, int,
PyCompilerFlags *);
! PyAPI_FUNC(struct symtable *) Py_SymtableString(char *, char *, int);
PyAPI_FUNC(void) PyErr_Print(void);
--- 27,71 ----
PyAPI_FUNC(void) Py_EndInterpreter(PyThreadState *);
! PyAPI_FUNC(int) PyRun_AnyFile(FILE *, const char *);
! PyAPI_FUNC(int) PyRun_AnyFileEx(FILE *, const char *, int);
! PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *);
! PyAPI_FUNC(int) PyRun_AnyFileExFlags(FILE *, const char *, int, PyCompilerFlags *);
! PyAPI_FUNC(int) PyRun_SimpleString(const char *);
! PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *);
! PyAPI_FUNC(int) PyRun_SimpleFile(FILE *, const char *);
! PyAPI_FUNC(int) PyRun_SimpleFileEx(FILE *, const char *, int);
! PyAPI_FUNC(int) PyRun_SimpleFileExFlags(FILE *, const char *, int, PyCompilerFlags *);
! PyAPI_FUNC(int) PyRun_InteractiveOne(FILE *, const char *);
! PyAPI_FUNC(int) PyRun_InteractiveOneFlags(FILE *, const char *, PyCompilerFlags *);
! PyAPI_FUNC(int) PyRun_InteractiveLoop(FILE *, const char *);
! PyAPI_FUNC(int) PyRun_InteractiveLoopFlags(FILE *, const char *, PyCompilerFlags *);
! PyAPI_FUNC(struct _node *) PyParser_SimpleParseString(const char *, int);
! PyAPI_FUNC(struct _node *) PyParser_SimpleParseFile(FILE *, const char *, int);
! PyAPI_FUNC(struct _node *) PyParser_SimpleParseStringFlags(const char *, int, int);
! PyAPI_FUNC(struct _node *) PyParser_SimpleParseStringFlagsFilename(const char *,
! const char *,
int,
int);
! PyAPI_FUNC(struct _node *) PyParser_SimpleParseFileFlags(FILE *, const char *,
int, int);
! PyAPI_FUNC(PyObject *) PyRun_String(const char *, int, PyObject *, PyObject *);
! PyAPI_FUNC(PyObject *) PyRun_File(FILE *, const char *, int, PyObject *, PyObject *);
! PyAPI_FUNC(PyObject *) PyRun_FileEx(FILE *, const char *, int,
PyObject *, PyObject *, int);
! PyAPI_FUNC(PyObject *) PyRun_StringFlags(const char *, int, PyObject *, PyObject *,
PyCompilerFlags *);
! PyAPI_FUNC(PyObject *) PyRun_FileFlags(FILE *, const char *, int, PyObject *,
PyObject *, PyCompilerFlags *);
! PyAPI_FUNC(PyObject *) PyRun_FileExFlags(FILE *, const char *, int, PyObject *,
PyObject *, int, PyCompilerFlags *);
! PyAPI_FUNC(PyObject *) Py_CompileString(const char *, const char *, int);
! PyAPI_FUNC(PyObject *) Py_CompileStringFlags(const char *, const char *, int,
PyCompilerFlags *);
! PyAPI_FUNC(struct symtable *) Py_SymtableString(const char *, const char *, int);
PyAPI_FUNC(void) PyErr_Print(void);
***************
*** 77,81 ****
PyAPI_FUNC(void) Py_Exit(int);
! PyAPI_FUNC(int) Py_FdIsInteractive(FILE *, char *);
/* Bootstrap */
--- 77,81 ----
PyAPI_FUNC(void) Py_Exit(int);
! PyAPI_FUNC(int) Py_FdIsInteractive(FILE *, const char *);
/* Bootstrap */
Index: symtable.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/symtable.h,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -d -r2.10 -r2.11
*** symtable.h 12 Aug 2002 07:21:57 -0000 2.10
--- symtable.h 11 Dec 2002 14:04:58 -0000 2.11
***************
*** 21,25 ****
struct symtable {
int st_pass; /* pass == 1 or 2 */
! char *st_filename; /* name of file being compiled */
struct _symtable_entry *st_cur; /* current symbol table entry */
PyObject *st_symbols; /* dictionary of symbol table entries */
--- 21,25 ----
struct symtable {
int st_pass; /* pass == 1 or 2 */
! const char *st_filename; /* name of file being compiled */
struct _symtable_entry *st_cur; /* current symbol table entry */
PyObject *st_symbols; /* dictionary of symbol table entries */
***************
*** 58,62 ****
char *, int, int);
! PyAPI_FUNC(struct symtable *) PyNode_CompileSymtable(struct _node *, char *);
PyAPI_FUNC(void) PySymtable_Free(struct symtable *);
--- 58,62 ----
char *, int, int);
! PyAPI_FUNC(struct symtable *) PyNode_CompileSymtable(struct _node *, const char *);
PyAPI_FUNC(void) PySymtable_Free(struct symtable *);