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

Space should end open numbers (#113)

Browse source
This commit is contained in:
Bruce Wells 2022-05-28 16:02:04 -04:00 committed by GitHub
parent d1b060749e
commit cbada2b920
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -124,6 +124,8 @@ class Tokenizer
continue 2;
case ' ' == $ch || "\n" == $ch || "\r" == $ch || "\t" == $ch:
$this->emptyNumberBufferAsLiteral();
$this->emptyStrBufferAsVariable();
$this->tokens[] = new Token(Token::Space, '');
continue 2;

45
tests/MathTest.php
View file

@ -26,7 +26,7 @@ class MathTest extends TestCase
/**
* @dataProvider providerExpressions
*/
public function testCalculating($expression) : void
public function testCalculating(string $expression) : void
{
$calculator = new MathExecutor();
@ -250,6 +250,42 @@ class MathTest extends TestCase
];
}
/**
* @dataProvider incorrectExpressions
*/
public function testIncorrectExpressionException(string $expression) : void
{
$calculator = new MathExecutor();
$calculator->setVars(['a' => 12, 'b' => 24]);
$this->expectException(IncorrectExpressionException::class);
$calculator->execute($expression);
}
/**
* Incorrect Expressions data provider
*
* These expressions should not pass validation
*/
public function incorrectExpressions()
{
return [
['1 * + '],
[' 2 3'],
['2 3 '],
[' 2 4 3 '],
['$a $b'],
['$a [3, 4, 5]'],
['$a (3 + 4)'],
['$a "string"'],
['5 "string"'],
['"string" $a'],
['$a round(12.345)'],
['round(12.345) $a'],
['4 round(12.345)'],
['round(12.345) 4'],
];
}
public function testUnknownFunctionException() : void
{
$calculator = new MathExecutor();
@ -257,13 +293,6 @@ class MathTest extends TestCase
$calculator->execute('1 * fred("wilma") + 3');
}
public function testIncorrectExpressionException() : void
{
$calculator = new MathExecutor();
$this->expectException(IncorrectExpressionException::class);
$calculator->execute('1 * + ');
}
public function testZeroDivision() : void
{
$calculator = new MathExecutor();