Commit 3aad1ec5 authored by Dag Sverre Seljebotn's avatar Dag Sverre Seljebotn

Fixed buffer [] syntax yet another time

parent 5a472980
...@@ -1627,8 +1627,13 @@ def p_c_simple_base_type(s, self_flag, nonempty): ...@@ -1627,8 +1627,13 @@ def p_c_simple_base_type(s, self_flag, nonempty):
longness = longness, is_self_arg = self_flag) longness = longness, is_self_arg = self_flag)
# Treat trailing [] on type as buffer access # Treat trailing [] on type as buffer access if it appears in a context
if s.sy == '[': # where declarator names are required (so that it cannot mean int[] or
# sizeof(int[SIZE]))...
#
# (This means that buffers cannot occur where there can be empty declarators,
# which is an ok restriction to make.)
if nonempty and s.sy == '[':
return p_buffer_access(s, type_node) return p_buffer_access(s, type_node)
else: else:
return type_node return type_node
...@@ -1637,10 +1642,6 @@ def p_buffer_access(s, base_type_node): ...@@ -1637,10 +1642,6 @@ def p_buffer_access(s, base_type_node):
# s.sy == '[' # s.sy == '['
pos = s.position() pos = s.position()
s.next() s.next()
if s.sy == ']' or s.sy == 'INT':
# not buffer, could be [] on C type nameless array arguments
s.put_back('[', '[')
return base_type_node
positional_args, keyword_args = ( positional_args, keyword_args = (
p_positional_and_keyword_args(s, (']',), (0,), ('dtype',)) p_positional_and_keyword_args(s, (']',), (0,), ('dtype',))
) )
......
cdef extern from *: cdef extern from *:
cdef void foo(int[]) cdef void foo(int[])
...@@ -17,3 +18,8 @@ cdef struct OtherStruct: ...@@ -17,3 +18,8 @@ cdef struct OtherStruct:
a = sizeof(int[23][34]) a = sizeof(int[23][34])
b = sizeof(OtherStruct[43]) b = sizeof(OtherStruct[43])
DEF COUNT = 4
c = sizeof(int[COUNT])
d = sizeof(OtherStruct[COUNT])
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment