Conform Behavior Annex expression precedence, admissible forms, and grouping to AS5506/3 🤖

ba/org.osate.ba.tests/expected/diagnostics-validated/org.osate.ba.tests_models_issue3177_AbsNegatedOperand.txt

@@ -0,0 +1,2 @@
+error | syntax | 38 | 31 | 2 | no viable alternative at input ':='
+error | syntax | 38 | 39 | 5 | extraneous input 'total' expecting '}'

ba/org.osate.ba.tests/expected/diagnostics-validated/org.osate.ba.tests_models_issue3177_PowerChain.txt

@@ -0,0 +1 @@
+error | syntax | 38 | 45 | 2 | mismatched input '**' expecting '}'

ba/org.osate.ba.tests/expected/diagnostics-validated/org.osate.ba.tests_models_issue3177_RepeatedNot.txt

@@ -0,0 +1,2 @@
+error | syntax | 36 | 29 | 2 | no viable alternative at input ':='
+error | syntax | 36 | 40 | 4 | extraneous input 'flag' expecting '}'

ba/org.osate.ba.tests/expected/diagnostics-validated/org.osate.ba.tests_models_issue3177_RepeatedUnaryMinus.txt

@@ -0,0 +1,2 @@
+error | syntax | 38 | 31 | 2 | no viable alternative at input ':='
+error | syntax | 38 | 37 | 5 | extraneous input 'total' expecting '}'

ba/org.osate.ba.tests/expected/diagnostics/org.osate.ba.tests_models_issue3177_AbsNegatedOperand.txt

@@ -0,0 +1,2 @@
+error | syntax | 38 | 31 | 2 | no viable alternative at input ':='
+error | syntax | 38 | 39 | 5 | extraneous input 'total' expecting '}'

ba/org.osate.ba.tests/expected/diagnostics/org.osate.ba.tests_models_issue3177_PowerChain.txt

@@ -0,0 +1 @@
+error | syntax | 38 | 45 | 2 | mismatched input '**' expecting '}'

ba/org.osate.ba.tests/expected/diagnostics/org.osate.ba.tests_models_issue3177_RepeatedNot.txt

@@ -0,0 +1,2 @@
+error | syntax | 36 | 29 | 2 | no viable alternative at input ':='
+error | syntax | 36 | 40 | 4 | extraneous input 'flag' expecting '}'

ba/org.osate.ba.tests/expected/diagnostics/org.osate.ba.tests_models_issue3177_RepeatedUnaryMinus.txt

@@ -0,0 +1,2 @@
+error | syntax | 38 | 31 | 2 | no viable alternative at input ':='
+error | syntax | 38 | 37 | 5 | extraneous input 'total' expecting '}'

ba/org.osate.ba.tests/expected/positions/org.osate.ba.tests_models_characterization_GrammarHazards.txt

@@ -121,6 +121,7 @@ annex[0] owner=Issue2445_Grammar_Hazards::hazards
   (HashPropertyReference, <null>, 1272, 15)
   (IfStatement, <null>, 1736, 104)
   (ListValue, <null>, 1007, 5)
+  (ParenthesizedExpression, <null>, 1484, 13)
   (Reference, <null>, 1191, 5)
   (Reference, <null>, 1218, 5)
   (Reference, <null>, 1239, 5)
@@ -177,7 +178,7 @@ annex[0] owner=Issue2445_Grammar_Hazards::hazards
   (ReferenceExpression, <null>, 1425, 5)
   (ReferenceExpression, <null>, 1445, 5)
   (ReferenceExpression, <null>, 1455, 5)
-  (ReferenceExpression, <null>, 1484, 13)
+  (ReferenceExpression, <null>, 1485, 11)
   (ReferenceExpression, <null>, 1501, 11)
   (ReferenceExpression, <null>, 1592, 5)
   (ReferenceExpression, <null>, 1618, 5)

ba/org.osate.ba.tests/expected/positions/org.osate.ba.tests_models_characterization_syntax_errors_UnbalancedParentheses.txt

@@ -2,13 +2,14 @@ annex[0] owner=UnbalancedParentheses::t
   (AssignmentAction, <null>, 312, 6)
   (BehaviorActionBlock, <null>, 294, 28)
   (BehaviorAnnex, behavior_specification, 203, 120)
