throw exception if too many operands (#347)

Throw an exception if too many operands are found for an operator
ezylang · Feb 11, 2023 · 568e8ac · 568e8ac
1 parent 9c78907
commit 568e8ac
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 0 deletions.
diff --git a/src/main/java/com/ezylang/evalex/parser/ShuntingYardConverter.java b/src/main/java/com/ezylang/evalex/parser/ShuntingYardConverter.java
@@ -112,6 +112,10 @@ public ASTNode toAbstractSyntaxTree() throws ParseException {
       throw new ParseException(this.originalExpression, "Empty expression");
     }
 
+    if (operandStack.size() > 1) {
+      throw new ParseException(this.originalExpression, "Too many operands");
+    }
+
     return operandStack.pop();
   }
 

diff --git a/src/test/java/com/ezylang/evalex/parser/ShuntingYardExceptionsTest.java b/src/test/java/com/ezylang/evalex/parser/ShuntingYardExceptionsTest.java
@@ -142,4 +142,76 @@ void testFunctionTooManyParameters() {
         .isInstanceOf(ParseException.class)
         .hasMessage("Too many parameters for function");
   }
+
+  @Test
+  void testTooManyOperands() {
+    Expression expression = new Expression("1 2");
+
+    assertThatThrownBy(expression::evaluate)
+        .isInstanceOf(ParseException.class)
+        .hasMessage("Too many operands");
+  }
+
+  @Test
+  void testTooManyOperandsString() {
+    Expression expression = new Expression("Hello World");
+
+    assertThatThrownBy(expression::evaluate)
+        .isInstanceOf(ParseException.class)
+        .hasMessage("Too many operands");
+  }
+
+  @Test
+  void testTooManyOperandsStringWithNumbers() {
+    Expression expression = new Expression("Hello 1");
+
+    assertThatThrownBy(expression::evaluate)
+        .isInstanceOf(ParseException.class)
+        .hasMessage("Too many operands");
+  }
+
+  @Test
+  void testTooManyOperandsStringWithNumbersAndOperators() {
+    Expression expression = new Expression("Hello 1 + 1");
+
+    assertThatThrownBy(expression::evaluate)
+        .isInstanceOf(ParseException.class)
+        .hasMessage("Too many operands");
+  }
+
+  @Test
+  void testTooManyOperandsStringWithNumbersAndOperatorsAndBraces() {
+    Expression expression = new Expression("Hello 1 + (1 + 1)");
+
+    assertThatThrownBy(expression::evaluate)
+        .isInstanceOf(ParseException.class)
+        .hasMessage("Too many operands");
+  }
+
+  @Test
+  void testTooManyOperandsStringWithFunctions() {
+    Expression expression = new Expression("Hello ROUND(1,2)");
+
+    assertThatThrownBy(expression::evaluate)
+        .isInstanceOf(ParseException.class)
+        .hasMessage("Too many operands");
+  }
+
+  @Test
+  void testTooManyOperandsStringWithFunctionsAndBraces() {
+    Expression expression = new Expression("Hello ROUND(1,2) + (1 + 1)");
+
+    assertThatThrownBy(expression::evaluate)
+        .isInstanceOf(ParseException.class)
+        .hasMessage("Too many operands");
+  }
+
+  @Test
+  void testTooManyOperandsStringWithSpecialCharacters() {
+    Expression expression = new Expression("Hello, World");
+
+    assertThatThrownBy(expression::evaluate)
+        .isInstanceOf(ParseException.class)
+        .hasMessage("Too many operands");
+  }
 }