Skip to content

Optimize content stream parsing #466

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
PrinsFrank merged 2 commits into from
Jul 17, 2026
Merged

Optimize content stream parsing #466

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad0c43b
Compute strlen of operator once and reuse it
PrinsFrank Jul 17, 2026
ba58497
Replace in_array checks with direct character checks
PrinsFrank Jul 17, 2026
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
15 changes: 8 additions & 7 deletions src/Document/ContentStream/ContentStreamParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static function parse(array $contentsObjects): ContentStream {
for ($index = 0; $index < $contentStreamSize; $index++) {
$char = $contentStream->read($index, 1);
if ($inComment === true) {
if (in_array($char, ["\r", "\n"], true)) {
if ($char === "\r" || $char === "\n") {
$endCommentOffset = $index + 1;
$inComment = false;
}
Expand All @@ -52,7 +52,7 @@ public static function parse(array $contentsObjects): ContentStream {
$inStringLiteral = false;
}
} elseif ($inResourceName === true) {
if (in_array($char, [' ', '<', '(', '/', "\r", "\n"], true) && $previousChar !== '\\') {
if ($previousChar !== '\\' && ($char === ' ' || $char === '<' || $char === '(' || $char === '/' || $char === "\r" || $char === "\n")) {
$inResourceName = false;
}
} elseif ($inDictionary === true) {
Expand Down Expand Up @@ -98,9 +98,10 @@ public static function parse(array $contentsObjects): ContentStream {
$operands .= $previousContentStream->read($startPreviousOperandIndex, $previousContentStream->getSizeInBytes() - $startPreviousOperandIndex);
$startPreviousOperandIndex = null;
}
$operandLength = $index + 1 - $startCurrentOperandIndex - strlen($operator->value);
$operatorLength = strlen($operator->value);
$operandLength = $index + 1 - $startCurrentOperandIndex - $operatorLength;
if ($operandLength > 0) {
$operandEndOffset = $index + 1 - strlen($operator->value);
$operandEndOffset = $index + 1 - $operatorLength;
if ($endCommentOffset !== null
&& $endCommentOffset < $operandEndOffset
&& $startOfCommentOffset !== null
Expand Down Expand Up @@ -149,7 +150,7 @@ public static function getOperator(string $currentChar, ?string $previousChar, ?
default => null,
};
if ($threeLetterMatch !== null) {
return in_array($thirdToLastChar, ['\\', '/'], true) ? null : $threeLetterMatch;
return ($thirdToLastChar === '\\' || $thirdToLastChar === '/') ? null : $threeLetterMatch;
}

$twoLetterMatch = match ($previousChar . $currentChar) {
Expand Down Expand Up @@ -195,7 +196,7 @@ public static function getOperator(string $currentChar, ?string $previousChar, ?
default => null,
};
if ($twoLetterMatch !== null) {
return in_array($secondToLastChar, ['\\', '/'], true) ? null : $twoLetterMatch;
return ($secondToLastChar === '\\' || $secondToLastChar === '/') ? null : $twoLetterMatch;
}

$oneLetterMatch = match ($currentChar) {
Expand Down Expand Up @@ -230,7 +231,7 @@ public static function getOperator(string $currentChar, ?string $previousChar, ?
};

if ($oneLetterMatch !== null) {
return in_array($previousChar, ['\\', '/'], true) ? null : $oneLetterMatch;
return ($previousChar === '\\' || $previousChar === '/') ? null : $oneLetterMatch;
}

return null;
Expand Down
Loading