Merge pull request #224 from uklimaschewski/custom_alpha_operator_fun…

…ction_preference Custom alpha operator precedes function recognition
ezylang · Sep 8, 2019 · abf8970 · abf8970
2 parents 8845640 + ee4f303
commit abf8970
Show file tree

Hide file tree

Showing 2 changed files with 328 additions and 307 deletions.
diff --git a/src/main/java/com/udojava/evalex/Expression.java b/src/main/java/com/udojava/evalex/Expression.java
@@ -454,10 +454,10 @@ && isHexDigit(
                     }
                     pos--;
                 }
-                if (ch == '(') {
-                    token.type = TokenType.FUNCTION;
-                } else if (operators.containsKey(token.surface)) {
+                if (operators.containsKey(token.surface)) {
                     token.type = TokenType.OPERATOR;
+                } else if (ch == '(') {
+                    token.type = TokenType.FUNCTION;
                 } else {
                     token.type = TokenType.VARIABLE;
                 }