-  (BehaviorBooleanLiteral, <null>, 303, 6)
+  (BehaviorBooleanLiteral, <null>, 304, 4)
   (BehaviorIntegerLiteral, <null>, 317, 1)
   (BehaviorState, s, 246, 1)
   (BehaviorStateGroup, <null>, 246, 23)
   (BehaviorTransition, <null>, 284, 39)
   (BehaviorVariable, x, 213, 1)
   (BehaviorVariableGroup, <null>, 213, 23)
+  (ParenthesizedExpression, <null>, 303, 6)
   (Reference, <null>, 312, 1)
   (ReferenceSegment, x, 312, 1)
   (WhileStatement, <null>, 296, 24)

ba/org.osate.ba.tests/expected/positions/org.osate.ba.tests_models_covering_syntax_aadlBaTest001.txt

@@ -788,16 +788,16 @@ annex[1] owner=NamesResolutionTest::thread1.impl
   (BinaryExpression, <null>, 12147, 6)
   (BinaryExpression, <null>, 12179, 6)
   (BinaryExpression, <null>, 12238, 75)
-  (BinaryExpression, <null>, 12241, 30)
   (BinaryExpression, <null>, 12242, 13)
   (BinaryExpression, <null>, 12242, 23)
+  (BinaryExpression, <null>, 12242, 28)
   (BinaryExpression, <null>, 12242, 9)
   (BinaryExpression, <null>, 12258, 7)
-  (BinaryExpression, <null>, 12275, 38)
   (BinaryExpression, <null>, 12276, 15)
-  (BinaryExpression, <null>, 12281, 10)
-  (BinaryExpression, <null>, 12295, 17)
+  (BinaryExpression, <null>, 12276, 36)
+  (BinaryExpression, <null>, 12282, 8)
   (BinaryExpression, <null>, 12296, 11)
+  (BinaryExpression, <null>, 12296, 15)
   (BinaryExpression, <null>, 5314, 5)
   (BinaryExpression, <null>, 5332, 5)
   (BinaryExpression, <null>, 5350, 6)
@@ -814,7 +814,7 @@ annex[1] owner=NamesResolutionTest::thread1.impl
   (BinaryExpression, <null>, 5611, 3)
   (BinaryExpression, <null>, 5611, 7)
   (BinaryExpression, <null>, 5631, 10)
-  (BinaryExpression, <null>, 5631, 6)
+  (BinaryExpression, <null>, 5632, 5)
   (BinaryExpression, <null>, 5654, 4)
   (BinaryExpression, <null>, 5654, 8)
   (BinaryExpression, <null>, 5675, 39)
@@ -823,7 +823,7 @@ annex[1] owner=NamesResolutionTest::thread1.impl
   (BinaryExpression, <null>, 5739, 34)
   (BinaryExpression, <null>, 5739, 43)
   (BinaryExpression, <null>, 5795, 12)
-  (BinaryExpression, <null>, 5795, 8)
+  (BinaryExpression, <null>, 5796, 7)
   (BinaryExpression, <null>, 5820, 10)
   (BinaryExpression, <null>, 5820, 20)
   (BinaryExpression, <null>, 5820, 29)
@@ -833,7 +833,7 @@ annex[1] owner=NamesResolutionTest::thread1.impl
   (BinaryExpression, <null>, 6015, 3)
   (BinaryExpression, <null>, 6015, 7)
   (BinaryExpression, <null>, 6035, 10)
-  (BinaryExpression, <null>, 6035, 6)
+  (BinaryExpression, <null>, 6036, 5)
   (BinaryExpression, <null>, 6058, 4)
   (BinaryExpression, <null>, 6058, 8)
   (BinaryExpression, <null>, 6079, 11)
@@ -846,8 +846,8 @@ annex[1] owner=NamesResolutionTest::thread1.impl
   (BinaryExpression, <null>, 6184, 29)
   (BinaryExpression, <null>, 6201, 12)
   (BinaryExpression, <null>, 7624, 3)
-  (BinaryExpression, <null>, 7657, 8)
-  (BinaryExpression, <null>, 7698, 7)
+  (BinaryExpression, <null>, 7658, 7)
+  (BinaryExpression, <null>, 7699, 5)
   (BinaryExpression, <null>, 7736, 5)
   (BinaryExpression, <null>, 7793, 5)
   (BinaryExpression, <null>, 8386, 5)
@@ -1036,6 +1036,13 @@ annex[1] owner=NamesResolutionTest::thread1.impl
   (IfStatement, <null>, 8733, 39)
   (IfStatement, <null>, 8789, 34)
   (IfStatement, <null>, 8842, 80)
