traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not pollute name block_ty, prefix with _Py_

This commit is contained in:
Neal Norwitz 2005-10-24 00:30:44 +00:00
parent 6ab080cd40
commit 62c2fac9a0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Include/symtable.h
View File

@ -5,7 +5,7 @@ extern "C" {
#endif #endif
typedef enum _block_type { FunctionBlock, ClassBlock, ModuleBlock } typedef enum _block_type { FunctionBlock, ClassBlock, ModuleBlock }
block_ty; _Py_block_ty;
struct _symtable_entry; struct _symtable_entry;
@ -29,7 +29,7 @@ typedef struct _symtable_entry {
PyObject *ste_name; /* string: name of block */ PyObject *ste_name; /* string: name of block */
PyObject *ste_varnames; /* list of variable names */ PyObject *ste_varnames; /* list of variable names */
PyObject *ste_children; /* list of child ids */ PyObject *ste_children; /* list of child ids */
block_ty ste_type; /* module, class, or function */ _Py_block_ty ste_type; /* module, class, or function */
int ste_unoptimized; /* false if namespace is optimized */ int ste_unoptimized; /* false if namespace is optimized */
int ste_nested : 1; /* true if block is nested */ int ste_nested : 1; /* true if block is nested */
int ste_free : 1; /* true if block has free variables */ int ste_free : 1; /* true if block has free variables */
@ -49,7 +49,7 @@ PyAPI_DATA(PyTypeObject) PySTEntry_Type;
#define PySTEntry_Check(op) ((op)->ob_type == &PySTEntry_Type) #define PySTEntry_Check(op) ((op)->ob_type == &PySTEntry_Type)
PyAPI_FUNC(PySTEntryObject *) \ PyAPI_FUNC(PySTEntryObject *) \
PySTEntry_New(struct symtable *, identifier, block_ty, void *, int); PySTEntry_New(struct symtable *, identifier, _Py_block_ty, void *, int);
PyAPI_FUNC(int) PyST_GetScope(PySTEntryObject *, PyObject *); PyAPI_FUNC(int) PyST_GetScope(PySTEntryObject *, PyObject *);
PyAPI_FUNC(struct symtable *) PySymtable_Build(mod_ty, const char *, PyAPI_FUNC(struct symtable *) PySymtable_Build(mod_ty, const char *,

6
Python/symtable.c
View File

@ -12,7 +12,7 @@
"name '%.400s' is used prior to global declaration" "name '%.400s' is used prior to global declaration"
PySTEntryObject * PySTEntryObject *
PySTEntry_New(struct symtable *st, identifier name, block_ty block, PySTEntry_New(struct symtable *st, identifier name, _Py_block_ty block,
void *key, int lineno) void *key, int lineno)
{ {
PySTEntryObject *ste = NULL; PySTEntryObject *ste = NULL;
@ -153,7 +153,7 @@ PyTypeObject PySTEntry_Type = {
static int symtable_analyze(struct symtable *st); static int symtable_analyze(struct symtable *st);
static int symtable_warn(struct symtable *st, char *msg); static int symtable_warn(struct symtable *st, char *msg);
static int symtable_enter_block(struct symtable *st, identifier name, static int symtable_enter_block(struct symtable *st, identifier name,
block_ty block, void *ast, int lineno); _Py_block_ty block, void *ast, int lineno);
static int symtable_exit_block(struct symtable *st, void *ast); static int symtable_exit_block(struct symtable *st, void *ast);
static int symtable_visit_stmt(struct symtable *st, stmt_ty s); static int symtable_visit_stmt(struct symtable *st, stmt_ty s);
static int symtable_visit_expr(struct symtable *st, expr_ty s); static int symtable_visit_expr(struct symtable *st, expr_ty s);
@ -711,7 +711,7 @@ symtable_exit_block(struct symtable *st, void *ast)
} }
static int static int
symtable_enter_block(struct symtable *st, identifier name, block_ty block, symtable_enter_block(struct symtable *st, identifier name, _Py_block_ty block,
void *ast, int lineno) void *ast, int lineno)
{ {
PySTEntryObject *prev = NULL; PySTEntryObject *prev = NULL;