Merge pull request #221 from uklimaschewski/issue_217_string_operators

#217 Strings as operators (e. g. AND, OR)
ezylang · Aug 24, 2019 · 8845640 · 8845640
2 parents 99a3da4 + 9499435
commit 8845640
Show file tree

Hide file tree

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