Fixed function parameter order (#42)v0.7.1

* Fixed parsing for ()

* sync (#5)

* Documentation fixes (#34)

Fixing typos in and clarifying documentation.

* MathExecutor allow override default operators, functions and vars (#36)

* Added simple coc (#37)

* Added simple coc

* Fix

* Replaceable operators (#38)

* Updated from NeonXP/MathExecutor

* Fixed function in () block issue

* Fixing typos in and clarifying documentation.

* Syncing from origin (#3)

* Documentation fixes (#34)

Fixing typos in and clarifying documentation.

* MathExecutor allow override default operators, functions and vars (#36)

* Allow for operators to be replaced based on regex expression

* Fix md typo (#39)

* Updated from NeonXP/MathExecutor

* Fixed function in () block issue

* Fixing typos in and clarifying documentation.

* Syncing from origin (#3)

* Documentation fixes (#34)

Fixing typos in and clarifying documentation.

* MathExecutor allow override default operators, functions and vars (#36)

* Syncing to origin (#4)

* Documentation fixes (#34)

Fixing typos in and clarifying documentation.

* MathExecutor allow override default operators, functions and vars (#36)

* Added simple coc (#37)

* Added simple coc

* Fix

* Replaceable operators (#38)

* Updated from NeonXP/MathExecutor

* Fixed function in () block issue

* Fixing typos in and clarifying documentation.

* Syncing from origin (#3)

* Documentation fixes (#34)

Fixing typos in and clarifying documentation.

* MathExecutor allow override default operators, functions and vars (#36)

* Allow for operators to be replaced based on regex expression

* \\ instead of \

* Update README.md

Some small fixes

* Fix single quotes parsing (#41)

* Fix single quotes parsing
Fix e-mails
Some small fixes

* Mistake in test

* More PHP versions

* Update README.md

Deleted `dev` branch

* Fixed function parameter order

Corrected $places default value for addFunction to match TokenFactory
Added function order test and put expected order first in assertEquals
If else blocks in calculator
Updated docs

3 files changed, 7 insertions, 11 deletions

diff --git a/src/NXP/Classes/Calculator.php b/src/NXP/Classes/Calculator.php
index 1ceac84..62dbc17 100644
--- a/src/NXP/Classes/Calculator.php
+++ b/src/NXP/Classes/Calculator.php
@@ -38,22 +38,18 @@ class Calculator
         foreach ($tokens as $token) {
             if ($token instanceof TokenNumber) {
                 array_push($stack, $token);
-            }
-            if ($token instanceof TokenStringDoubleQuoted) {
+            } else if ($token instanceof TokenStringDoubleQuoted) {
                 array_push($stack, $token);
-            }
-            if ($token instanceof TokenStringSingleQuoted) {
+            } else if ($token instanceof TokenStringSingleQuoted) {
                 array_push($stack, $token);
-            }
-            if ($token instanceof TokenVariable) {
+            } else if ($token instanceof TokenVariable) {
                 $variable = $token->getValue();
                 if (!array_key_exists($variable, $variables)) {
                     throw new UnknownVariableException($variable);
                 }
                 $value = $variables[$variable];
                 array_push($stack, new TokenNumber($value));
-            }
-            if ($token instanceof InterfaceOperator || $token instanceof TokenFunction) {
+            } else if ($token instanceof InterfaceOperator || $token instanceof TokenFunction) {
                 array_push($stack, $token->execute($stack));
             }
         }
diff --git a/src/NXP/Classes/Token/TokenFunction.php b/src/NXP/Classes/Token/TokenFunction.php
index b2866c3..04eae30 100644
--- a/src/NXP/Classes/Token/TokenFunction.php
+++ b/src/NXP/Classes/Token/TokenFunction.php
@@ -32,9 +32,9 @@ class TokenFunction extends AbstractContainerToken implements InterfaceFunction
         $args = [];
         list($places, $function) = $this->value;
         for ($i = 0; $i < $places; $i++) {
-            array_push($args, array_pop($stack)->getValue());
+            $args[] = array_pop($stack)->getValue();
         }
-        $result = call_user_func_array($function, $args);
+        $result = call_user_func_array($function, array_reverse($args));
 
         return new TokenNumber($result);
     }
diff --git a/src/NXP/MathExecutor.php b/src/NXP/MathExecutor.php
index 29c6a64..6325d35 100644
--- a/src/NXP/MathExecutor.php
+++ b/src/NXP/MathExecutor.php
@@ -174,7 +174,7 @@ class MathExecutor
      * @return MathExecutor
      * @throws \ReflectionException
      */
-    public function addFunction($name, $function = null, $places = 1)
+    public function addFunction($name, $function = null, $places = null)
     {
         $this->tokenFactory->addFunction($name, $function, $places);