frontend: Added sdb_fe_sock_clear_listeners().

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

diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index 6c52b74907b17163d1c15c7890f9f85d0ed959bf..a261c4c81d3253320b9d8cf960378918f84d0249 100644 (file)
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
@@ -78,13 +78,22 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 
 %token SCANNER_ERROR
 
-%token 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
 
+/* Precedence (lowest first): */
+%left OR
+%left AND
+%left NOT
+%left CMP_EQUAL CMP_NEQUAL
+%left CMP_REGEX CMP_NREGEX
+%left '(' ')'
+%left '.'
+
 %type <list> statements
 %type <node> statement
        fetch_statement
@@ -92,7 +101,8 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
        lookup_statement
        expression
 
-%type <m> compare_matcher
+%type <m> matcher
+       compare_matcher
 
 %%
 
@@ -104,6 +114,7 @@ statements:
                                sdb_fe_yyerror(&yylloc, scanner,
                                                YY_("syntax error, unexpected statement, "
                                                        "expecting expression"));
+                               sdb_object_deref(SDB_OBJ($3));
                                YYABORT;
                        }
 
@@ -120,6 +131,7 @@ statements:
                                sdb_fe_yyerror(&yylloc, scanner,
                                                YY_("syntax error, unexpected statement, "
                                                        "expecting expression"));
+                               sdb_object_deref(SDB_OBJ($1));
                                YYABORT;
                        }
 
@@ -136,6 +148,7 @@ statements:
                                sdb_fe_yyerror(&yylloc, scanner,
                                                YY_("syntax error, unexpected expression, "
                                                        "expecting statement"));
+                               sdb_object_deref(SDB_OBJ($1));
                                YYABORT;
                        }
 
@@ -203,6 +216,8 @@ lookup_statement:
                                snprintf(errmsg, sizeof(errmsg),
                                                YY_("unknown table %s"), $2);
                                sdb_fe_yyerror(&yylloc, scanner, errmsg);
+                               free($2); $2 = NULL;
+                               sdb_object_deref(SDB_OBJ($4));
                                YYABORT;
                        }
 
@@ -215,30 +230,46 @@ lookup_statement:
        ;
 
 expression:
-       compare_matcher
+       matcher
                {
-                       sdb_store_matcher_t *m = $1;
-                       if (! m) {
+                       if (! $1) {
                                /* TODO: improve error reporting */
                                sdb_fe_yyerror(&yylloc, scanner,
                                                YY_("syntax error, invalid expression"));
                                YYABORT;
                        }
 
-                       $$ = SDB_CONN_NODE(sdb_object_create_T(/* name = */ NULL,
-                                               conn_node_matcher_t));
+                       $$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
+                                               conn_node_matcher_t, conn_matcher_destroy));
                        $$->cmd = CONNECTION_EXPR;
+                       CONN_MATCHER($$)->matcher = $1;
+               }
+       ;
 
-                       if (M(m)->type == MATCHER_HOST)
-                               CONN_MATCHER($$)->matcher = m;
-                       else if (M(m)->type == MATCHER_SERVICE)
-                               CONN_MATCHER($$)->matcher = sdb_store_host_matcher(NULL,
-                                               /* name_re = */ NULL, /* service = */ m,
-                                               /* attr = */ NULL);
-                       else if (M(m)->type == MATCHER_ATTR)
-                               CONN_MATCHER($$)->matcher = sdb_store_host_matcher(NULL,
-                                               /* name_re = */ NULL, /* service = */ NULL,
-                                               /* attr = */ m);
+matcher:
+       '(' matcher ')'
+               {
+                       $$ = $2;
+               }
+       |
+       matcher AND matcher
+               {
+                       $$ = sdb_store_con_matcher($1, $3);
+               }
+       |
+       matcher OR matcher
+               {
+                       $$ = sdb_store_dis_matcher($1, $3);
+               }
+       |
+       NOT matcher
+               {
+                       $$ = sdb_store_inv_matcher($2);
+               }
+       |
+       compare_matcher
+               {
+                       $$ = $1;
                }
        ;
 
@@ -257,6 +288,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);
@@ -264,6 +304,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;
+               }
        ;
 
 %%