summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Include/Python-ast.h4
-rw-r--r--Include/asdl.h6
-rwxr-xr-xParser/asdl_c.py12
-rw-r--r--Python/Python-ast.c6
-rw-r--r--Python/asdl.c19
-rw-r--r--Python/ast.c8
-rw-r--r--Python/compile.c12
7 files changed, 44 insertions, 23 deletions
diff --git a/Include/Python-ast.h b/Include/Python-ast.h
index 4b7731a..3e21030 100644
--- a/Include/Python-ast.h
+++ b/Include/Python-ast.h
@@ -240,7 +240,7 @@ struct _expr {
struct {
expr_ty left;
- asdl_seq *ops;
+ asdl_int_seq *ops;
asdl_seq *comparators;
} Compare;
@@ -409,7 +409,7 @@ expr_ty ListComp(expr_ty elt, asdl_seq * generators, int lineno, int
expr_ty GeneratorExp(expr_ty elt, asdl_seq * generators, int lineno, int
col_offset, PyArena *arena);
expr_ty Yield(expr_ty value, int lineno, int col_offset, PyArena *arena);
-expr_ty Compare(expr_ty left, asdl_seq * ops, asdl_seq * comparators, int
+expr_ty Compare(expr_ty left, asdl_int_seq * ops, asdl_seq * comparators, int
lineno, int col_offset, PyArena *arena);
expr_ty Call(expr_ty func, asdl_seq * args, asdl_seq * keywords, expr_ty
starargs, expr_ty kwargs, int lineno, int col_offset, PyArena
diff --git a/Include/asdl.h b/Include/asdl.h
index d709d42..84e837e 100644
--- a/Include/asdl.h
+++ b/Include/asdl.h
@@ -22,7 +22,13 @@ typedef struct {
void *elements[1];
} asdl_seq;
+typedef struct {
+ int size;
+ int elements[1];
+} asdl_int_seq;
+
asdl_seq *asdl_seq_new(int size, PyArena *arena);
+asdl_int_seq *asdl_int_seq_new(int size, PyArena *arena);
#define asdl_seq_GET(S, I) (S)->elements[(I)]
#define asdl_seq_LEN(S) ((S) == NULL ? 0 : (S)->size)
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index 0639789..6a8d981 100755
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -188,7 +188,10 @@ class StructVisitor(EmitVisitor):
ctype = get_c_type(field.type)
name = field.name
if field.seq:
- self.emit("asdl_seq *%(name)s;" % locals(), depth)
+ if field.type.value in ('cmpop',):
+ self.emit("asdl_int_seq *%(name)s;" % locals(), depth)
+ else:
+ self.emit("asdl_seq *%(name)s;" % locals(), depth)
else:
self.emit("%(ctype)s %(name)s;" % locals(), depth)
@@ -234,7 +237,10 @@ class PrototypeVisitor(EmitVisitor):
name = f.name
# XXX should extend get_c_type() to handle this
if f.seq:
- ctype = "asdl_seq *"
+ if f.type.value in ('cmpop',):
+ ctype = "asdl_int_seq *"
+ else:
+ ctype = "asdl_seq *"
else:
ctype = get_c_type(f.type)
args.append((ctype, name, f.opt or f.seq))
@@ -681,7 +687,7 @@ class ObjVisitor(PickleVisitor):
self.emit("if (!value) goto failed;", depth+1)
self.emit("for(i = 0; i < n; i++)", depth+1)
# This cannot fail, so no need for error handling
- self.emit("PyList_SET_ITEM(value, i, ast2obj_cmpop((cmpop_ty)(int)asdl_seq_GET(%s, i)));" % value,
+ self.emit("PyList_SET_ITEM(value, i, ast2obj_cmpop((cmpop_ty)asdl_seq_GET(%s, i)));" % value,
depth+2, reflow=False)
self.emit("}", depth)
else:
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index af9deed..7a0f528 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -1503,8 +1503,8 @@ Yield(expr_ty value, int lineno, int col_offset, PyArena *arena)
}
expr_ty
-Compare(expr_ty left, asdl_seq * ops, asdl_seq * comparators, int lineno, int
- col_offset, PyArena *arena)
+Compare(expr_ty left, asdl_int_seq * ops, asdl_seq * comparators, int lineno,
+ int col_offset, PyArena *arena)
{
expr_ty p;
if (!left) {
@@ -2503,7 +2503,7 @@ ast2obj_expr(void* _o)
value = PyList_New(n);
if (!value) goto failed;
for(i = 0; i < n; i++)
- PyList_SET_ITEM(value, i, ast2obj_cmpop((cmpop_ty)(int)asdl_seq_GET(o->v.Compare.ops, i)));
+ PyList_SET_ITEM(value, i, ast2obj_cmpop((cmpop_ty)asdl_seq_GET(o->v.Compare.ops, i)));
}
if (!value) goto failed;
if (PyObject_SetAttrString(result, "ops", value) == -1)
diff --git a/Python/asdl.c b/Python/asdl.c
index 225df6e..416b293 100644
--- a/Python/asdl.c
+++ b/Python/asdl.c
@@ -8,7 +8,24 @@ asdl_seq_new(int size, PyArena *arena)
size_t n = sizeof(asdl_seq) +
(size ? (sizeof(void *) * (size - 1)) : 0);
- seq = (asdl_seq *)PyArena_Malloc(arena, n);
+ seq = (asdl_seq *)PyArena_Malloc(arena, n);
+ if (!seq) {
+ PyErr_NoMemory();
+ return NULL;
+ }
+ memset(seq, 0, n);
+ seq->size = size;
+ return seq;
+}
+
+asdl_int_seq *
+asdl_int_seq_new(int size, PyArena *arena)
+{
+ asdl_seq *seq = NULL;
+ size_t n = sizeof(asdl_seq) +
+ (size ? (sizeof(int) * (size - 1)) : 0);
+
+ seq = (asdl_seq *)PyArena_Malloc(arena, n);
if (!seq) {
PyErr_NoMemory();
return NULL;
diff --git a/Python/ast.c b/Python/ast.c
index e825042..0b3b485 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -1600,8 +1600,9 @@ ast_for_expr(struct compiling *c, const node *n)
}
else {
expr_ty expression;
- asdl_seq *ops, *cmps;
- ops = asdl_seq_new(NCH(n) / 2, c->c_arena);
+ asdl_int_seq *ops;
+ asdl_seq *cmps;
+ ops = asdl_int_seq_new(NCH(n) / 2, c->c_arena);
if (!ops)
return NULL;
cmps = asdl_seq_new(NCH(n) / 2, c->c_arena);
@@ -1609,7 +1610,6 @@ ast_for_expr(struct compiling *c, const node *n)
return NULL;
}
for (i = 1; i < NCH(n); i += 2) {
- /* XXX cmpop_ty is just an enum */
cmpop_ty newoperator;
newoperator = ast_for_comp_op(CHILD(n, i));
@@ -1622,7 +1622,7 @@ ast_for_expr(struct compiling *c, const node *n)
return NULL;
}
- asdl_seq_SET(ops, i / 2, (void *)(Py_uintptr_t)newoperator);
+ asdl_seq_SET(ops, i / 2, newoperator);
asdl_seq_SET(cmps, i / 2, expression);
}
expression = ast_for_expr(c, CHILD(n, 0));
diff --git a/Python/compile.c b/Python/compile.c
index 1bbe73a..8b6f2f1 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -3058,17 +3058,11 @@ compiler_compare(struct compiler *c, expr_ty e)
VISIT(c, expr,
(expr_ty)asdl_seq_GET(e->v.Compare.comparators, 0));
}
-#ifdef __cplusplus
-#define CMPCAST (intptr_t)
-#else
-#define CMPCAST
-#endif
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(
+ cmpop((cmpop_ty)(asdl_seq_GET(
e->v.Compare.ops, i - 1))));
ADDOP_JREL(c, JUMP_IF_FALSE, cleanup);
NEXT_BLOCK(c);
@@ -3079,9 +3073,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(e->v.Compare.ops, n - 1))));
if (n > 1) {
basicblock *end = compiler_new_block(c);
if (end == NULL)
generated by cgit v0.12 at 2024-11-22 07:39:49 (GMT)