+ Added cache, which speeds up the repetitive calculations

+ Returned variables, because they need for cached expressions

1 files changed, 4 insertions, 0 deletions

diff --git a/src/NXP/Classes/Lexer.php b/src/NXP/Classes/Lexer.php
index 676962d..63a87b2 100644
--- a/src/NXP/Classes/Lexer.php
+++ b/src/NXP/Classes/Lexer.php
@@ -16,6 +16,7 @@ use NXP\Classes\Token\TokenFunction;
 use NXP\Classes\Token\TokenLeftBracket;
 use NXP\Classes\Token\TokenNumber;
 use NXP\Classes\Token\TokenRightBracket;
+use NXP\Classes\Token\TokenVariable;
 use NXP\Exception\IncorrectBracketsException;
 use NXP\Exception\IncorrectExpressionException;
 
@@ -67,6 +68,9 @@ class Lexer
             if ($token instanceof TokenNumber) {
                 $output[] = $token;
             }
+            if ($token instanceof TokenVariable) {
+                $output[] = $token;
+            }
             if ($token instanceof TokenFunction) {
                 array_push($stack, $token);
             }