SwitchExtractor Improvement #424
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| self._current_cond_node.clean() | ||
|
|
||
| def _try_to_extract_switch_from_branch(self, branch: Union[TrueNode, FalseNode]) -> None: | ||
| def _switch_can_be_extracted(self, switch_node: SwitchNode) -> bool: |
There was a problem hiding this comment.
I think the function name is a bit misleading, indicating that it is only checked if the extraction is possible or not. Instead, the extraction is actually performed.
There was a problem hiding this comment.
Well, I still don't particularly like the naming, but sure :D
| self.asforest.extract_branch_from_condition_node(self._current_cond_node, branch, False) | ||
| self.asforest.extract_branch_from_condition_node(condition_node, branch, False) | ||
|
|
||
| def _extract_switch_from_first_or_last_child_of(self, sequence_node: SeqNode, condition: LogicCondition) -> bool: |
There was a problem hiding this comment.
btw. and regarding my above comment: Here you are also returning True/False in case of succeeded or failed extraction without the function being names as above
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
First, the switch-extractor did not consider sequence nodes with a non-trivial reaching-condition. Therefore, we did not extract some switches leading to fewer cases or not the ability to merge cases.
Second, there was a minor bug, because we extracted switches from conditions nodes even if they were children of a sequence node with a non-trivial reaching-condition.