Skip to content

Commit 0f68f04

Browse files
committed
deconflict
1 parent dec43ca commit 0f68f04

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

WDL/_parser.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,8 @@ def struct(self, meta, items):
573573
name = items[0]
574574
self._check_keyword(self._sp(meta), name)
575575
members = {}
576-
meta = None
577-
parameter_meta = None
576+
struct_meta = None
577+
struct_parameter_meta = None
578578
for d in items[1:]:
579579
if isinstance(d, Tree.Decl):
580580
assert not d.expr
@@ -585,23 +585,23 @@ def struct(self, meta, items):
585585
members[d.name] = d.type
586586
elif isinstance(d, dict):
587587
if "meta" in d:
588-
if meta is not None:
588+
if struct_meta is not None:
589589
raise Error.MultipleDefinitions(
590590
self._sp(meta), "redundant struct meta sections"
591591
)
592-
meta = d["meta"]
592+
struct_meta = d["meta"]
593593
elif "parameter_meta" in d:
594-
if parameter_meta is not None:
594+
if struct_parameter_meta is not None:
595595
raise Error.MultipleDefinitions(
596596
self._sp(meta), "redundant struct parameter_meta sections"
597597
)
598-
parameter_meta = d["parameter_meta"]
598+
struct_parameter_meta = d["parameter_meta"]
599599
else:
600600
assert False
601601
else:
602602
assert False
603603
return Tree.StructTypeDef(
604-
self._sp(meta), name, members, meta=meta, parameter_meta=parameter_meta
604+
self._sp(meta), name, members, meta=struct_meta, parameter_meta=struct_parameter_meta
605605
)
606606

607607
def import_alias(self, meta, items):

0 commit comments

Comments
 (0)