RegexArrayShapeMatcher - turn more details immutable #3892
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
staabm
commented
Mar 21, 2025
Comment on lines
-118
to
-127
| $trailingOptionals = 0; | ||
| foreach (array_reverse($groupList) as $captureGroup) { | ||
| if (!$captureGroup->isOptional()) { | ||
| break; | ||
| } | ||
| $trailingOptionals++; | ||
| } | ||
|
|
||
| $onlyOptionalTopLevelGroup = $this->getOnlyOptionalTopLevelGroup($groupList); | ||
| $onlyTopLevelAlternation = $this->getOnlyTopLevelAlternation($groupList); |
There was a problem hiding this comment.
move operations previously did on array<int, RegexCapturingGroup> $captureGroups into a dedicated class
staabm
commented
Mar 21, 2025
| @@ -154,12 +146,10 @@ private function matchRegex(string $regex, ?int $flags, TrinaryLogic $wasMatched | |||
| ); | |||
| } | |||
|
|
|||
| $onlyOptionalTopLevelGroup->clearOverrides(); | |||
There was a problem hiding this comment.
no more state clearing/handling
staabm
commented
Mar 21, 2025
Comment on lines
-203
to
-206
| foreach ($groupCombo as $groupId) { | ||
| $group = $comboList[$groupId]; | ||
| $group->clearOverrides(); | ||
| } |
There was a problem hiding this comment.
no more state clearing/handling
|
This pull request has been marked as ready for review. |
|
Awesome, thank you!" |
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.
goal: more immutability so we can in the end re-use hoa/ast parse results instead of regex lexing/parsing the same regex over and over (which shows up in perf profiles).
this also paves the way for phpstan/phpstan#12749 for which we need the group list to infer a more precise subject-type result