Improve performance of specification parser

Ref. #95, #343, #466
AdaCore · Oct 19, 2020 · 91cbcda · 91cbcda
1 parent 3b85c3a
commit 91cbcda
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/rflx/specification/parser.py b/rflx/specification/parser.py
@@ -332,9 +332,13 @@ def create_message_structure(components: Sequence[Component], error: RecordFluxE
             target_node = Field(name) if name else FINAL
             structure.append(Link(source_node, target_node))
 
-        if component.first != expr.UNDEFINED:
-            for l in structure:
-                if l.target.identifier == component.name:
+        if (
+            component.first != expr.UNDEFINED
+            or component.length != expr.UNDEFINED
+            or component.condition != expr.TRUE
+        ):
+            for l in (l for l in structure if l.target.identifier == component.name):
+                if component.first != expr.UNDEFINED:
                     if l.first == expr.UNDEFINED:
                         l.first = component.first
                     else:
@@ -352,9 +356,7 @@ def create_message_structure(components: Sequence[Component], error: RecordFluxE
                             l.first.location,
                         )
 
-        if component.length != expr.UNDEFINED:
-            for l in structure:
-                if l.target.identifier == component.name:
+                if component.length != expr.UNDEFINED:
                     if l.length == expr.UNDEFINED:
                         l.length = component.length
                     else:
@@ -372,9 +374,7 @@ def create_message_structure(components: Sequence[Component], error: RecordFluxE
                             l.length.location,
                         )
 
-        if component.condition != expr.TRUE:
-            for l in structure:
-                if l.target.identifier == component.name:
+                if component.condition != expr.TRUE:
                     l.condition = (
                         expr.And(component.condition, l.condition, location=l.condition.location)
                         if l.condition != expr.TRUE