configure: Make sure that PACKAGE_URL is defined.

[sysdb.git] / src / core / store-private.h

diff --git a/src/core/store-private.h b/src/core/store-private.h
index 953a8826c741abbb21e0b8b3e9871922da3e00d8..97e8a6c2fcce7fff076b2f0275ead0a2ae42306a 100644 (file)
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
@@ -108,6 +108,7 @@ typedef struct {
  */
 
 enum {
+       TYPED_EXPR  = -3, /* obj type stored in data.data.integer */
        ATTR_VALUE  = -2, /* attr name stored in data.data.string */
        FIELD_VALUE = -1, /* field type stored in data.data.integer */
        /*  0: const value (stored in data) */
@@ -125,6 +126,13 @@ struct sdb_store_expr {
 
        sdb_data_t data;
 };
+#define EXPR_TO_STRING(e) \
+       (((e)->type == TYPED_EXPR) ? "<typed>" \
+               : ((e)->type == ATTR_VALUE) ? "attribute" \
+               : ((e)->type == FIELD_VALUE) ? SDB_FIELD_TO_NAME((e)->data.data.integer) \
+               : ((e)->type == 0) ? "<constant>" \
+               : ((e)->type > 0) ? SDB_DATA_OP_TO_STRING((e)->type) \
+               : "<unknown>")
 
 /*
  * matchers
@@ -138,17 +146,21 @@ enum {
        MATCHER_NOT,
        MATCHER_ANY,
        MATCHER_ALL,
+       MATCHER_IN,
+
+       /* unary operators */
+       MATCHER_ISNULL,
+       MATCHER_ISNNULL,
+
+       /* ary operators */
        MATCHER_LT,
        MATCHER_LE,
        MATCHER_EQ,
        MATCHER_NE,
        MATCHER_GE,
        MATCHER_GT,
-       MATCHER_IN,
        MATCHER_REGEX,
        MATCHER_NREGEX,
-       MATCHER_ISNULL,
-       MATCHER_ISNNULL,
 };
 
 #define MATCHER_SYM(t) \
@@ -157,17 +169,17 @@ enum {
                : ((t) == MATCHER_NOT) ? "NOT" \
                : ((t) == MATCHER_ANY) ? "ANY" \
                : ((t) == MATCHER_ALL) ? "ALL" \
+               : ((t) == MATCHER_IN) ? "IN" \
+               : ((t) == MATCHER_ISNULL) ? "IS NULL" \
+               : ((t) == MATCHER_ISNNULL) ? "IS NOT NULL" \
                : ((t) == MATCHER_LT) ? "<" \
                : ((t) == MATCHER_LE) ? "<=" \
                : ((t) == MATCHER_EQ) ? "=" \
                : ((t) == MATCHER_NE) ? "!=" \
                : ((t) == MATCHER_GE) ? ">=" \
                : ((t) == MATCHER_GT) ? ">" \
-               : ((t) == MATCHER_IN) ? "IN" \
                : ((t) == MATCHER_REGEX) ? "=~" \
                : ((t) == MATCHER_NREGEX) ? "!~" \
-               : ((t) == MATCHER_ISNULL) ? "IS NULL" \
-               : ((t) == MATCHER_ISNNULL) ? "IS NOT NULL" \
                : "UNKNOWN")
 
 /* matcher base type */