NeonXP/MathExecutor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed Lexor to correctly generate reverse polish notation (#33)

Browse source 
* Updated from NeonXP/MathExecutor

* Fixed function in () block issue
This commit is contained in:
Bruce Wells 2018-11-26 10:06:26 -05:00 committed by GitHub
parent aa12a41b1b
commit d50b665927
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 151 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
README.md
View file

@ -3,18 +3,19 @@
A simple math expressions calculator
## Features:
* Built in support for +, -, *, / and power (^) operators
* Built in support for +, -, *, / and power (^) operators plus ()
* Support for user defined operators
* Support for user defined functions
* Unlimited varable length
* Unlimited varable name lengths
* String support, as function parameters or as evaluated by PHP
* Exceptions on divide by zero, or treat as zero
* Unary Minus
* Pi ($pi) and Euler's number ($e) support to 11 decimal places
## Install via Composer:
Stable branch
```
composer require "nxp/math-executor" "dev-master"
composer require "nxp/math-executor"
```
Dev branch (currently unsupported)

65
src/NXP/Classes/Lexer.php
View file

@ -9,6 +9,7 @@
*/
namespace NXP\Classes;
use NXP\Classes\Token\AbstractOperator;
use NXP\Classes\Token\InterfaceOperator;
use NXP\Classes\Token\TokenComma;
@ -70,52 +71,54 @@ class Lexer
if ($token instanceof TokenString) {
$output[] = $token;
}
if ($token instanceof TokenNumber) {
elseif ($token instanceof TokenNumber) {
$output[] = $token;
}
if ($token instanceof TokenVariable) {
elseif ($token instanceof TokenVariable) {
$output[] = $token;
}
if ($token instanceof TokenFunction) {
elseif ($token instanceof TokenFunction) {
array_push($stack, $token);
}
if ($token instanceof TokenLeftBracket) {
elseif ($token instanceof AbstractOperator) {
// While we have something on the stack
while (($count = count($stack)) > 0
&& (
// If it is a function
($stack[$count-1] instanceof TokenFunction)
||
// Or the operator at the top of the operator stack
// has (left associative and equal precedence)
// or has greater precedence
(($stack[$count-1] instanceof InterfaceOperator) &&
(
($stack[$count-1]->getAssociation() == AbstractOperator::LEFT_ASSOC &&
$token->getPriority() == $stack[$count-1]->getPriority())
||
($stack[$count-1]->getPriority() > $token->getPriority())
)
)
)
// And not a left bracket
&& ( ! ($stack[$count-1] instanceof TokenLeftBracket)) ) {
$output[] = array_pop($stack);
}
array_push($stack, $token);
}
if ($token instanceof TokenComma) {
while (($current = array_pop($stack)) && (!$current instanceof TokenLeftBracket)) {
$output[] = $current;
if (empty($stack)) {
throw new IncorrectExpressionException();
elseif ($token instanceof TokenLeftBracket) {
array_push($stack, $token);
}
}
}
if ($token instanceof TokenRightBracket) {
while (($current = array_pop($stack)) && (!$current instanceof TokenLeftBracket)) {
elseif ($token instanceof TokenRightBracket) {
while (($current = array_pop($stack)) && ( ! ($current instanceof TokenLeftBracket))) {
$output[] = $current;
}
if (!empty($stack) && ($stack[count($stack)-1] instanceof TokenFunction)) {
$output[] = array_pop($stack);
}
}
if ($token instanceof AbstractOperator) {
while (
count($stack) > 0 &&
($stack[count($stack)-1] instanceof InterfaceOperator) &&
((
$token->getAssociation() == AbstractOperator::LEFT_ASSOC &&
$token->getPriority() <= $stack[count($stack)-1]->getPriority()
) || (
$token->getAssociation() == AbstractOperator::RIGHT_ASSOC &&
$token->getPriority() < $stack[count($stack)-1]->getPriority()
))
) {
$output[] = array_pop($stack);
}
array_push($stack, $token);
}
}
while (!empty($stack)) {
$token = array_pop($stack);

14
tests/MathTest.php
View file

@ -69,7 +69,21 @@ class MathTest extends \PHPUnit_Framework_TestCase
['(2 + 2)*-2'],
['(2+-2)*2'],
['1 + 2 * 3 / (min(1, 5) + 2 + 1)'],
['1 + 2 * 3 / (min(1, 5) - 2 + 5)'],
['1 + 2 * 3 / (min(1, 5) * 2 + 1)'],
['1 + 2 * 3 / (min(1, 5) / 2 + 1)'],
['1 + 2 * 3 / (min(1, 5) / 2 * 1)'],
['1 + 2 * 3 / (min(1, 5) / 2 / 1)'],
['1 + 2 * 3 / (3 + min(1, 5) + 2 + 1)'],
['1 + 2 * 3 / (3 - min(1, 5) - 2 + 1)'],
['1 + 2 * 3 / (3 * min(1, 5) * 2 + 1)'],
['1 + 2 * 3 / (3 / min(1, 5) / 2 + 1)'],
['sin(10) * cos(50) / min(10, 20/2)'],
['sin(10) * cos(50) / min(10, (20/2))'],
['sin(10) * cos(50) / min(10, (max(10,20)/2))'],
['100500 * 3.5E5'],
['100500 * 3.5E-5'],