ArrayObj: Handle more complex expressions in arrays.

4 files changed, 82 insertions, 50 deletions

diff --git a/src/Components/ArrayObj.php b/src/Components/ArrayObj.php
index fb199ea..56c7247 100644
--- a/src/Components/ArrayObj.php
+++ b/src/Components/ArrayObj.php
@@ -63,20 +63,32 @@ class ArrayObj extends Component
         $ret = empty($options['type']) ? new ArrayObj() : array();
 
         /**
-         * The state of the parser.
+         * The last raw expression.
          *
-         * Below are the states of the parser.
-         *
-         *      0 -----------------------[ ( ]------------------------> 1
+         * @var string $lastRaw
+         */
+        $lastRaw = '';
+
+        /**
+         * The last value.
          *
-         *      1 ------------------[ array element ]-----------------> 2
+         * @var string $lastValue
+         */
+        $lastValue = '';
+
+        /**
+         * Counts brackets.
          *
-         *      2 ------------------------[ , ]-----------------------> 1
-         *      2 ------------------------[ ) ]-----------------------> (END)
+         * @var int $brackets
+         */
+        $brackets = 0;
+
+        /**
+         * Last separator (bracket or comma).
          *
-         * @var int $state
+         * @var boolean $isCommaLast
          */
-        $state = 0;
+        $isCommaLast = false;
 
         for (; $list->idx < $list->count; ++$list->idx) {
             /**
@@ -92,49 +104,72 @@ class ArrayObj extends Component
             }
 
             // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
+            if (($token->type === Token::TYPE_WHITESPACE)
+                || ($token->type === Token::TYPE_COMMENT)
+            ) {
+                $lastRaw .= $token->token;
+                $lastValue = trim($lastValue) .' ';
                 continue;
             }
 
-            if ($state === 0) {
-                if (($token->type !== Token::TYPE_OPERATOR) || ($token->value !== '(')) {
-                    $parser->error(
-                        __('An opening bracket was expected.'),
-                        $token
-                    );
-                    break;
-                }
-                $state = 1;
-            } elseif ($state === 1) {
-                if (($token->type === Token::TYPE_OPERATOR) && ($token->value === ')')) {
-                    // Empty array.
-                    break;
-                }
-                if (empty($options['type'])) {
-                    $ret->values[] = $token->value;
-                    $ret->raw[] = $token->token;
-                } else {
-                    $ret[] = $options['type']::parse(
-                        $parser,
-                        $list,
-                        empty($options['typeOptions']) ? array() : $options['typeOptions']
-                    );
-                }
-                $state = 2;
-            } elseif ($state === 2) {
-                if (($token->type !== Token::TYPE_OPERATOR) || (($token->value !== ',') && ($token->value !== ')'))) {
-                    $parser->error(
-                        __('A comma or a closing bracket was expected'),
-                        $token
-                    );
-                    break;
-                }
-                if ($token->value === ',') {
-                    $state = 1;
-                } else { // )
-                    break;
+            if (($brackets === 0)
+                && (($token->type !== Token::TYPE_OPERATOR)
+                || ($token->value !== '('))
+            ) {
+                $parser->error(__('An opening bracket was expected.'), $token);
+                break;
+            }
+
+            if ($token->type === Token::TYPE_OPERATOR) {
+                if ($token->value === '(') {
+                    if (++$brackets === 1) { // 1 is the base level.
+                        continue;
+                    }
+                } elseif ($token->value === ')') {
+                    if (--$brackets === 0) { // Array ended.
+                        break;
+                    }
+                } elseif ($token->value === ',') {
+                    if ($brackets === 1) {
+                        $isCommaLast = true;
+                        if (empty($options['type'])) {
+                            $ret->raw[] = trim($lastRaw);
+                            $ret->values[] = trim($lastValue);
+                            $lastRaw = $lastValue = '';
+                        }
+                    }
+                    continue;
                 }
             }
+
+            if (empty($options['type'])) {
+                $lastRaw .= $token->token;
+                $lastValue .= $token->value;
+            } else {
+                $ret[] = $options['type']::parse(
+                    $parser,
+                    $list,
+                    empty($options['typeOptions']) ? array() : $options['typeOptions']
+                );
+            }
+        }
+
+        // Handling last element.
+        //
+        // This is treated differently to treat the following cases:
+        //
+        //           => array()
+        //      (,)  => array('', '')
+        //      ()   => array()
+        //      (a,) => array('a', '')
+        //      (a)  => array('a')
+        //
+        $lastRaw = trim($lastRaw);
+        if ((empty($options['type']))
+            && ((strlen($lastRaw) > 0) || ($isCommaLast))
+        ) {
+            $ret->raw[] = $lastRaw;
+            $ret->values[] = trim($lastValue);
         }
 
         return $ret;
diff --git a/tests/Components/ArrayObjTest.php b/tests/Components/ArrayObjTest.php
index 00321ed..c71ab37 100644
--- a/tests/Components/ArrayObjTest.php
+++ b/tests/Components/ArrayObjTest.php
@@ -50,7 +50,6 @@ class ArrayObjTest extends TestCase
     {
         return array(
             array('parser/parseArrayErr1'),
-            array('parser/parseArrayErr2'),
             array('parser/parseArrayErr3'),
         );
     }
diff --git a/tests/data/parser/parseArrayErr2.in b/tests/data/parser/parseArrayErr2.in
deleted file mode 100644
index b29b07a..0000000
--- a/tests/data/parser/parseArrayErr2.in
+++ /dev/null
@@ -1 +0,0 @@
-SELECT * FROM foo PARTITION (bar baz) WHERE id > 0;
\ No newline at end of file
diff --git a/tests/data/parser/parseArrayErr2.out b/tests/data/parser/parseArrayErr2.out
deleted file mode 100644
index df120dd..0000000
--- a/tests/data/parser/parseArrayErr2.out
+++ /dev/null
@@ -1 +0,0 @@
-a:4:{s:5:"query";s:51:"SELECT * FROM foo PARTITION (bar baz) WHERE id > 0;";s:5:"lexer";O:15:"SqlParser\Lexer":8:{s:6:"strict";b:0;s:3:"str";s:51:"SELECT * FROM foo PARTITION (bar baz) WHERE id > 0;";s:3:"len";i:51;s:4:"last";i:51;s:4:"list";O:20:"SqlParser\TokensList":3:{s:6:"tokens";a:25:{i:0;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"SELECT";s:5:"value";s:6:"SELECT";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:0;}i:1;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:6;}i:2;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"*";s:5:"value";s:1:"*";s:4:"type";i:2;s:5:"flags";i:1;s:8:"position";i:7;}i:3;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:8;}i:4;O:15:"SqlParser\Token":5:{s:5:"token";s:4:"FROM";s:5:"value";s:4:"FROM";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:9;}i:5;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:13;}i:6;O:15:"SqlParser\Token":5:{s:5:"token";s:3:"foo";s:5:"value";s:3:"foo";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:14;}i:7;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:17;}i:8;O:15:"SqlParser\Token":5:{s:5:"token";s:9:"PARTITION";s:5:"value";s:9:"PARTITION";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:18;}i:9;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:27;}i:10;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"(";s:5:"value";s:1:"(";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:28;}i:11;O:15:"SqlParser\Token":5:{s:5:"token";s:3:"bar";s:5:"value";s:3:"bar";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:29;}i:12;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:32;}i:13;O:15:"SqlParser\Token":5:{s:5:"token";s:3:"baz";s:5:"value";s:3:"baz";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:33;}i:14;O:15:"SqlParser\Token":5:{s:5:"token";s:1:")";s:5:"value";s:1:")";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:36;}i:15;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:37;}i:16;O:15:"SqlParser\Token":5:{s:5:"token";s:5:"WHERE";s:5:"value";s:5:"WHERE";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:38;}i:17;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:43;}i:18;O:15:"SqlParser\Token":5:{s:5:"token";s:2:"id";s:5:"value";s:2:"id";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:44;}i:19;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:46;}i:20;O:15:"SqlParser\Token":5:{s:5:"token";s:1:">";s:5:"value";s:1:">";s:4:"type";i:2;s:5:"flags";i:2;s:8:"position";i:47;}i:21;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:48;}i:22;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"0";s:5:"value";i:0;s:4:"type";i:6;s:5:"flags";i:0;s:8:"position";i:49;}i:23;O:15:"SqlParser\Token":5:{s:5:"token";s:1:";";s:5:"value";s:1:";";s:4:"type";i:9;s:5:"flags";i:0;s:8:"position";i:50;}i:24;O:15:"SqlParser\Token":5:{s:5:"token";N;s:5:"value";N;s:4:"type";i:9;s:5:"flags";i:0;s:8:"position";N;}}s:5:"count";i:25;s:3:"idx";i:25;}s:9:"delimiter";s:1:";";s:12:"delimiterLen";i:1;s:6:"errors";a:0:{}}s:6:"parser";O:16:"SqlParser\Parser":4:{s:4:"list";r:8;s:6:"strict";b:0;s:6:"errors";a:0:{}s:10:"statements";a:1:{i:0;O:36:"SqlParser\Statements\SelectStatement":15:{s:4:"expr";a:1:{i:0;O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";N;s:6:"column";N;s:4:"expr";s:1:"*";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}}s:4:"from";a:1:{i:0;O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";s:3:"foo";s:6:"column";N;s:4:"expr";s:3:"foo";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}}s:9:"partition";O:29:"SqlParser\Components\ArrayObj":2:{s:3:"raw";a:1:{i:0;s:3:"bar";}s:6:"values";a:1:{i:0;s:3:"bar";}}s:5:"where";a:1:{i:0;O:30:"SqlParser\Components\Condition":3:{s:11:"identifiers";a:1:{i:0;s:2:"id";}s:10:"isOperator";b:0;s:4:"expr";s:6:"id > 0";}}s:5:"group";N;s:6:"having";N;s:5:"order";N;s:5:"limit";N;s:9:"procedure";N;s:4:"into";N;s:4:"join";N;s:5:"union";a:0:{}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:0:{}}s:5:"first";i:0;s:4:"last";i:22;}}}s:6:"errors";a:2:{s:5:"lexer";a:0:{}s:6:"parser";a:2:{i:0;a:3:{i:0;s:41:"A comma or a closing bracket was expected";i:1;r:88;i:2;i:0;}i:1;a:3:{i:0;s:17:"Unexpected token.";i:1;r:94;i:2;i:0;}}}}
\ No newline at end of file