+  (ParenthesizedExpression, <null>, 12241, 30)
+  (ParenthesizedExpression, <null>, 12275, 38)
+  (ParenthesizedExpression, <null>, 12281, 10)
+  (ParenthesizedExpression, <null>, 12295, 17)
+  (ParenthesizedExpression, <null>, 12296, 7)
+  (ParenthesizedExpression, <null>, 6148, 16)
+  (ParenthesizedExpression, <null>, 7698, 7)
   (PropertyReferenceTail, <null>, 7002, 13)
   (PropertyReferenceTail, <null>, 7075, 7)
   (Reference, <null>, 10029, 3)
@@ -1886,19 +1893,19 @@ annex[1] owner=NamesResolutionTest::thread1.impl
   (UnaryExpression, <null>, 11876, 2)
   (UnaryExpression, <null>, 12238, 33)
   (UnaryExpression, <null>, 12242, 5)
-  (UnaryExpression, <null>, 12296, 7)
+  (UnaryExpression, <null>, 12297, 5)
   (UnaryExpression, <null>, 5487, 9)
   (UnaryExpression, <null>, 5534, 9)
   (UnaryExpression, <null>, 5592, 2)
-  (UnaryExpression, <null>, 5631, 2)
-  (UnaryExpression, <null>, 5795, 2)
+  (UnaryExpression, <null>, 5631, 6)
+  (UnaryExpression, <null>, 5795, 8)
   (UnaryExpression, <null>, 5824, 2)
   (UnaryExpression, <null>, 5862, 5)
   (UnaryExpression, <null>, 5996, 2)
-  (UnaryExpression, <null>, 6035, 2)
+  (UnaryExpression, <null>, 6035, 6)
   (UnaryExpression, <null>, 6145, 19)
-  (UnaryExpression, <null>, 6148, 16)
-  (UnaryExpression, <null>, 7657, 2)
+  (UnaryExpression, <null>, 6149, 14)
+  (UnaryExpression, <null>, 7657, 8)
   (UnaryExpression, <null>, 7694, 11)
   (WhileStatement, <null>, 10054, 20)
   (WhileStatement, <null>, 10092, 30)

ba/org.osate.ba.tests/expected/positions/org.osate.ba.tests_models_covering_syntax_aadlBaTest006.txt

@@ -105,6 +105,7 @@ annex[0] owner=ParseTest::t
   (ExecuteCondition, <null>, 2681, 5)
   (ExecuteCondition, <null>, 2868, 5)
   (ExecuteCondition, <null>, 3041, 1)
+  (ParenthesizedExpression, <null>, 2125, 7)
   (Reference, <null>, 1461, 2)
   (Reference, <null>, 1472, 2)
   (Reference, <null>, 1476, 2)
@@ -120,7 +121,7 @@ annex[0] owner=ParseTest::t
   (ReferenceExpression, <null>, 1554, 2)
   (ReferenceExpression, <null>, 1699, 1)
   (ReferenceExpression, <null>, 1736, 1)
-  (ReferenceExpression, <null>, 2125, 7)
+  (ReferenceExpression, <null>, 2126, 5)
   (ReferenceExpression, <null>, 2681, 5)
   (ReferenceExpression, <null>, 2868, 5)
   (ReferenceExpression, <null>, 3041, 1)

ba/org.osate.ba.tests/expected/positions/org.osate.ba.tests_models_issue3177_AbsNegatedOperand.txt

@@ -0,0 +1,15 @@
+annex[0] owner=AbsNegatedOperand::evaluate
+  (BehaviorActionBlock, <null>, 2170, 24)
+  (BehaviorAnnex, behavior_specification, 2002, 193)
+  (BehaviorState, done, 2115, 4)
+  (BehaviorState, start, 2089, 5)
+  (BehaviorStateGroup, <null>, 2089, 22)
+  (BehaviorStateGroup, <null>, 2115, 19)
+  (BehaviorTransition, <null>, 2152, 43)
+  (BehaviorVariable, result, 2047, 6)
+  (BehaviorVariable, total, 2015, 5)
+  (BehaviorVariableGroup, <null>, 2015, 28)
+  (BehaviorVariableGroup, <null>, 2047, 29)
+  (CommunicationAction, <null>, 2172, 15)
+  (Reference, <null>, 2172, 6)
+  (ReferenceSegment, result, 2172, 6)

