frontend/grammar: Implement '<obj> <op> <expr>' using new-style matchers.

[sysdb.git] / src / frontend / grammar.y

diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index 23ba07ffaed4a72425173ab890d9eb3d4e690d28..3c813dcddb05d6ff54ac4a1d93fde958f4afab08 100644 (file)
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
@@ -38,6 +38,8 @@
 #include "utils/error.h"
 #include "utils/llist.h"
 
+#include <assert.h>
+
 #include <stdio.h>
 #include <string.h>
 
@@ -291,7 +293,7 @@ list_statement:
        LIST IDENTIFIER filter_clause
                {
                        int type = sdb_store_parse_object_type_plural($2);
-                       if (type < 0) {
+                       if ((type < 0) || (type == SDB_ATTRIBUTE)) {
                                char errmsg[strlen($2) + 32];
                                snprintf(errmsg, sizeof(errmsg),
                                                YY_("unknown data-source %s"), $2);
@@ -431,32 +433,38 @@ matcher:
                }
        ;
 
-/*
- * <object_type>.<object_attr> <cmp> <value>
- *
- * Parse matchers comparing object attributes with a value.
- */
 compare_matcher:
-       '.' IDENTIFIER cmp expression
+       expression cmp expression
                {
-                       $$ = sdb_store_matcher_parse_field_cmp($2, $3, $4);
-                       free($2); $2 = NULL;
-                       sdb_object_deref(SDB_OBJ($4));
+                       sdb_store_matcher_op_cb cb = sdb_store_parse_matcher_op($2);
+                       assert(cb); /* else, the grammar accepts invalid 'cmp' */
+                       $$ = cb($1, $3);
+                       sdb_object_deref(SDB_OBJ($1));
+                       sdb_object_deref(SDB_OBJ($3));
                }
        |
        IDENTIFIER cmp expression
                {
-                       $$ = sdb_store_matcher_parse_cmp($1, NULL, $2, $3);
+                       int type = sdb_store_parse_object_type($1);
+                       sdb_store_expr_t *e = sdb_store_expr_fieldvalue(SDB_FIELD_NAME);
+                       sdb_store_matcher_op_cb cb = sdb_store_parse_matcher_op($2);
+                       sdb_store_matcher_t *m;
+                       assert(cb);
+
+                       m = cb(e, $3);
+                       /* TODO: this only works as long as queries
+                        * are limited to hosts */
+                       if (type == SDB_HOST) {
+                               $$ = m;
+                       }
+                       else {
+                               $$ = sdb_store_child_matcher(type, m);
+                               sdb_object_deref(SDB_OBJ(m));
+                       }
+
                        free($1); $1 = NULL;
                        sdb_object_deref(SDB_OBJ($3));
-               }
-       |
-       IDENTIFIER '[' STRING ']' cmp expression
-               {
-                       $$ = sdb_store_matcher_parse_cmp($1, $3, $5, $6);
-                       free($1); $1 = NULL;
-                       free($3); $3 = NULL;
-                       sdb_object_deref(SDB_OBJ($6));
+                       sdb_object_deref(SDB_OBJ(e));
                }
        |
        expression IS NULL_T