From 43f0ff3f28d198fbb4e36346fc5f36fa91cf3e18 Mon Sep 17 00:00:00 2001
From: Bruce Wells <phpfui@users.noreply.github.com>
Date: Thu, 25 Oct 2018 11:54:54 -0400
Subject: Support for better invalid expression detection and divide by zero
 (#30)

* Additional validation for bad expressions (*+ for example)

* Removing DivisionByZeroException testing for now

Added more unit tests.
---
 src/NXP/Classes/Token/TokenMultiply.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/NXP/Classes/Token/TokenMultiply.php')

diff --git a/src/NXP/Classes/Token/TokenMultiply.php b/src/NXP/Classes/Token/TokenMultiply.php
index e6fd960..8b173b9 100644
--- a/src/NXP/Classes/Token/TokenMultiply.php
+++ b/src/NXP/Classes/Token/TokenMultiply.php
@@ -10,6 +10,8 @@
 
 namespace NXP\Classes\Token;
 
+use NXP\Exception\IncorrectExpressionException;
+
 /**
 * @author Alexander Kiryukhin <alexander@symdev.org>
 */
@@ -41,12 +43,20 @@ class TokenMultiply extends AbstractOperator
 
     /**
      * @param InterfaceToken[] $stack
+     *
      * @return $this
+     *
+     * @throws \NXP\Exception\IncorrectExpressionException
      */
     public function execute(&$stack)
     {
         $op2 = array_pop($stack);
         $op1 = array_pop($stack);
+
+        if ($op1 === null || $op2 === null) {
+            throw new IncorrectExpressionException("Multiplication requires two operators");
+        }
+
         $result = $op1->getValue() * $op2->getValue();
 
         return new TokenNumber($result);
-- 
cgit v1.2.3