Issue fasseg#88: Fixed multiple function concatenation bug

alexandrustana · Aug 21, 2017 · 197de37 · 197de37
1 parent 8a4e210
commit 197de37
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/net/objecthunter/exp4j/shuntingyard/ShuntingYard.java b/src/main/java/net/objecthunter/exp4j/shuntingyard/ShuntingYard.java
@@ -51,8 +51,11 @@ public static Token[] convertToRPN(final String expression, final Map<String, Fu
                 output.add(token);
                 break;
             case Token.TOKEN_FUNCTION:
-                stack.add(token);
-                break;
+				if(!stack.empty() && stack.peek().getType() == Token.TOKEN_FUNCTION) {
+					throw new IllegalArgumentException("Mismatched parentheses detected. Please check the expression");
+				}
+				stack.add(token);
+				break;
             case Token.TOKEN_SEPARATOR:
                 while (!stack.empty() && stack.peek().getType() != Token.TOKEN_PARENTHESES_OPEN) {
                     output.add(stack.pop());