Mercurial > hg > webserver / file diff

--- a/src/server/util/object.h	Sun Dec 04 10:20:21 2022 +0100
+++ b/src/server/util/object.h	Sun Dec 04 13:01:00 2022 +0100
@@ -145,10 +145,9 @@
     NSAPI_EXPRESSION_NOOP = 0,
     NSAPI_EXPRESSION_CALL,
     NSAPI_EXPRESSION_ARG,
-    NSAPI_EXPRESSION_NOT,
-    NSAPI_EXPRESSION_AND,
-    NSAPI_EXPRESSION_OR,
-    NSAPI_EXPRESSION_XOR,
+    NSAPI_EXPRESSION_WILDCARD_MATCH,
+    NSAPI_EXPRESSION_REGEX_MATCH,
+    NSAPI_EXPRESSION_REGEX_MISMATCH,
     NSAPI_EXPRESSION_EQ,
     NSAPI_EXPRESSION_NEQ,
     NSAPI_EXPRESSION_GT,
@@ -159,12 +158,25 @@
     NSAPI_EXPRESSION_SUB,
     NSAPI_EXPRESSION_MUL,
     NSAPI_EXPRESSION_DIV,
-    NSAPI_EXPRESSION_MOD
+    NSAPI_EXPRESSION_MOD,
+    NSAPI_EXPRESSION_STRCAT,
+    NSAPI_EXPRESSION_NOT,
+    NSAPI_EXPRESSION_AND,
+    NSAPI_EXPRESSION_OR,
+    NSAPI_EXPRESSION_XOR,
+    NSAPI_EXPRESSION_VALUE_DEFINED,
+    NSAPI_EXPRESSION_DIR_EXISTS,
+    NSAPI_EXPRESSION_FILE_DIR_EXISTS,
+    NSAPI_EXPRESSION_FILE_EXISTS,
+    NSAPI_EXPRESSION_SYMLINK_EXISTS,
+    NSAPI_EXPRESSION_FILE_READABLE,
+    NSAPI_EXPRESSION_FILE_SIZE
 };
 
 union NSAPIExpressionValue {
     cxstring str;
     cxstring var;
+    cxstring identifier;
     int64_t  i;
     double   f;
     int      b;