Variable fixes (#67)V2.0.3

* Reproduce if throws UnknownOperatorException

* Fix variable detection

* Adding IncorrectNumberOfFunctionParametersException

* Removing tabs

* Better exception message text

4 files changed, 13 insertions, 11 deletions

diff --git a/src/NXP/Classes/Calculator.php b/src/NXP/Classes/Calculator.php
index 94c6933..bcb4b4e 100644
--- a/src/NXP/Classes/Calculator.php
+++ b/src/NXP/Classes/Calculator.php
@@ -77,7 +77,7 @@ class Calculator
         }
         $result = array_pop($stack);
         if ($result === null || !empty($stack)) {
-            throw new IncorrectExpressionException();
+            throw new IncorrectExpressionException('Stack must be empty');
         }
         return $result->value;
     }
diff --git a/src/NXP/Classes/CustomFunction.php b/src/NXP/Classes/CustomFunction.php
index 06e21ef..f127ad2 100644
--- a/src/NXP/Classes/CustomFunction.php
+++ b/src/NXP/Classes/CustomFunction.php
@@ -3,7 +3,7 @@
 
 namespace NXP\Classes;
 
-use NXP\Exception\IncorrectExpressionException;
+use NXP\Exception\IncorrectNumberOfFunctionParametersException;
 use ReflectionException;
 use ReflectionFunction;
 
@@ -30,6 +30,7 @@ class CustomFunction
      * @param callable $function
      * @param int $places
      * @throws ReflectionException
+     * @throws IncorrectNumberOfFunctionParametersException
      */
     public function __construct(string $name, callable $function, ?int $places = null)
     {
@@ -46,7 +47,7 @@ class CustomFunction
     public function execute(array &$stack) : Token
     {
         if (count($stack) < $this->places) {
-            throw new IncorrectExpressionException();
+            throw new IncorrectNumberOfFunctionParametersException($this->name);
         }
         $args = [];
         for ($i = 0; $i < $this->places; $i++) {
diff --git a/src/NXP/Classes/Operator.php b/src/NXP/Classes/Operator.php
index 86df549..00485bc 100644
--- a/src/NXP/Classes/Operator.php
+++ b/src/NXP/Classes/Operator.php
@@ -46,7 +46,6 @@ class Operator
         $this->isRightAssoc = $isRightAssoc;
         $this->priority = $priority;
         $this->function = $function;
-        $this->function = $function;
         $reflection = new ReflectionFunction($function);
         $this->places = $reflection->getNumberOfParameters();
     }
diff --git a/src/NXP/Classes/Tokenizer.php b/src/NXP/Classes/Tokenizer.php
index 6b14677..203724a 100644
--- a/src/NXP/Classes/Tokenizer.php
+++ b/src/NXP/Classes/Tokenizer.php
@@ -157,14 +157,16 @@ class Tokenizer
                     }
                     $this->emptyNumberBufferAsLiteral();
                     $this->emptyStrBufferAsVariable();
-                    if (count($this->tokens) > 0) {
-                        if ($this->tokens[count($this->tokens) - 1]->type === Token::Operator) {
-                            $this->tokens[count($this->tokens) - 1]->value .= $ch;
+                    if ($ch != '$') {
+                        if (count($this->tokens) > 0) {
+                            if ($this->tokens[count($this->tokens) - 1]->type === Token::Operator) {
+                                $this->tokens[count($this->tokens) - 1]->value .= $ch;
+                            } else {
+                                $this->tokens[] = new Token(Token::Operator, $ch);
+                            }
                         } else {
                             $this->tokens[] = new Token(Token::Operator, $ch);
                         }
-                    } else {
-                        $this->tokens[] = new Token(Token::Operator, $ch);
                     }
                     $this->allowNegative = true;
             }
@@ -251,12 +253,12 @@ class Tokenizer
                     break;
                 case Token::Operator:
                     if (!array_key_exists($token->value, $this->operators)) {
-                        throw new UnknownOperatorException();
+                        throw new UnknownOperatorException($token->value);
                     }
                     $op1 = $this->operators[$token->value];
                     while ($stack->count() > 0 && $stack->top()->type === Token::Operator) {
                         if (!array_key_exists($stack->top()->value, $this->operators)) {
-                            throw new UnknownOperatorException();
+                            throw new UnknownOperatorException($stack->top()->value);
                         }
                         $op2 = $this->operators[$stack->top()->value];
                         if ($op2->priority >= $op1->priority) {