comparison Include/pythonrun.h @ 61467:f197407bdba2 3.1

Recorded merge of revisions 81032 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r81032 | antoine.pitrou | 2010-05-09 17:52:27 +0200 (dim., 09 mai 2010) | 9 lines Recorded merge of revisions 81029 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines Untabify C files. Will watch buildbots. ........ ................
author Antoine Pitrou <solipsis@pitrou.net>
date Sun, 09 May 2010 16:14:21 +0000
parents 65e41bcbc25d
children f57c94073b35 3c9232a684ae
comparison
equal deleted inserted replaced
61459:f8c19c5f5dd2 61467:f197407bdba2
15 #define PyCF_DONT_IMPLY_DEDENT 0x0200 15 #define PyCF_DONT_IMPLY_DEDENT 0x0200
16 #define PyCF_ONLY_AST 0x0400 16 #define PyCF_ONLY_AST 0x0400
17 #define PyCF_IGNORE_COOKIE 0x0800 17 #define PyCF_IGNORE_COOKIE 0x0800
18 18
19 typedef struct { 19 typedef struct {
20 int cf_flags; /* bitmask of CO_xxx flags relevant to future */ 20 int cf_flags; /* bitmask of CO_xxx flags relevant to future */
21 } PyCompilerFlags; 21 } PyCompilerFlags;
22 22
23 PyAPI_FUNC(void) Py_SetProgramName(wchar_t *); 23 PyAPI_FUNC(void) Py_SetProgramName(wchar_t *);
24 PyAPI_FUNC(wchar_t *) Py_GetProgramName(void); 24 PyAPI_FUNC(wchar_t *) Py_GetProgramName(void);
25 25
38 PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *); 38 PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *);
39 PyAPI_FUNC(int) PyRun_SimpleFileExFlags(FILE *, const char *, int, PyCompilerFlags *); 39 PyAPI_FUNC(int) PyRun_SimpleFileExFlags(FILE *, const char *, int, PyCompilerFlags *);
40 PyAPI_FUNC(int) PyRun_InteractiveOneFlags(FILE *, const char *, PyCompilerFlags *); 40 PyAPI_FUNC(int) PyRun_InteractiveOneFlags(FILE *, const char *, PyCompilerFlags *);
41 PyAPI_FUNC(int) PyRun_InteractiveLoopFlags(FILE *, const char *, PyCompilerFlags *); 41 PyAPI_FUNC(int) PyRun_InteractiveLoopFlags(FILE *, const char *, PyCompilerFlags *);
42 42
43 PyAPI_FUNC(struct _mod *) PyParser_ASTFromString(const char *, const char *, 43 PyAPI_FUNC(struct _mod *) PyParser_ASTFromString(const char *, const char *,
44 int, PyCompilerFlags *flags, 44 int, PyCompilerFlags *flags,
45 PyArena *); 45 PyArena *);
46 PyAPI_FUNC(struct _mod *) PyParser_ASTFromFile(FILE *, const char *, 46 PyAPI_FUNC(struct _mod *) PyParser_ASTFromFile(FILE *, const char *,
47 const char*, int, 47 const char*, int,
48 char *, char *, 48 char *, char *,
49 PyCompilerFlags *, int *, 49 PyCompilerFlags *, int *,
50 PyArena *); 50 PyArena *);
51 #define PyParser_SimpleParseString(S, B) \ 51 #define PyParser_SimpleParseString(S, B) \
52 PyParser_SimpleParseStringFlags(S, B, 0) 52 PyParser_SimpleParseStringFlags(S, B, 0)
53 #define PyParser_SimpleParseFile(FP, S, B) \ 53 #define PyParser_SimpleParseFile(FP, S, B) \
54 PyParser_SimpleParseFileFlags(FP, S, B, 0) 54 PyParser_SimpleParseFileFlags(FP, S, B, 0)
55 PyAPI_FUNC(struct _node *) PyParser_SimpleParseStringFlags(const char *, int, 55 PyAPI_FUNC(struct _node *) PyParser_SimpleParseStringFlags(const char *, int,
56 int); 56 int);
57 PyAPI_FUNC(struct _node *) PyParser_SimpleParseFileFlags(FILE *, const char *, 57 PyAPI_FUNC(struct _node *) PyParser_SimpleParseFileFlags(FILE *, const char *,
58 int, int); 58 int, int);
59 59
60 PyAPI_FUNC(PyObject *) PyRun_StringFlags(const char *, int, PyObject *, 60 PyAPI_FUNC(PyObject *) PyRun_StringFlags(const char *, int, PyObject *,
61 PyObject *, PyCompilerFlags *); 61 PyObject *, PyCompilerFlags *);
62 62
63 PyAPI_FUNC(PyObject *) PyRun_FileExFlags(FILE *, const char *, int, 63 PyAPI_FUNC(PyObject *) PyRun_FileExFlags(FILE *, const char *, int,
64 PyObject *, PyObject *, int, 64 PyObject *, PyObject *, int,
65 PyCompilerFlags *); 65 PyCompilerFlags *);
66 66
67 #define Py_CompileString(str, p, s) Py_CompileStringFlags(str, p, s, NULL) 67 #define Py_CompileString(str, p, s) Py_CompileStringFlags(str, p, s, NULL)
68 PyAPI_FUNC(PyObject *) Py_CompileStringFlags(const char *, const char *, int, 68 PyAPI_FUNC(PyObject *) Py_CompileStringFlags(const char *, const char *, int,
69 PyCompilerFlags *); 69 PyCompilerFlags *);
70 PyAPI_FUNC(struct symtable *) Py_SymtableString(const char *, const char *, int); 70 PyAPI_FUNC(struct symtable *) Py_SymtableString(const char *, const char *, int);
71 71
72 PyAPI_FUNC(void) PyErr_Print(void); 72 PyAPI_FUNC(void) PyErr_Print(void);
73 PyAPI_FUNC(void) PyErr_PrintEx(int); 73 PyAPI_FUNC(void) PyErr_PrintEx(int);
74 PyAPI_FUNC(void) PyErr_Display(PyObject *, PyObject *, PyObject *); 74 PyAPI_FUNC(void) PyErr_Display(PyObject *, PyObject *, PyObject *);
88 88
89 /* Use macros for a bunch of old variants */ 89 /* Use macros for a bunch of old variants */
90 #define PyRun_String(str, s, g, l) PyRun_StringFlags(str, s, g, l, NULL) 90 #define PyRun_String(str, s, g, l) PyRun_StringFlags(str, s, g, l, NULL)
91 #define PyRun_AnyFile(fp, name) PyRun_AnyFileExFlags(fp, name, 0, NULL) 91 #define PyRun_AnyFile(fp, name) PyRun_AnyFileExFlags(fp, name, 0, NULL)
92 #define PyRun_AnyFileEx(fp, name, closeit) \ 92 #define PyRun_AnyFileEx(fp, name, closeit) \
93 PyRun_AnyFileExFlags(fp, name, closeit, NULL) 93 PyRun_AnyFileExFlags(fp, name, closeit, NULL)
94 #define PyRun_AnyFileFlags(fp, name, flags) \ 94 #define PyRun_AnyFileFlags(fp, name, flags) \
95 PyRun_AnyFileExFlags(fp, name, 0, flags) 95 PyRun_AnyFileExFlags(fp, name, 0, flags)
96 #define PyRun_SimpleString(s) PyRun_SimpleStringFlags(s, NULL) 96 #define PyRun_SimpleString(s) PyRun_SimpleStringFlags(s, NULL)
97 #define PyRun_SimpleFile(f, p) PyRun_SimpleFileExFlags(f, p, 0, NULL) 97 #define PyRun_SimpleFile(f, p) PyRun_SimpleFileExFlags(f, p, 0, NULL)
98 #define PyRun_SimpleFileEx(f, p, c) PyRun_SimpleFileExFlags(f, p, c, NULL) 98 #define PyRun_SimpleFileEx(f, p, c) PyRun_SimpleFileExFlags(f, p, c, NULL)
99 #define PyRun_InteractiveOne(f, p) PyRun_InteractiveOneFlags(f, p, NULL) 99 #define PyRun_InteractiveOne(f, p) PyRun_InteractiveOneFlags(f, p, NULL)
100 #define PyRun_InteractiveLoop(f, p) PyRun_InteractiveLoopFlags(f, p, NULL) 100 #define PyRun_InteractiveLoop(f, p) PyRun_InteractiveLoopFlags(f, p, NULL)
101 #define PyRun_File(fp, p, s, g, l) \ 101 #define PyRun_File(fp, p, s, g, l) \
102 PyRun_FileExFlags(fp, p, s, g, l, 0, NULL) 102 PyRun_FileExFlags(fp, p, s, g, l, 0, NULL)
103 #define PyRun_FileEx(fp, p, s, g, l, c) \ 103 #define PyRun_FileEx(fp, p, s, g, l, c) \
104 PyRun_FileExFlags(fp, p, s, g, l, c, NULL) 104 PyRun_FileExFlags(fp, p, s, g, l, c, NULL)
105 #define PyRun_FileFlags(fp, p, s, g, l, flags) \ 105 #define PyRun_FileFlags(fp, p, s, g, l, flags) \
106 PyRun_FileExFlags(fp, p, s, g, l, 0, flags) 106 PyRun_FileExFlags(fp, p, s, g, l, 0, flags)
107 107
108 /* In getpath.c */ 108 /* In getpath.c */
109 PyAPI_FUNC(wchar_t *) Py_GetProgramFullPath(void); 109 PyAPI_FUNC(wchar_t *) Py_GetProgramFullPath(void);
110 PyAPI_FUNC(wchar_t *) Py_GetPrefix(void); 110 PyAPI_FUNC(wchar_t *) Py_GetPrefix(void);
111 PyAPI_FUNC(wchar_t *) Py_GetExecPrefix(void); 111 PyAPI_FUNC(wchar_t *) Py_GetExecPrefix(void);