X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore-private.h;h=874dc0577a9fe030e64fa7d59b1cfb2c4ac5d709;hb=263fd7beba3f8bac683910a1911c184641b67fc3;hp=775057f09e235f9033edc10526a08e65d7f43d47;hpb=f19bd5e590519c7a1624884d463e36f49af82632;p=sysdb.git

diff --git a/src/core/store-private.h b/src/core/store-private.h
index 775057f..874dc05 100644
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
@@ -106,7 +106,9 @@ typedef struct {
 /*
  * expressions
  */
+
 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) */
@@ -124,6 +126,14 @@ struct sdb_store_expr {
 
 	sdb_data_t data;
 };
+#define CONST_EXPR(v) { SDB_OBJECT_INIT, 0, (v).type, NULL, NULL, (v) }
+#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
@@ -137,17 +147,22 @@ enum {
 	MATCHER_NOT,
 	MATCHER_ANY,
 	MATCHER_ALL,
+	MATCHER_IN,
+	MATCHER_NIN,
+
+	/* 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) \
@@ -156,17 +171,18 @@ enum {
 		: ((t) == MATCHER_NOT) ? "NOT" \
 		: ((t) == MATCHER_ANY) ? "ANY" \
 		: ((t) == MATCHER_ALL) ? "ALL" \
+		: ((t) == MATCHER_IN) ? "IN" \
+		: ((t) == MATCHER_NIN) ? "NOT 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 */
@@ -199,7 +215,7 @@ typedef struct {
 /* iter matcher */
 typedef struct {
 	sdb_store_matcher_t super;
-	int type;
+	sdb_store_expr_t *iter;
 	sdb_store_matcher_t *m;
 } iter_matcher_t;
 #define ITER_M(m) ((iter_matcher_t *)(m))