From db284506d426b1dcd443eb72d03f566b05ac8d3e Mon Sep 17 00:00:00 2001
From: Oliver Klee <github@oliverklee.de>
Date: Mon, 24 Feb 2025 10:50:47 +0100
Subject: [PATCH 1/2] [CLEANUP] Avoid Hungarian notation for `start(Position)`

Part of #756
---
 src/Parsing/ParserState.php | 14 +++++++-------
 src/Value/Value.php         | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Parsing/ParserState.php b/src/Parsing/ParserState.php
index 35e495cb..5a8c6884 100644
--- a/src/Parsing/ParserState.php
+++ b/src/Parsing/ParserState.php
@@ -424,21 +424,21 @@ public function strlen($string): int
     }
 
     /**
-     * @param int $iStart
+     * @param int $start
      * @param int $length
      */
-    private function substr($iStart, $length): string
+    private function substr($start, $length): string
     {
         if ($length < 0) {
-            $length = \count($this->characters) - $iStart + $length;
+            $length = \count($this->characters) - $start + $length;
         }
-        if ($iStart + $length > \count($this->characters)) {
-            $length = \count($this->characters) - $iStart;
+        if ($start + $length > \count($this->characters)) {
+            $length = \count($this->characters) - $start;
         }
         $result = '';
         while ($length > 0) {
-            $result .= $this->characters[$iStart];
-            $iStart++;
+            $result .= $this->characters[$start];
+            $start++;
             $length--;
         }
         return $result;
diff --git a/src/Value/Value.php b/src/Value/Value.php
index e2082d5e..cfeb17b0 100644
--- a/src/Value/Value.php
+++ b/src/Value/Value.php
@@ -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 ($startPosition = 0; $startPosition < $iStackLength; ++$startPosition) {
+                if ($startPosition === ($iStackLength - 1) || $sDelimiter !== $aStack[$startPosition + 1]) {
+                    $aNewStack[] = $aStack[$startPosition];
                     continue;
                 }
                 $length = 2; //Number of elements to be joined
-                for ($i = $iStartPosition + 3; $i < $iStackLength; $i += 2, ++$length) {
+                for ($i = $startPosition + 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 = $startPosition; $i - $startPosition < $length * 2; $i += 2) {
                     $list->addListComponent($aStack[$i]);
                 }
                 $aNewStack[] = $list;
-                $iStartPosition += $length * 2 - 2;
+                $startPosition += $length * 2 - 2;
             }
             $aStack = $aNewStack;
         }

From ed47f1ed89ace1776f3b17e1dd7fd4d3b293c383 Mon Sep 17 00:00:00 2001
From: Oliver Klee <github@oliverklee.de>
Date: Mon, 24 Feb 2025 12:06:07 +0100
Subject: [PATCH 2/2] Changes suggested in code review

---
 src/Parsing/ParserState.php | 14 +++++++-------
 src/Value/Value.php         | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Parsing/ParserState.php b/src/Parsing/ParserState.php
index 5a8c6884..000d4f98 100644
--- a/src/Parsing/ParserState.php
+++ b/src/Parsing/ParserState.php
@@ -424,21 +424,21 @@ public function strlen($string): int
     }
 
     /**
-     * @param int $start
+     * @param int $offset
      * @param int $length
      */
-    private function substr($start, $length): string
+    private function substr($offset, $length): string
     {
         if ($length < 0) {
-            $length = \count($this->characters) - $start + $length;
+            $length = \count($this->characters) - $offset + $length;
         }
-        if ($start + $length > \count($this->characters)) {
-            $length = \count($this->characters) - $start;
+        if ($offset + $length > \count($this->characters)) {
+            $length = \count($this->characters) - $offset;
         }
         $result = '';
         while ($length > 0) {
-            $result .= $this->characters[$start];
-            $start++;
+            $result .= $this->characters[$offset];
+            $offset++;
             $length--;
         }
         return $result;
diff --git a/src/Value/Value.php b/src/Value/Value.php
index cfeb17b0..2cb6eeb4 100644
--- a/src/Value/Value.php
+++ b/src/Value/Value.php
@@ -78,23 +78,23 @@ public static function parseValue(ParserState $parserState, array $aListDelimite
                 return $aStack[0];
             }
             $aNewStack = [];
-            for ($startPosition = 0; $startPosition < $iStackLength; ++$startPosition) {
-                if ($startPosition === ($iStackLength - 1) || $sDelimiter !== $aStack[$startPosition + 1]) {
-                    $aNewStack[] = $aStack[$startPosition];
+            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 = $startPosition + 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 = $startPosition; $i - $startPosition < $length * 2; $i += 2) {
+                for ($i = $offset; $i - $offset < $length * 2; $i += 2) {
                     $list->addListComponent($aStack[$i]);
                 }
                 $aNewStack[] = $list;
-                $startPosition += $length * 2 - 2;
+                $offset += $length * 2 - 2;
             }
             $aStack = $aNewStack;
         }