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

Make _kind types global for C++ compilation. 

Explicitly cast void* to int to cmpop_ty.
This commit is contained in:
Martin v. Löwis 2006-04-11 08:06:50 +00:00
parent 9b26122ec0
commit 01b810106c
3 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Include/Python-ast.h
View File

@ -35,9 +35,10 @@ typedef struct _keyword *keyword_ty;
typedef struct _alias *alias_ty; typedef struct _alias *alias_ty;
enum _mod_kind {Module_kind=1, Interactive_kind=2, Expression_kind=3,
Suite_kind=4};
struct _mod { struct _mod {
enum { Module_kind=1, Interactive_kind=2, Expression_kind=3, enum _mod_kind kind;
Suite_kind=4 } kind;
union { union {
struct { struct {
asdl_seq *body; asdl_seq *body;
@ -58,14 +59,15 @@ struct _mod {
} v; } v;
}; };
struct _stmt { enum _stmt_kind {FunctionDef_kind=1, ClassDef_kind=2, Return_kind=3,
enum { FunctionDef_kind=1, ClassDef_kind=2, Return_kind=3,
Delete_kind=4, Assign_kind=5, AugAssign_kind=6, Print_kind=7, Delete_kind=4, Assign_kind=5, AugAssign_kind=6, Print_kind=7,
For_kind=8, While_kind=9, If_kind=10, With_kind=11, For_kind=8, While_kind=9, If_kind=10, With_kind=11,
Raise_kind=12, TryExcept_kind=13, TryFinally_kind=14, Raise_kind=12, TryExcept_kind=13, TryFinally_kind=14,
Assert_kind=15, Import_kind=16, ImportFrom_kind=17, Assert_kind=15, Import_kind=16, ImportFrom_kind=17,
Exec_kind=18, Global_kind=19, Expr_kind=20, Pass_kind=21, Exec_kind=18, Global_kind=19, Expr_kind=20, Pass_kind=21,
Break_kind=22, Continue_kind=23 } kind; Break_kind=22, Continue_kind=23};
struct _stmt {
enum _stmt_kind kind;
union { union {
struct { struct {
identifier name; identifier name;
@ -181,12 +183,14 @@ struct _stmt {
int col_offset; int col_offset;
}; };
enum _expr_kind {BoolOp_kind=1, BinOp_kind=2, UnaryOp_kind=3, Lambda_kind=4,
IfExp_kind=5, Dict_kind=6, ListComp_kind=7,
GeneratorExp_kind=8, Yield_kind=9, Compare_kind=10,
Call_kind=11, Repr_kind=12, Num_kind=13, Str_kind=14,
Attribute_kind=15, Subscript_kind=16, Name_kind=17,
List_kind=18, Tuple_kind=19};
struct _expr { struct _expr {
enum { BoolOp_kind=1, BinOp_kind=2, UnaryOp_kind=3, Lambda_kind=4, enum _expr_kind kind;
IfExp_kind=5, Dict_kind=6, ListComp_kind=7, GeneratorExp_kind=8,
Yield_kind=9, Compare_kind=10, Call_kind=11, Repr_kind=12,
Num_kind=13, Str_kind=14, Attribute_kind=15, Subscript_kind=16,
Name_kind=17, List_kind=18, Tuple_kind=19 } kind;
union { union {
struct { struct {
boolop_ty op; boolop_ty op;
@ -292,9 +296,9 @@ struct _expr {
int col_offset; int col_offset;
}; };
enum _slice_kind {Ellipsis_kind=1, Slice_kind=2, ExtSlice_kind=3, Index_kind=4};
struct _slice { struct _slice {
enum { Ellipsis_kind=1, Slice_kind=2, ExtSlice_kind=3, Index_kind=4 } enum _slice_kind kind;
kind;
union { union {
struct { struct {
expr_ty lower; expr_ty lower;

8
Parser/asdl_c.py
View File

@ -155,8 +155,10 @@ class StructVisitor(EmitVisitor):
type = sum.types[i] type = sum.types[i]
enum.append("%s_kind=%d" % (type.name, i + 1)) enum.append("%s_kind=%d" % (type.name, i + 1))
emit("enum _%(name)s_kind {" + ", ".join(enum) + "};")
emit("struct _%(name)s {") emit("struct _%(name)s {")
emit("enum { " + ", ".join(enum) + " } kind;", depth + 1) emit("enum _%(name)s_kind kind;", depth + 1)
emit("union {", depth + 1) emit("union {", depth + 1)
for t in sum.types: for t in sum.types:
self.visit(t, depth + 2) self.visit(t, depth + 2)
@ -679,8 +681,8 @@ class ObjVisitor(PickleVisitor):
self.emit("if (!value) goto failed;", depth+1) self.emit("if (!value) goto failed;", depth+1)
self.emit("for(i = 0; i < n; i++)", depth+1) self.emit("for(i = 0; i < n; i++)", depth+1)
# This cannot fail, so no need for error handling # This cannot fail, so no need for error handling
self.emit("PyList_SET_ITEM(value, i, ast2obj_%s((%s_ty)asdl_seq_GET(%s, i)));" % self.emit("PyList_SET_ITEM(value, i, ast2obj_cmpop((cmpop_ty)(int)asdl_seq_GET(%s, i)));" % value,
(field.type, field.type, value), depth+2, reflow=False) depth+2, reflow=False)
self.emit("}", depth) self.emit("}", depth)
else: else:
self.emit("value = ast2obj_list(%s, ast2obj_%s);" % (value, field.type), depth) self.emit("value = ast2obj_list(%s, ast2obj_%s);" % (value, field.type), depth)

2
Python/Python-ast.c
View File

@ -2505,7 +2505,7 @@ ast2obj_expr(void* _o)
value = PyList_New(n); value = PyList_New(n);
if (!value) goto failed; if (!value) goto failed;
for(i = 0; i < n; i++) for(i = 0; i < n; i++)
PyList_SET_ITEM(value, i, ast2obj_cmpop((cmpop_ty)asdl_seq_GET(o->v.Compare.ops, i))); PyList_SET_ITEM(value, i, ast2obj_cmpop((cmpop_ty)(int)asdl_seq_GET(o->v.Compare.ops, i)));
} }
if (!value) goto failed; if (!value) goto failed;
if (PyObject_SetAttrString(result, "ops", value) == -1) if (PyObject_SetAttrString(result, "ops", value) == -1)