ba/org.osate.ba.tests/expected/positions/org.osate.ba.tests_models_issue3177_Issue3177.txt

@@ -0,0 +1,77 @@
+annex[0] owner=Issue3177::evaluate
+  (AssignmentAction, <null>, 2295, 32)
+  (AssignmentAction, <null>, 2468, 34)
+  (AssignmentAction, <null>, 2611, 17)
+  (AssignmentAction, <null>, 2792, 22)
+  (AssignmentAction, <null>, 2900, 27)
+  (BehaviorActionBlock, <null>, 2137, 795)
+  (BehaviorActionSequence, <null>, 2295, 632)
+  (BehaviorAnnex, behavior_specification, 1842, 1091)
+  (BehaviorIntegerLiteral, <null>, 2622, 1)
+  (BehaviorIntegerLiteral, <null>, 2627, 1)
+  (BehaviorIntegerLiteral, <null>, 2813, 1)
+  (BehaviorIntegerLiteral, <null>, 2920, 1)
+  (BehaviorIntegerLiteral, <null>, 2926, 1)
+  (BehaviorState, done, 2082, 4)
+  (BehaviorState, start, 2056, 5)
+  (BehaviorStateGroup, <null>, 2056, 22)
+  (BehaviorStateGroup, <null>, 2082, 19)
+  (BehaviorTransition, <null>, 2119, 814)
+  (BehaviorVariable, flag, 2016, 4)
+  (BehaviorVariable, left, 1920, 4)
+  (BehaviorVariable, middle, 1951, 6)
+  (BehaviorVariable, result, 1887, 6)
+  (BehaviorVariable, right, 1984, 5)
+  (BehaviorVariable, total, 1855, 5)
+  (BehaviorVariableGroup, <null>, 1855, 28)
+  (BehaviorVariableGroup, <null>, 1887, 29)
+  (BehaviorVariableGroup, <null>, 1920, 27)
+  (BehaviorVariableGroup, <null>, 1951, 29)
+  (BehaviorVariableGroup, <null>, 1984, 28)
+  (BehaviorVariableGroup, <null>, 2016, 27)
+  (BinaryExpression, <null>, 2303, 14)
+  (BinaryExpression, <null>, 2303, 24)
+  (BinaryExpression, <null>, 2476, 26)
+  (BinaryExpression, <null>, 2486, 15)
+  (BinaryExpression, <null>, 2622, 6)
+  (BinaryExpression, <null>, 2803, 11)
+  (BinaryExpression, <null>, 2910, 17)
+  (BinaryExpression, <null>, 2911, 10)
+  (ParenthesizedExpression, <null>, 2485, 17)
+  (ParenthesizedExpression, <null>, 2910, 12)
+  (Reference, <null>, 2295, 4)
+  (Reference, <null>, 2303, 4)
+  (Reference, <null>, 2311, 6)
+  (Reference, <null>, 2322, 5)
+  (Reference, <null>, 2468, 4)
+  (Reference, <null>, 2476, 4)
+  (Reference, <null>, 2486, 6)
+  (Reference, <null>, 2496, 5)
+  (Reference, <null>, 2611, 6)
+  (Reference, <null>, 2792, 6)
+  (Reference, <null>, 2803, 5)
+  (Reference, <null>, 2900, 6)
+  (Reference, <null>, 2911, 5)
+  (ReferenceExpression, <null>, 2303, 4)
+  (ReferenceExpression, <null>, 2311, 6)
+  (ReferenceExpression, <null>, 2322, 5)
+  (ReferenceExpression, <null>, 2476, 4)
+  (ReferenceExpression, <null>, 2486, 6)
+  (ReferenceExpression, <null>, 2496, 5)
+  (ReferenceExpression, <null>, 2803, 5)
+  (ReferenceExpression, <null>, 2911, 5)
+  (ReferenceSegment, flag, 2295, 4)
+  (ReferenceSegment, flag, 2468, 4)
+  (ReferenceSegment, left, 2303, 4)
+  (ReferenceSegment, left, 2476, 4)
+  (ReferenceSegment, middle, 2311, 6)
+  (ReferenceSegment, middle, 2486, 6)
+  (ReferenceSegment, result, 2611, 6)
+  (ReferenceSegment, result, 2792, 6)
+  (ReferenceSegment, result, 2900, 6)
+  (ReferenceSegment, right, 2322, 5)
+  (ReferenceSegment, right, 2496, 5)
+  (ReferenceSegment, total, 2803, 5)
+  (ReferenceSegment, total, 2911, 5)
+  (UnaryExpression, <null>, 2621, 7)
+  (UnaryExpression, <null>, 2802, 12)

