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

Support for unary positive expressions (#85)

Browse source 
* Support for unary positive operator
This commit is contained in:
Javier Marín 2021-03-05 01:42:01 +01:00 committed by GitHub
parent 17cc5b9dc4
commit d99491c1f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/NXP/Classes/Tokenizer.php
View file

@ -150,11 +150,11 @@ class Tokenizer
$this->tokens[] = new Token(Token::ParamSeparator, '');
break;
default:
// special case for unary minus
if ($ch == '-') {
// special case for unary operations
if ($ch == '-' || $ch == '+') {
if ($this->allowNegative) {
$this->allowNegative = false;
$this->tokens[] = new Token(Token::Operator, '`');
$this->tokens[] = new Token(Token::Operator, $ch == '-' ? 'uNeg' : 'uPos');
continue 2;
}
// could be in exponent, in which case negative should be added to the numberBuffer

47
src/NXP/MathExecutor.php
View file

@ -16,8 +16,8 @@ use NXP\Classes\CustomFunction;
use NXP\Classes\Operator;
use NXP\Classes\Tokenizer;
use NXP\Exception\DivisionByZeroException;
use NXP\Exception\UnknownVariableException;
use NXP\Exception\MathExecutorException;
use NXP\Exception\UnknownVariableException;
use ReflectionException;
/**
@ -85,35 +85,42 @@ class MathExecutor
protected function defaultOperators() : array
{
return [
'+' => [
'+' => [
function ($a, $b) {
return $a + $b;
},
170,
false
],
'-' => [
'-' => [
function ($a, $b) {
return $a - $b;
},
170,
false
],
'`' => [ // unary minus token
function ($a) {
return 0 - $a;
},
200,
false
'uPos' => [ // unary positive token
function ($a) {
return $a;
},
200,
false
],
'*' => [
'uNeg' => [ // unary minus token
function ($a) {
return 0 - $a;
},
200,
false
],
'*' => [
function ($a, $b) {
return $a * $b;
},
180,
false
],
'/' => [
'/' => [
function ($a, $b) {
if ($b == 0) {
throw new DivisionByZeroException();
@ -123,28 +130,28 @@ class MathExecutor
180,
false
],
'^' => [
'^' => [
function ($a, $b) {
return pow($a, $b);
},
220,
true
],
'&&' => [
'&&' => [
function ($a, $b) {
return $a && $b;
},
100,
false
],
'||' => [
'||' => [
function ($a, $b) {
return $a || $b;
},
90,
false
],
'==' => [
'==' => [
function ($a, $b) {
if (is_string($a) || is_string($b)) {
return strcmp($a, $b) == 0;
@ -155,7 +162,7 @@ class MathExecutor
140,
false
],
'!=' => [
'!=' => [
function ($a, $b) {
if (is_string($a) || is_string($b)) {
return strcmp($a, $b) != 0;
@ -166,28 +173,28 @@ class MathExecutor
140,
false
],
'>=' => [
'>=' => [
function ($a, $b) {
return $a >= $b;
},
150,
false
],
'>' => [
'>' => [
function ($a, $b) {
return $a > $b;
},
150,
false
],
'<=' => [
'<=' => [
function ($a, $b) {
return $a <= $b;
},
150,
false
],
'<' => [
'<' => [
function ($a, $b) {
return $a < $b;
},

11
tests/MathTest.php
View file

@ -252,6 +252,17 @@ class MathTest extends TestCase
$this->assertEquals(0, $calculator->execute('10 / 0'));
}
public function testUnaryOperators()
{
$calculator = new MathExecutor();
$this->assertEquals(5, $calculator->execute('+5'));
$this->assertEquals(5, $calculator->execute('+(3+2)'));
$this->assertEquals(-5, $calculator->execute('-5'));
$this->assertEquals(5, $calculator->execute('-(-5)'));
$this->assertEquals(-5, $calculator->execute('+(-5)'));
$this->assertEquals(-5, $calculator->execute('-(3+2)'));
}
public function testZeroDivisionException()
{
$calculator = new MathExecutor();