Skip to content

Cache ast-parsing in RegexGroupParser #4655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ondrejmirtes merged 2 commits into from
Dec 23, 2025
+33 −20
Merged

Cache ast-parsing in RegexGroupParser #4655

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86a3fbd
Cache ast-parsing in RegexGroupParser
staabm Dec 23, 2025
087eb8b
cache earlier
staabm Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 33 additions & 20 deletions src/Type/Regex/RegexGroupParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
use PHPStan\Type\StringType;
use PHPStan\Type\Type;
use PHPStan\Type\TypeCombinator;
use function array_key_exists;
use function array_values;
use function count;
use function in_array;
Expand All @@ -44,6 +45,9 @@ final class RegexGroupParser

private static ?Parser $parser = null;

/** @var array<string, ?TreeNode> */
private static array $parsedAst = [];

public function __construct(
private PhpVersion $phpVersion,
private RegexExpressionHelper $regexExpressionHelper,
Expand All @@ -56,30 +60,39 @@ public function parseGroups(string $regex): ?RegexAstWalkResult
/** @throws void */
self::$parser ??= Llk::load(new Read(__DIR__ . '/../../../resources/RegexGrammar.pp'));

try {
Strings::match('', $regex);
} catch (RegexpException) {
// pattern is invalid, so let the RegularExpressionPatternRule report it
return null;
}

$modifiers = $this->regexExpressionHelper->getPatternModifiers($regex) ?? '';
foreach (self::NOT_SUPPORTED_MODIFIERS as $notSupportedModifier) {
if (str_contains($modifiers, $notSupportedModifier)) {
if (array_key_exists($regex, self::$parsedAst)) {
$ast = self::$parsedAst[$regex];
if ($ast === null) {
return null;
}
}

if (str_contains($modifiers, 'x')) {
// in freespacing mode the # character starts a comment and runs until the end of the line
$regex = preg_replace('/(?<!\?)#.*/', '', $regex) ?? '';
}
$modifiers = $this->regexExpressionHelper->getPatternModifiers($regex) ?? '';
} else {
try {
Strings::match('', $regex);
} catch (RegexpException) {
// pattern is invalid, so let the RegularExpressionPatternRule report it
return self::$parsedAst[$regex] = null;
}

$rawRegex = $this->regexExpressionHelper->removeDelimitersAndModifiers($regex);
try {
$ast = self::$parser->parse($rawRegex);
} catch (Exception) {
return null;
$modifiers = $this->regexExpressionHelper->getPatternModifiers($regex) ?? '';
foreach (self::NOT_SUPPORTED_MODIFIERS as $notSupportedModifier) {
if (str_contains($modifiers, $notSupportedModifier)) {
return self::$parsedAst[$regex] = null;
}
}

if (str_contains($modifiers, 'x')) {
// in freespacing mode the # character starts a comment and runs until the end of the line
$regex = preg_replace('/(?<!\?)#.*/', '', $regex) ?? '';
}

$rawRegex = $this->regexExpressionHelper->removeDelimitersAndModifiers($regex);
try {
$ast = self::$parsedAst[$regex] = self::$parser->parse($rawRegex);
} catch (Exception) {
return self::$parsedAst[$regex] = null;
}
}

$this->updateAlternationAstRemoveVerticalBarsAndAddEmptyToken($ast);
Expand Down
Loading