aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Kiryukhin <alexander@kiryukhin.su>2018-09-06 20:37:48 +0300
committerGitHub <noreply@github.com>2018-09-06 20:37:48 +0300
commita969571772a9761f67672b229741f209f5391560 (patch)
treed7080eefe3251409d3e4c7dceddf7c3f3738913d
parentb04cf54aa3e4d31bcea43011b371c75d168ac7f6 (diff)
parent7db873a63655258bd30ff2d83f186da48f2c50e1 (diff)
Merge pull request #25 from phpfui/Exception_messages
Exception Messages
-rw-r--r--src/NXP/Classes/Calculator.php2
-rw-r--r--src/NXP/Classes/TokenFactory.php6
-rw-r--r--src/NXP/MathExecutor.php2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/NXP/Classes/Calculator.php b/src/NXP/Classes/Calculator.php
index 41e0d9f..b584d69 100644
--- a/src/NXP/Classes/Calculator.php
+++ b/src/NXP/Classes/Calculator.php
@@ -40,7 +40,7 @@ class Calculator
if ($token instanceof TokenVariable) {
$variable = $token->getValue();
if (!array_key_exists($variable, $variables)) {
- throw new UnknownVariableException();
+ throw new UnknownVariableException($variable);
}
$value = $variables[$variable];
array_push($stack, new TokenNumber($value));
diff --git a/src/NXP/Classes/TokenFactory.php b/src/NXP/Classes/TokenFactory.php
index 19ba1cf..07b9ea8 100644
--- a/src/NXP/Classes/TokenFactory.php
+++ b/src/NXP/Classes/TokenFactory.php
@@ -61,7 +61,7 @@ class TokenFactory
$class = new \ReflectionClass($operatorClass);
if (!in_array('NXP\Classes\Token\InterfaceToken', $class->getInterfaceNames())) {
- throw new UnknownOperatorException;
+ throw new UnknownOperatorException($operatorClass);
}
$this->operators[] = $operatorClass;
@@ -140,10 +140,10 @@ class TokenFactory
if (isset($this->functions[$token])) {
return new TokenFunction($this->functions[$token]);
} else {
- throw new UnknownFunctionException();
+ throw new UnknownFunctionException($token);
}
}
- throw new UnknownTokenException();
+ throw new UnknownTokenException($token);
}
}
diff --git a/src/NXP/MathExecutor.php b/src/NXP/MathExecutor.php
index f348355..80f0bde 100644
--- a/src/NXP/MathExecutor.php
+++ b/src/NXP/MathExecutor.php
@@ -92,7 +92,7 @@ class MathExecutor
public function setVar($variable, $value)
{
if (!is_numeric($value)) {
- throw new \Exception("Variable value must be a number");
+ throw new \Exception("Variable ({$variable}) value must be a number ({$value}) type ({gettype($value)})");
}
$this->variables[$variable] = $value;