Commit 3b7f49fb authored by Robert Bradshaw's avatar Robert Bradshaw

cleanup

parent 960096eb
...@@ -794,13 +794,13 @@ class CStructOrUnionDefNode(StatNode): ...@@ -794,13 +794,13 @@ class CStructOrUnionDefNode(StatNode):
self.entry = env.declare_struct_or_union( self.entry = env.declare_struct_or_union(
self.name, self.kind, scope, self.typedef_flag, self.pos, self.name, self.kind, scope, self.typedef_flag, self.pos,
self.cname, visibility = self.visibility) self.cname, visibility = self.visibility)
need_typedef_indirection = False
if self.attributes is not None: if self.attributes is not None:
if self.in_pxd and not env.in_cinclude: if self.in_pxd and not env.in_cinclude:
self.entry.defined_in_pxd = 1 self.entry.defined_in_pxd = 1
for attr in self.attributes: for attr in self.attributes:
attr.analyse_declarations(env, scope) attr.analyse_declarations(env, scope)
if self.visibility != 'extern': if self.visibility != 'extern':
needs_typedef_indirection = False
for attr in scope.var_entries: for attr in scope.var_entries:
type = attr.type type = attr.type
while type.is_array: while type.is_array:
...@@ -812,13 +812,13 @@ class CStructOrUnionDefNode(StatNode): ...@@ -812,13 +812,13 @@ class CStructOrUnionDefNode(StatNode):
type = type.base_type type = type.base_type
if type == self.entry.type: if type == self.entry.type:
need_typedef_indirection = True need_typedef_indirection = True
if need_typedef_indirection: if need_typedef_indirection:
# C can't handle typedef structs that refer to themselves. # C can't handle typedef structs that refer to themselves.
struct_entry = self.entry struct_entry = self.entry
cname = env.new_const_cname() cname = env.new_const_cname()
self.entry = env.declare_typedef(self.name, struct_entry.type, self.pos, cname = self.cname, visibility='ignore') self.entry = env.declare_typedef(self.name, struct_entry.type, self.pos, cname = self.cname, visibility='ignore')
struct_entry.type.typedef_flag = False struct_entry.type.typedef_flag = False
struct_entry.cname = struct_entry.type.cname = env.new_const_cname() struct_entry.cname = struct_entry.type.cname = env.new_const_cname()
def analyse_expressions(self, env): def analyse_expressions(self, env):
pass pass
......
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