Skip to content

[CLEANUP] Avoid Hungarian notation for start(Position) #977

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
merged 2 commits into from
Feb 24, 2025
Merged

[CLEANUP] Avoid Hungarian notation for start(Position) #977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db28450
[CLEANUP] Avoid Hungarian notation for `start(Position)`
oliverklee Feb 24, 2025
ed47f1e
Changes suggested in code review
oliverklee Feb 24, 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
14 changes: 7 additions & 7 deletions src/Parsing/ParserState.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,21 +424,21 @@ public function strlen($string): int
}

/**
* @param int $iStart
* @param int $offset
* @param int $length
*/
private function substr($iStart, $length): string
private function substr($offset, $length): string
{
if ($length < 0) {
$length = \count($this->characters) - $iStart + $length;
$length = \count($this->characters) - $offset + $length;
}
if ($iStart + $length > \count($this->characters)) {
$length = \count($this->characters) - $iStart;
if ($offset + $length > \count($this->characters)) {
$length = \count($this->characters) - $offset;
}
$result = '';
while ($length > 0) {
$result .= $this->characters[$iStart];
$iStart++;
$result .= $this->characters[$offset];
$offset++;
$length--;
}
return $result;
Expand Down
12 changes: 6 additions & 6 deletions src/Value/Value.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,23 +78,23 @@ public static function parseValue(ParserState $parserState, array $aListDelimite
return $aStack[0];
}
$aNewStack = [];
for ($iStartPosition = 0; $iStartPosition < $iStackLength; ++$iStartPosition) {
if ($iStartPosition === ($iStackLength - 1) || $sDelimiter !== $aStack[$iStartPosition + 1]) {
$aNewStack[] = $aStack[$iStartPosition];
for ($offset = 0; $offset < $iStackLength; ++$offset) {
if ($offset === ($iStackLength - 1) || $sDelimiter !== $aStack[$offset + 1]) {
$aNewStack[] = $aStack[$offset];
continue;
}
$length = 2; //Number of elements to be joined
for ($i = $iStartPosition + 3; $i < $iStackLength; $i += 2, ++$length) {
for ($i = $offset + 3; $i < $iStackLength; $i += 2, ++$length) {
if ($sDelimiter !== $aStack[$i]) {
break;
}
}
$list = new RuleValueList($sDelimiter, $parserState->currentLine());
for ($i = $iStartPosition; $i - $iStartPosition < $length * 2; $i += 2) {
for ($i = $offset; $i - $offset < $length * 2; $i += 2) {
$list->addListComponent($aStack[$i]);
}
$aNewStack[] = $list;
$iStartPosition += $length * 2 - 2;
$offset += $length * 2 - 2;
}
$aStack = $aNewStack;
}
Expand Down
Loading