Merge branch 'ng' of https://github.com/neonxp/MathExecutor into neonxp-ng

# Conflicts:
#	src/NXP/Classes/Calculator.php
#	src/NXP/Classes/Lexer.php
#	src/NXP/Classes/Token/AbstractOperator.php
#	src/NXP/Classes/TokenFactory.php
#	src/NXP/MathExecutor.php

1 files changed, 0 insertions, 68 deletions

diff --git a/src/NXP/Classes/Token/TokenMinus.php b/src/NXP/Classes/Token/TokenMinus.php
deleted file mode 100644
index b4b04e3..0000000
--- a/src/NXP/Classes/Token/TokenMinus.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
-* This file is part of the MathExecutor package
-*
-* (c) Alexander Kiryukhin
-*
-* For the full copyright and license information, please view the LICENSE
-* file that was distributed with this source code
-*/
-
-namespace NXP\Classes\Token;
-
-use NXP\Exception\IncorrectExpressionException;
-
-/**
-* @author Alexander Kiryukhin <a.kiryukhin@mail.ru>
-*/
-class TokenMinus extends AbstractOperator
-{
-    /**
-     * @return string
-     */
-    public static function getRegex()
-    {
-        return '\-';
-    }
-
-    /**
-     * @return int
-     */
-    public function getPriority()
-    {
-        return 170;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAssociation()
-    {
-        return self::LEFT_ASSOC;
-    }
-
-    /**
-     * @param InterfaceToken[] $stack
-     *
-     * @return $this
-     *
-     * @throws \NXP\Exception\IncorrectExpressionException
-     */
-    public function execute(&$stack)
-    {
-        $op2 = array_pop($stack);
-        $op1 = array_pop($stack);
-
-        if ($op2 === null) {
-            throw new IncorrectExpressionException("Subtraction requires right operator");
-        }
-
-        if (!$op1) {
-            $op1 = new TokenNumber(0);
-        }
-
-        $result = $op1->getValue() - $op2->getValue();
-
-        return new TokenNumber($result);
-    }
-}