Fixed comma operator
Added unit tests for expressions in function arguments. Changed array_push to $var[] = native code.
This commit is contained in:
parent
265cff175e
commit
47df3edbb6
5 changed files with 73 additions and 29 deletions
|
@ -36,21 +36,17 @@ class Calculator
|
|||
{
|
||||
$stack = [];
|
||||
foreach ($tokens as $token) {
|
||||
if ($token instanceof TokenNumber) {
|
||||
array_push($stack, $token);
|
||||
} else if ($token instanceof TokenStringDoubleQuoted) {
|
||||
array_push($stack, $token);
|
||||
} else if ($token instanceof TokenStringSingleQuoted) {
|
||||
array_push($stack, $token);
|
||||
if ($token instanceof TokenNumber || $token instanceof TokenStringDoubleQuoted || $token instanceof TokenStringSingleQuoted) {
|
||||
$stack[] = $token;
|
||||
} else if ($token instanceof TokenVariable) {
|
||||
$variable = $token->getValue();
|
||||
if (!array_key_exists($variable, $variables)) {
|
||||
throw new UnknownVariableException($variable);
|
||||
}
|
||||
$value = $variables[$variable];
|
||||
array_push($stack, new TokenNumber($value));
|
||||
$stack[] = new TokenNumber($value);
|
||||
} else if ($token instanceof InterfaceOperator || $token instanceof TokenFunction) {
|
||||
array_push($stack, $token->execute($stack));
|
||||
$stack[] = $token->execute($stack);
|
||||
}
|
||||
}
|
||||
$result = array_pop($stack);
|
||||
|
|
|
@ -77,7 +77,7 @@ class Lexer
|
|||
} elseif ($token instanceof TokenVariable) {
|
||||
$output[] = $token;
|
||||
} elseif ($token instanceof TokenFunction) {
|
||||
array_push($stack, $token);
|
||||
$stack[] = $token;
|
||||
} elseif ($token instanceof AbstractOperator) {
|
||||
// While we have something on the stack
|
||||
while (($count = count($stack)) > 0
|
||||
|
@ -104,9 +104,12 @@ class Lexer
|
|||
$output[] = array_pop($stack);
|
||||
}
|
||||
|
||||
array_push($stack, $token);
|
||||
// Comma operators do nothing really, don't put them on the stack
|
||||
if (! ($token instanceof TokenComma)) {
|
||||
$stack[] = $token;
|
||||
}
|
||||
} elseif ($token instanceof TokenLeftBracket) {
|
||||
array_push($stack, $token);
|
||||
$stack[] = $token;
|
||||
} elseif ($token instanceof TokenRightBracket) {
|
||||
while (($current = array_pop($stack)) && (!($current instanceof TokenLeftBracket))) {
|
||||
$output[] = $current;
|
||||
|
|
|
@ -13,7 +13,7 @@ namespace NXP\Classes\Token;
|
|||
/**
|
||||
* @author Alexander Kiryukhin <a.kiryukhin@mail.ru>
|
||||
*/
|
||||
class TokenComma implements InterfaceToken
|
||||
class TokenComma extends AbstractOperator
|
||||
{
|
||||
/**
|
||||
* @return string
|
||||
|
@ -22,4 +22,32 @@ class TokenComma implements InterfaceToken
|
|||
{
|
||||
return '\,';
|
||||
}
|
||||
|
||||
/**
|
||||
* Comma operator is lowest priority
|
||||
*
|
||||
* @return int
|
||||
*/
|
||||
public function getPriority()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function getAssociation()
|
||||
{
|
||||
return self::RIGHT_RIGHT;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array $stack
|
||||
* @return TokenNumber
|
||||
*/
|
||||
public function execute(&$stack)
|
||||
{
|
||||
// Comma operators don't do anything, stack has already executed
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -32,9 +32,10 @@ class TokenFunction extends AbstractContainerToken implements InterfaceFunction
|
|||
$args = [];
|
||||
list($places, $function) = $this->value;
|
||||
for ($i = 0; $i < $places; $i++) {
|
||||
$args[] = array_pop($stack)->getValue();
|
||||
array_unshift($args, array_pop($stack)->getValue());
|
||||
}
|
||||
$result = call_user_func_array($function, array_reverse($args));
|
||||
|
||||
$result = call_user_func_array($function, $args);
|
||||
|
||||
return new TokenNumber($result);
|
||||
}
|
||||
|
|
|
@ -135,17 +135,17 @@ class MathTest extends \PHPUnit_Framework_TestCase
|
|||
}
|
||||
|
||||
public function testFunctionParameterOrder()
|
||||
{
|
||||
$calculator = new MathExecutor();
|
||||
{
|
||||
$calculator = new MathExecutor();
|
||||
|
||||
$calculator->addFunction('concat', function ($arg1, $arg2)
|
||||
{
|
||||
return $arg1.$arg2;
|
||||
}
|
||||
);
|
||||
$this->assertEquals('testing', $calculator->execute('concat("test","ing")'));
|
||||
$this->assertEquals('testing', $calculator->execute("concat('test','ing')"));
|
||||
}
|
||||
$calculator->addFunction('concat', function ($arg1, $arg2)
|
||||
{
|
||||
return $arg1.$arg2;
|
||||
}
|
||||
);
|
||||
$this->assertEquals('testing', $calculator->execute('concat("test","ing")'));
|
||||
$this->assertEquals('testing', $calculator->execute("concat('test','ing')"));
|
||||
}
|
||||
|
||||
public function testFunction()
|
||||
{
|
||||
|
@ -154,17 +154,33 @@ class MathTest extends \PHPUnit_Framework_TestCase
|
|||
$this->assertEquals(round(100/30), $calculator->execute('round(100/30)'));
|
||||
}
|
||||
|
||||
public function testEvaluateFunctionParameters()
|
||||
{
|
||||
$calculator = new MathExecutor();
|
||||
$calculator->addFunction('round', function ($value, $decimals)
|
||||
{
|
||||
return round($value, $decimals);
|
||||
}
|
||||
);
|
||||
$expression = 'round(100 * 1.111111, 2)';
|
||||
eval('$phpResult = ' . $expression . ';');
|
||||
$this->assertEquals($phpResult, $calculator->execute($expression));
|
||||
$expression = 'round((100*0.04)+(((100*1.02)+0.5)*1.28),2)';
|
||||
eval('$phpResult = ' . $expression . ';');
|
||||
$this->assertEquals($phpResult, $calculator->execute($expression));
|
||||
}
|
||||
|
||||
public function testQuotes()
|
||||
{
|
||||
$calculator = new MathExecutor();
|
||||
$testString = "some, long. arg; with: different-separators!";
|
||||
$calculator->addFunction('test', function ($arg) use ($testString)
|
||||
{
|
||||
$this->assertEquals($testString, $arg);
|
||||
{
|
||||
$this->assertEquals($testString, $arg);
|
||||
return 0;
|
||||
}
|
||||
);
|
||||
}
|
||||
);
|
||||
$calculator->execute('test("' . $testString . '")'); // single quotes
|
||||
$calculator->execute("test('" . $testString . "')"); // double quotes
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue