frontend: Actually implement support for the NOT operator.

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

diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index abc51656934edcffc8c6f32ddf7320f985541d77..1cf068538bc13f7686fc12df2d0ba22247f9d553 100644 (file)
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
@@ -78,9 +78,9 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 
 %token SCANNER_ERROR
 
-%token AND OR WHERE
+%token AND OR NOT WHERE
 
-%token CMP_EQUAL CMP_REGEX
+%token CMP_EQUAL CMP_NEQUAL CMP_REGEX CMP_NREGEX
 
 %token <str> IDENTIFIER STRING
 %token <node> FETCH LIST LOOKUP
@@ -88,8 +88,11 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 /* Precedence (lowest first): */
 %left OR
 %left AND
-%left CMP_EQUAL
-%left CMP_REGEX
+%left NOT
+%left CMP_EQUAL CMP_NEQUAL
+%left CMP_REGEX CMP_NREGEX
+%left '(' ')'
+%left '.'
 
 %type <list> statements
 %type <node> statement
@@ -243,7 +246,8 @@ expression:
 
                        if ((M(m)->type == MATCHER_HOST)
                                        || (M(m)->type == MATCHER_AND)
-                                       || (M(m)->type == MATCHER_OR))
+                                       || (M(m)->type == MATCHER_OR)
+                                       || (M(m)->type == MATCHER_NOT))
                                CONN_MATCHER($$)->matcher = m;
                        else if (M(m)->type == MATCHER_SERVICE)
                                CONN_MATCHER($$)->matcher = sdb_store_host_matcher(NULL,
@@ -266,6 +270,11 @@ expression:
        ;
 
 matcher:
+       '(' matcher ')'
+               {
+                       $$ = $2;
+               }
+       |
        matcher AND matcher
                {
                        $$ = sdb_store_con_matcher($1, $3);
@@ -276,6 +285,11 @@ matcher:
                        $$ = sdb_store_dis_matcher($1, $3);
                }
        |
+       NOT matcher
+               {
+                       $$ = sdb_store_inv_matcher($2);
+               }
+       |
        compare_matcher
                {
                        $$ = $1;
@@ -297,6 +311,15 @@ compare_matcher:
                        free($5); $5 = NULL;
                }
        |
+       IDENTIFIER '.' IDENTIFIER CMP_NEQUAL STRING
+               {
+                       $$ = sdb_store_matcher_parse_cmp($1, $3, "!=", $5);
+                       /* TODO: simplify memory management in the parser */
+                       free($1); $1 = NULL;
+                       free($3); $3 = NULL;
+                       free($5); $5 = NULL;
+               }
+       |
        IDENTIFIER '.' IDENTIFIER CMP_REGEX STRING
                {
                        $$ = sdb_store_matcher_parse_cmp($1, $3, "=~", $5);
@@ -304,6 +327,14 @@ compare_matcher:
                        free($3); $3 = NULL;
                        free($5); $5 = NULL;
                }
+       |
+       IDENTIFIER '.' IDENTIFIER CMP_NREGEX STRING
+               {
+                       $$ = sdb_store_matcher_parse_cmp($1, $3, "!~", $5);
+                       free($1); $1 = NULL;
+                       free($3); $3 = NULL;
+                       free($5); $5 = NULL;
+               }
        ;
 
 %%