Full support for arrays => min, max and avg funcs accept array argument. Also array function is defined which return arguments as array. Square bracket arrays are also supported. (#108)

valid expression -> "max([1,2,3])"
valid expression -> "max(array(1,2,3))"
valid expression -> "max($ages_arr)"
valid expression -> "max(ages_arr())"

2 files changed, 11 insertions, 3 deletions

diff --git a/src/NXP/Classes/Tokenizer.php b/src/NXP/Classes/Tokenizer.php
index 23e1cc9..c8b415d 100644
--- a/src/NXP/Classes/Tokenizer.php
+++ b/src/NXP/Classes/Tokenizer.php
@@ -76,6 +76,13 @@ class Tokenizer
 
                     continue 2;
 
+                case '[' === $ch:
+                    $this->tokens[] = new Token(Token::Function, 'array');
+                    $this->allowNegative = true;
+                    $this->tokens[] = new Token(Token::LeftParenthesis, '');
+
+                    continue 2;
+
                 case ' ' == $ch || "\n" == $ch || "\r" == $ch || "\t" == $ch:
                     $this->tokens[] = new Token(Token::Space, '');
 
@@ -140,7 +147,7 @@ class Tokenizer
 
                     break;
 
-                case $this->isRP($ch):
+                case $this->isRP($ch) || ']' === $ch :
                     $this->emptyNumberBufferAsLiteral();
                     $this->emptyStrBufferAsVariable();
                     $this->allowNegative = false;
@@ -196,8 +203,8 @@ class Tokenizer
     }
 
     /**
-     * @throws UnknownOperatorException
      * @throws IncorrectBracketsException
+     * @throws UnknownOperatorException
      * @return Token[] Array of tokens in revers polish notation
      */
     public function buildReversePolishNotation() : array
diff --git a/src/NXP/MathExecutor.php b/src/NXP/MathExecutor.php
index e7e8259..dd90e22 100644
--- a/src/NXP/MathExecutor.php
+++ b/src/NXP/MathExecutor.php
@@ -469,7 +469,8 @@ class MathExecutor
           'tan' => static fn($arg) => \tan($arg),
           'tanh' => static fn($arg) => \tanh($arg),
           'tn' => static fn($arg) => \tan($arg),
-          'tg' => static fn($arg) => \tan($arg)
+          'tg' => static fn($arg) => \tan($arg),
+          'array' => static fn(...$args) => [...$args]
         ];
     }