[SFN] Fixes and cleanups of choiceRule parsing #9062
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Fixes the parsing of Choice states for which the ordering of Variable and Comparison function statements is interrupted by Next declarations. It also simplifies the cleans up the grammar end evaluation logic of choice statements by better differentiating between variable comparisons and composite comparisons. It also adds the machine definition in InvalidDefinition exceptions to ease future parsing issues.
Changes