ba/org.osate.ba.tests/expected/positions/org.osate.ba.tests_models_issue3177_PowerChain.txt

@@ -0,0 +1,20 @@
+annex[0] owner=PowerChain::evaluate
+  (AssignmentAction, <null>, 2151, 20)
+  (BehaviorActionBlock, <null>, 2149, 29)
+  (BehaviorAnnex, behavior_specification, 1981, 198)
+  (BehaviorIntegerLiteral, <null>, 2170, 1)
+  (BehaviorState, done, 2094, 4)
+  (BehaviorState, start, 2068, 5)
+  (BehaviorStateGroup, <null>, 2068, 22)
+  (BehaviorStateGroup, <null>, 2094, 19)
+  (BehaviorTransition, <null>, 2131, 48)
+  (BehaviorVariable, result, 2026, 6)
+  (BehaviorVariable, total, 1994, 5)
+  (BehaviorVariableGroup, <null>, 1994, 28)
+  (BehaviorVariableGroup, <null>, 2026, 29)
+  (BinaryExpression, <null>, 2161, 10)
+  (Reference, <null>, 2151, 6)
+  (Reference, <null>, 2161, 5)
+  (ReferenceExpression, <null>, 2161, 5)
+  (ReferenceSegment, result, 2151, 6)
+  (ReferenceSegment, total, 2161, 5)

ba/org.osate.ba.tests/expected/positions/org.osate.ba.tests_models_issue3177_RepeatedNot.txt

@@ -0,0 +1,13 @@
+annex[0] owner=RepeatedNot::evaluate
+  (BehaviorActionBlock, <null>, 2079, 24)
+  (BehaviorAnnex, behavior_specification, 1945, 159)
+  (BehaviorState, done, 2024, 4)
+  (BehaviorState, start, 1998, 5)
+  (BehaviorStateGroup, <null>, 1998, 22)
+  (BehaviorStateGroup, <null>, 2024, 19)
+  (BehaviorTransition, <null>, 2061, 43)
+  (BehaviorVariable, flag, 1958, 4)
+  (BehaviorVariableGroup, <null>, 1958, 27)
+  (CommunicationAction, <null>, 2081, 15)
+  (Reference, <null>, 2081, 4)
+  (ReferenceSegment, flag, 2081, 4)

ba/org.osate.ba.tests/expected/positions/org.osate.ba.tests_models_issue3177_RepeatedUnaryMinus.txt

@@ -0,0 +1,15 @@
+annex[0] owner=RepeatedUnaryMinus::evaluate
+  (BehaviorActionBlock, <null>, 2222, 22)
+  (BehaviorAnnex, behavior_specification, 2054, 191)
+  (BehaviorState, done, 2167, 4)
+  (BehaviorState, start, 2141, 5)
+  (BehaviorStateGroup, <null>, 2141, 22)
+  (BehaviorStateGroup, <null>, 2167, 19)
+  (BehaviorTransition, <null>, 2204, 41)
+  (BehaviorVariable, result, 2099, 6)
+  (BehaviorVariable, total, 2067, 5)
+  (BehaviorVariableGroup, <null>, 2067, 28)
+  (BehaviorVariableGroup, <null>, 2099, 29)
+  (CommunicationAction, <null>, 2224, 13)
+  (Reference, <null>, 2224, 6)
+  (ReferenceSegment, result, 2224, 6)

ba/org.osate.ba.tests/expected/resolved-model/org.osate.ba.tests_models_issue3177_AbsNegatedOperand.txt

@@ -0,0 +1,10 @@
+annex[0] owner=AbsNegatedOperand::evaluate
+  parsedAnnexSubclause : BehaviorAnnex name=behavior_specification
+    variables[0] : BehaviorVariable name=total
+    variables[1] : BehaviorVariable name=result
+    states[0] : BehaviorState name=start
+    states[1] : BehaviorState name=done
+    transitions[0] : BehaviorTransition
+    actions[0] : BehaviorActionBlock
+      content : SubprogramCallAction
+        proxy : BehaviorVariableHolder element=result [BehaviorVariable]