Refactor

Author: Nico

src/nicoSWD/Rules/AST/BaseNode.php

@@ -107,20 +107,22 @@ protected function getMethodName()
 
     /**
      * @since 0.3.4
+     * @param string $stopAt
      * @return mixed[]
      * @throws ParserException
      */
-    protected function getFunctionArgs()
+    protected function getCommaSeparatedValues($stopAt = ')')
     {
         $commaExpected = \false;
-        $arguments = [];
+        $items = [];
 
         do {
             $this->ast->next();
 
             if (!$current = $this->ast->current()) {
                 throw new ParserException(sprintf(
-                    'Unexpected end of string. Expected ")"'
+                    'Unexpected end of string. Expected "%s"',
+                    $stopAt
                 ));
             }
 
@@ -136,7 +138,7 @@ protected function getFunctionArgs()
                 }
 
                 $commaExpected = \true;
-                $arguments[] = $value;
+                $items[] = $value;
             } elseif ($current instanceof Tokens\TokenComma) {
                 if (!$commaExpected) {
                     throw new ParserException(sprintf(
@@ -147,7 +149,7 @@ protected function getFunctionArgs()
                 }
 
                 $commaExpected = \false;
-            } elseif ($value === ')') {
+            } elseif ($value === $stopAt) {
                 break;
             } elseif (!$this->isIgnoredToken($current)) {
                 throw new ParserException(sprintf(
@@ -159,15 +161,15 @@ protected function getFunctionArgs()
             }
         } while ($this->ast->valid());
 
-        if (!$commaExpected && !empty($arguments)) {
+        if (!$commaExpected && !empty($items)) {
             throw new ParserException(sprintf(
                 'Unexpected token "," at position %d on line %d',
                 $current->getPosition(),
                 $current->getLine()
             ));
         }
 
-        return $arguments;
+        return $items;
     }
 
     /**

src/nicoSWD/Rules/AST/NodeArray.php

@@ -8,11 +8,7 @@
  */
 namespace nicoSWD\Rules\AST;
 
-use nicoSWD\Rules\Constants;
-use nicoSWD\Rules\Exceptions\ParserException;
-use nicoSWD\Rules\Tokens\BaseToken;
 use nicoSWD\Rules\Tokens\TokenArray;
-use nicoSWD\Rules\Tokens\TokenComma;
 
 /**
  * Class NodeArray
@@ -21,72 +17,17 @@
 final class NodeArray extends BaseNode
 {
     /**
-     * @return BaseToken
-     * @throws ParserException
+     * @return \nicoSWD\Rules\Tokens\BaseToken
+     * @throws \nicoSWD\Rules\Exceptions\ParserException
      */
     public function getNode()
     {
         $stack = $this->ast->getStack();
         $offset = $stack->current()->getOffset();
-        $commaExpected = \false;
-        $items = [];
-
-        do {
-            $stack->next();
-
-            if (!$current = $stack->current()) {
-                throw new ParserException(sprintf(
-                    'Unexpected end of string. Expected "]"'
-                ));
-            }
-
-            $value = $current->getValue();
-
-            if ($current->getGroup() === Constants::GROUP_VALUE) {
-                if ($commaExpected) {
-                    throw new ParserException(sprintf(
-                        'Unexpected value at position %d on line %d',
-                        $current->getPosition(),
-                        $current->getLine()
-                    ));
-                }
-
-                $commaExpected = \true;
-                $items[] = $value;
-            } elseif ($current instanceof TokenComma) {
-                if (!$commaExpected) {
-                    throw new ParserException(sprintf(
-                        'Unexpected token "," at position %d on line %d',
-                        $current->getPosition(),
-                        $current->getLine()
-                    ));
-                }
-
-                $commaExpected = \false;
-            } elseif ($value === ']') {
-                break;
-            } elseif (!$this->isIgnoredToken($current)) {
-                throw new ParserException(sprintf(
-                    'Unexpected token "%s" at position %d on line %d',
-                    $current->getOriginalValue(),
-                    $current->getPosition(),
-                    $current->getLine()
-                ));
-            }
-        } while ($stack->valid());
-
-        if (!$commaExpected && !empty($items)) {
-            throw new ParserException(sprintf(
-                'Unexpected token "," at position %d on line %d',
-                $current->getPosition(),
-                $current->getLine()
-            ));
-        }
-
-        $token = new TokenArray($items, $offset, $stack);
+        $token = new TokenArray($this->getCommaSeparatedValues(']'), $offset, $stack);
 
         while ($this->hasMethodCall()) {
-            $token = $this->getMethod($token)->call($this->getFunctionArgs());
+            $token = $this->getMethod($token)->call($this->getCommaSeparatedValues());
         }
 
         return $token;

src/nicoSWD/Rules/AST/NodeString.php

@@ -22,7 +22,7 @@ public function getNode()
         $current = $this->ast->getStack()->current();
 
         while ($current->supportsMethodCalls() && $this->hasMethodCall()) {
-            $current = $this->getMethod($current)->call($this->getFunctionArgs());
+            $current = $this->getMethod($current)->call($this->getCommaSeparatedValues());
         }
 
         return $current;

src/nicoSWD/Rules/AST/NodeVariable.php

@@ -49,7 +49,7 @@ public function getNode()
         $current->setStack($this->ast->getStack());
 
         while ($this->hasMethodCall()) {
-            $current = $this->getMethod($current)->call($this->getFunctionArgs());
+            $current = $this->getMethod($current)->call($this->getCommaSeparatedValues());
         }
 
         return $current;

tests/methods/JoinTest.php

@@ -39,14 +39,8 @@ public function testCallOnStringLiteralArray()
         $this->assertTrue($this->evaluate('[1, 2, 3] . join("|") === "1|2|3"'));
     }
 
-    /**
-     * Not currently supported.
-     *
-     * @expectedException \Exception
-     * @expectedExceptionMessage Unexpected token "foo" at position 7 on line 1
-     */
-    public function testIfVariableInsideArrayThrowsException()
+    public function testVariableInArrayIsJoined()
     {
-        $this->evaluate('[1, 2, foo].join("|") === "1|2|3"');
+        $this->assertTrue($this->evaluate('[1, 2, foo].join("|") === "1|2|3"', ['foo' => 3]));
     }
 }