From 155a6be39539e74279d8f78333d940f75c3e8798 Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Sun, 16 Feb 2025 10:22:16 +0100 Subject: [PATCH] [CLEANUP] Avoid Hungarian notation for `position` Part of #756 --- src/Parsing/Anchor.php | 10 +++++----- src/Parsing/ParserState.php | 6 +++--- src/RuleSet/RuleSet.php | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Parsing/Anchor.php b/src/Parsing/Anchor.php index 039f783e..e7cf9244 100644 --- a/src/Parsing/Anchor.php +++ b/src/Parsing/Anchor.php @@ -12,7 +12,7 @@ class Anchor /** * @var int */ - private $iPosition; + private $position; /** * @var ParserState @@ -20,16 +20,16 @@ class Anchor private $parserState; /** - * @param int $iPosition + * @param int $position */ - public function __construct($iPosition, ParserState $parserState) + public function __construct($position, ParserState $parserState) { - $this->iPosition = $iPosition; + $this->position = $position; $this->parserState = $parserState; } public function backtrack(): void { - $this->parserState->setPosition($this->iPosition); + $this->parserState->setPosition($this->position); } } diff --git a/src/Parsing/ParserState.php b/src/Parsing/ParserState.php index 10187617..181bd88e 100644 --- a/src/Parsing/ParserState.php +++ b/src/Parsing/ParserState.php @@ -122,11 +122,11 @@ public function anchor(): Anchor } /** - * @param int $iPosition + * @param int $position */ - public function setPosition($iPosition): void + public function setPosition($position): void { - $this->iCurrentPosition = $iPosition; + $this->iCurrentPosition = $position; } /** diff --git a/src/RuleSet/RuleSet.php b/src/RuleSet/RuleSet.php index bb40bd23..8e9cf1aa 100644 --- a/src/RuleSet/RuleSet.php +++ b/src/RuleSet/RuleSet.php @@ -108,12 +108,12 @@ public function addRule(Rule $rule, ?Rule $oSibling = null): void $this->aRules[$sRule] = []; } - $iPosition = \count($this->aRules[$sRule]); + $position = \count($this->aRules[$sRule]); if ($oSibling !== null) { $iSiblingPos = \array_search($oSibling, $this->aRules[$sRule], true); if ($iSiblingPos !== false) { - $iPosition = $iSiblingPos; + $position = $iSiblingPos; $rule->setPosition($oSibling->getLineNo(), $oSibling->getColNo() - 1); } } @@ -127,7 +127,7 @@ public function addRule(Rule $rule, ?Rule $oSibling = null): void } } - \array_splice($this->aRules[$sRule], $iPosition, 0, [$rule]); + \array_splice($this->aRules[$sRule], $position, 0, [$rule]); } /**