diff options
| author | Skip Montanaro <skip@pobox.com> | 2006-04-13 09:37:01 (GMT) |
|---|---|---|
| committer | Skip Montanaro <skip@pobox.com> | 2006-04-13 09:37:01 (GMT) |
| commit | b9406711864885c8434c9ba41da90f7ea1e18a47 (patch) | |
| tree | e69b327ed5e617041beff1fdfae844d7d994526b | |
| parent | 83687c98dcb1deb6c0e7091e2f9df7dbeae56910 (diff) | |
| download | cpython-b9406711864885c8434c9ba41da90f7ea1e18a47.zip cpython-b9406711864885c8434c9ba41da90f7ea1e18a47.tar.gz cpython-b9406711864885c8434c9ba41da90f7ea1e18a47.tar.bz2 | |
Use union to discriminate pointer types from enum/int types.
| -rw-r--r-- | Include/asdl.h | 10 | ||||
| -rw-r--r-- | Python/compile.c | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/Include/asdl.h b/Include/asdl.h index d709d42..6a9adea 100644 --- a/Include/asdl.h +++ b/Include/asdl.h @@ -19,18 +19,22 @@ typedef enum {false, true} bool; typedef struct { int size; - void *elements[1]; + union { + void *elements[1]; + unsigned int enum_type[1]; + } elt; } asdl_seq; asdl_seq *asdl_seq_new(int size, PyArena *arena); -#define asdl_seq_GET(S, I) (S)->elements[(I)] +#define asdl_seq_GET(S, I) (S)->elt.elements[(I)] +#define asdl_seq_GET_ENUM(S, I) (S)->elt.enum_type[(I)] #define asdl_seq_LEN(S) ((S) == NULL ? 0 : (S)->size) #ifdef Py_DEBUG #define asdl_seq_SET(S, I, V) { \ int _asdl_i = (I); \ assert((S) && _asdl_i < (S)->size); \ - (S)->elements[_asdl_i] = (V); \ + (S)->elt.elements[_asdl_i] = (V); \ } #else #define asdl_seq_SET(S, I, V) (S)->elements[I] = (V) diff --git a/Python/compile.c b/Python/compile.c index 1bbe73a..0fc0200 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -3066,10 +3066,8 @@ compiler_compare(struct compiler *c, expr_ty e) for (i = 1; i < n; i++) { ADDOP(c, DUP_TOP); ADDOP(c, ROT_THREE); - /* XXX We're casting a void* to cmpop_ty in the next stmt. */ ADDOP_I(c, COMPARE_OP, - cmpop((cmpop_ty)( CMPCAST asdl_seq_GET( - e->v.Compare.ops, i - 1)))); + cmpop((cmpop_ty)asdl_seq_GET_ENUM(e->v.Compare.ops, i - 1))); ADDOP_JREL(c, JUMP_IF_FALSE, cleanup); NEXT_BLOCK(c); ADDOP(c, POP_TOP); @@ -3080,8 +3078,7 @@ compiler_compare(struct compiler *c, expr_ty e) VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Compare.comparators, n - 1)); ADDOP_I(c, COMPARE_OP, /* XXX We're casting a void* to cmpop_ty in the next stmt. */ - cmpop((cmpop_ty)( CMPCAST asdl_seq_GET(e->v.Compare.ops, - n - 1)))); + cmpop((cmpop_ty)asdl_seq_GET_ENUM(e->v.Compare.ops, n - 1))); if (n > 1) { basicblock *end = compiler_new_block(c); if (end == NULL) |