Moving reserved logic from tokenizer

Author: nilportugues

src/Tokenizer/Parser/Reserved.php

@@ -18,6 +18,45 @@
  */
 final class Reserved
 {
+    /**
+     * @param array  $matches
+     * @param string $previous
+     * @param string $string
+     * @param string $reservedTopLevel
+     * @param string $reservedNewLine
+     * @param string $boundaries
+     * @param string $reserved
+     *
+     * @return array
+     */
+    public static function isReserved(
+        array &$matches,
+        $previous,
+        $string,
+        $reservedTopLevel,
+        $reservedNewLine,
+        $boundaries,
+        $reserved
+    ) {
+        $reservedArray = [];
+
+        if (Reserved::isReservedPrecededByDotCharacter($previous)) {
+            if (Reserved::isReservedString($string, $matches, $reservedTopLevel, $boundaries)) {
+                $reservedArray = Reserved::getReservedTopLevelString($string, $matches);
+            }
+
+            if (empty($reservedArray) && Reserved::isReservedString($string, $matches, $reservedNewLine, $boundaries)) {
+                $reservedArray = Reserved::getReservedNewLineString($string, $matches);
+            }
+
+            if (empty($reservedArray) && Reserved::isReservedString($string, $matches, $reserved, $boundaries)) {
+                $reservedArray = Reserved::getReservedString($string, $matches);
+            }
+        }
+
+        return $reservedArray;
+    }
+
     /**
      * A reserved word cannot be preceded by a "." in order to differentiate "mytable.from" from the token "from".
      *
@@ -30,45 +69,47 @@ public static function isReservedPrecededByDotCharacter($previous)
         return !$previous || !isset($previous[Tokenizer::TOKEN_VALUE]) || $previous[Tokenizer::TOKEN_VALUE] !== '.';
     }
 
-
     /**
-     * @param       string $string
-     * @param array        $matches
+     * @param       string        $upper
+     * @param array               $matches
+     * @param              string $regexReserved
+     * @param              string $regexBoundaries
      *
-     * @return array
+     * @return bool
      */
-    public static function getReservedTopLevelString($string, array &$matches)
+    public static function isReservedString($upper, array &$matches, $regexReserved, $regexBoundaries)
     {
-        return self::getStringTypeArray(Tokenizer::TOKEN_TYPE_RESERVED_TOP_LEVEL, $string, $matches);
+        return 1 == preg_match(
+            '/^(' . $regexReserved . ')($|\s|' . $regexBoundaries . ')/',
+            strtoupper($upper),
+            $matches
+        );
     }
 
-
     /**
      * @param       string $string
      * @param array        $matches
      *
      * @return array
      */
-    public static function getReservedNewLineString($string, array &$matches)
+    public static function getReservedTopLevelString($string, array &$matches)
     {
-        return self::getStringTypeArray(Tokenizer::TOKEN_TYPE_RESERVED_NEWLINE, strtoupper($string), $matches);
+        return self::getStringTypeArray(Tokenizer::TOKEN_TYPE_RESERVED_TOP_LEVEL, $string, $matches);
     }
 
     /**
-     * @param       string $upper
+     * @param              $type
+     * @param       string $string
      * @param array        $matches
-     * @param              string $regexReserved
-     * @param              string $regexBoundaries
      *
-     * @return bool
+     * @return array
      */
-    public static function isReservedString($upper, array &$matches, $regexReserved, $regexBoundaries)
+    protected static function getStringTypeArray($type, $string, array &$matches)
     {
-        return 1 == preg_match(
-            '/^(' . $regexReserved . ')($|\s|' . $regexBoundaries . ')/',
-            strtoupper($upper),
-            $matches
-        );
+        return [
+            Tokenizer::TOKEN_TYPE  => $type,
+            Tokenizer::TOKEN_VALUE => substr($string, 0, strlen($matches[1]))
+        ];
     }
 
     /**
@@ -77,23 +118,19 @@ public static function isReservedString($upper, array &$matches, $regexReserved,
      *
      * @return array
      */
-    public static function getReservedString($string, array &$matches)
+    public static function getReservedNewLineString($string, array &$matches)
     {
-        return self::getStringTypeArray(Tokenizer::TOKEN_TYPE_RESERVED, $string, $matches);
+        return self::getStringTypeArray(Tokenizer::TOKEN_TYPE_RESERVED_NEWLINE, strtoupper($string), $matches);
     }
 
     /**
-     * @param       $type
      * @param       string $string
-     * @param array $matches
+     * @param array        $matches
      *
      * @return array
      */
-    protected static function getStringTypeArray($type, $string, array &$matches)
+    public static function getReservedString($string, array &$matches)
     {
-        return [
-            Tokenizer::TOKEN_TYPE  => $type,
-            Tokenizer::TOKEN_VALUE => substr($string, 0, strlen($matches[1]))
-        ];
+        return self::getStringTypeArray(Tokenizer::TOKEN_TYPE_RESERVED, $string, $matches);
     }
 }

src/Tokenizer/Tokenizer.php

@@ -228,30 +228,18 @@ protected function getNextToken($string, $previous = null)
             return Boundary::getBoundaryCharacter($matches);
         }
 
-        if (Reserved::isReservedPrecededByDotCharacter($previous)) {
-            if (Reserved::isReservedString(
-                $string,
-                $matches,
-                $this->regexReservedTopLevel,
-                $this->regexBoundaries
-            )
-            ) {
-                return Reserved::getReservedTopLevelString($string, $matches);
-            }
-
-            if (Reserved::isReservedString(
-                $string,
-                $matches,
-                $this->regexReservedNewLine,
-                $this->regexBoundaries
-            )
-            ) {
-                return Reserved::getReservedNewLineString($string, $matches);
-            }
-
-            if (Reserved::isReservedString($string, $matches, $this->regexReserved, $this->regexBoundaries)) {
-                return Reserved::getReservedString($string, $matches);
-            }
+        $isReserved = Reserved::isReserved(
+            $matches,
+            $previous,
+            $string,
+            $this->regexReservedTopLevel,
+            $this->regexReservedNewLine,
+            $this->regexBoundaries,
+            $this->regexReserved
+        );
+
+        if (0 !== count($isReserved)) {
+            return $isReserved;
         }
 
         if (String::isFunctionString($string, $matches, $this->regexFunction)) {