LogicalAnd / LogicalOr

haxeui · Aug 4, 2021 · 22a6a81 · 22a6a81
1 parent 0a5d645
commit 22a6a81
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/haxe/ui/util/SimpleExpressionEvaluator.hx b/haxe/ui/util/SimpleExpressionEvaluator.hx
@@ -13,6 +13,8 @@ enum SimpleExpressionEvaluatorOperation {
     GreaterThanOrEquals;    // >=
     LessThan;               // <
     LessThanOrEquals;       // <=
+    LogicalAnd;             // &&
+    LogicalOr;              // ||
 }
 
 class SimpleExpressionEvaluator {
@@ -71,6 +73,14 @@ class SimpleExpressionEvaluator {
                     operation = LessThanOrEquals;
                     s = s.substr(i + 2);
                     break;
+                } else if (ch == "&" && next == "&") {
+                    operation = LogicalAnd;
+                    s = s.substr(i + 2);
+                    break;
+                } else if (ch == "|" && next == "|") {
+                    operation = LogicalOr;
+                    s = s.substr(i + 2);
+                    break;
                 }
             }
 
@@ -222,6 +232,10 @@ class SimpleExpressionEvaluator {
                     result = result < r;
                 case LessThanOrEquals:
                     result = result <= r;
+                case LogicalAnd:
+                    result = result && r;
+                case LogicalOr:
+                    result = result || r;
             }
         }