Merge branch 'master' of https://github.com/phpfui/MathExecutor

# Conflicts:
#	src/NXP/Classes/Token/TokenFunction.php

2 files changed, 31 insertions, 2 deletions

diff --git a/src/NXP/Classes/Token/TokenComma.php b/src/NXP/Classes/Token/TokenComma.php
index 6a45595..f6fc068 100644
--- a/src/NXP/Classes/Token/TokenComma.php
+++ b/src/NXP/Classes/Token/TokenComma.php
@@ -13,7 +13,7 @@ namespace NXP\Classes\Token;
 /**
  * @author Alexander Kiryukhin <a.kiryukhin@mail.ru>
  */
-class TokenComma implements InterfaceToken
+class TokenComma extends AbstractOperator
 {
     /**
      * @return string
@@ -22,4 +22,32 @@ class TokenComma implements InterfaceToken
     {
         return '\,';
     }
+
+    /**
+     * Comma operator is lowest priority
+     *
+     * @return int
+     */
+    public function getPriority()
+    {
+        return 0;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAssociation()
+    {
+        return self::LEFT_ASSOC;
+    }
+
+    /**
+     * @param  array       $stack
+     * @return TokenNumber
+     */
+    public function execute(&$stack)
+    {
+        // Comma operators don't do anything, stack has already executed
+    }
+
 }
diff --git a/src/NXP/Classes/Token/TokenFunction.php b/src/NXP/Classes/Token/TokenFunction.php
index d61bb5d..432f107 100644
--- a/src/NXP/Classes/Token/TokenFunction.php
+++ b/src/NXP/Classes/Token/TokenFunction.php
@@ -32,8 +32,9 @@ class TokenFunction extends AbstractContainerToken implements InterfaceFunction
         $args = [];
         list($places, $function) = $this->value;
         for ($i = 0; $i < $places; $i++) {
-            $args[] = array_shift($stack)->getValue();
+            array_unshift($args, array_pop($stack)->getValue());
         }
+
         $result = call_user_func_array($function, $args);
 
         return new TokenNumber($result);