Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion autopxd/writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,21 @@ def parse_enum_value(node):
assert False, f"Unsuported constant type for enum value: {node}"

elif isinstance(node, c_ast.BinaryOp):
value_as_str = f"{node.left.name} {node.op} {node.right.name}"
if isinstance(node.left, c_ast.Constant):
nodeleft = parse_enum_value(node.left)[0]
elif hasattr(node.left, "name"):
nodeleft = node.left.name
else:
assert False, f"Unsuported expression for enum value: {node.left}"

if isinstance(node.right, c_ast.Constant):
noderight = parse_enum_value(node.right)[0]
elif hasattr(node.right, "name"):
noderight = node.right.name
else:
assert False, f"Unsuported expression for enum value: {node.right}"

value_as_str = f"{nodeleft} {node.op} {noderight}"
value_as_int = None

else:
Expand Down
5 changes: 5 additions & 0 deletions test/test_files/enum_integer_bases.test
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ enum MyEnum {
C9 = C1 + C2,
C10,
C11,
C12 = 5 + 6,
};

float my_array_c1[C1];
Expand All @@ -23,6 +24,7 @@ float my_array_c8[C8];
float my_array_c9[C9];
float my_array_c10[C10];
float my_array_c11[C11];
float my_array_c12[C12];
---

cdef extern from "enum_integer_bases.test":
Expand All @@ -39,6 +41,7 @@ cdef extern from "enum_integer_bases.test":
C9
C10
C11
C12

float my_array_c1[0xabcd]

Expand All @@ -61,3 +64,5 @@ cdef extern from "enum_integer_bases.test":
float my_array_c10[C1 + C2 + 1]

float my_array_c11[C1 + C2 + 2]

float my_array_c12[5 + 6]
Loading