plugin: Make sdb_plugin_info_t public.

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

diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index fd268baf3a9c6ce5126891c9ff6edbcc8af16e4f..34a9c6b6474502d9fc059df45a6ed93a79890567 100644 (file)
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
@@ -63,11 +63,14 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 %locations
 %error-verbose
 %expect 0
-%name-prefix="sdb_fe_yy"
+%name-prefix "sdb_fe_yy"
 
 %union {
+       const char *sstr; /* static string */
        char *str;
 
+       sdb_data_t data;
+
        sdb_llist_t     *list;
        sdb_conn_node_t *node;
 
@@ -78,18 +81,25 @@ 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_NEQUAL CMP_REGEX CMP_NREGEX
+%token CMP_LT CMP_LE CMP_GE CMP_GT
 
-%token CMP_EQUAL CMP_REGEX
+%token FETCH LIST LOOKUP
 
 %token <str> IDENTIFIER STRING
-%token <node> FETCH LIST LOOKUP
+
+%token <data> INTEGER FLOAT
 
 /* Precedence (lowest first): */
 %left OR
 %left AND
-%left CMP_EQUAL
-%left CMP_REGEX
+%right NOT
+%left CMP_EQUAL CMP_NEQUAL
+%left CMP_LT CMP_LE CMP_GE CMP_GT
+%left CMP_REGEX CMP_NREGEX
+%left '(' ')'
+%left '.'
 
 %type <list> statements
 %type <node> statement
@@ -101,6 +111,13 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 %type <m> matcher
        compare_matcher
 
+%type <sstr> op
+
+%type <data> data
+
+%destructor { free($$); } <str>
+%destructor { sdb_object_deref(SDB_OBJ($$)); } <node> <m>
+
 %%
 
 statements:
@@ -111,6 +128,7 @@ statements:
                                sdb_fe_yyerror(&yylloc, scanner,
                                                YY_("syntax error, unexpected statement, "
                                                        "expecting expression"));
+                               sdb_object_deref(SDB_OBJ($3));
                                YYABORT;
                        }
 
@@ -127,6 +145,7 @@ statements:
                                sdb_fe_yyerror(&yylloc, scanner,
                                                YY_("syntax error, unexpected statement, "
                                                        "expecting expression"));
+                               sdb_object_deref(SDB_OBJ($1));
                                YYABORT;
                        }
 
@@ -143,6 +162,7 @@ statements:
                                sdb_fe_yyerror(&yylloc, scanner,
                                                YY_("syntax error, unexpected expression, "
                                                        "expecting statement"));
+                               sdb_object_deref(SDB_OBJ($1));
                                YYABORT;
                        }
 
@@ -210,6 +230,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;
                        }
 
@@ -224,50 +246,44 @@ lookup_statement:
 expression:
        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;
-
-                       if ((M(m)->type == MATCHER_HOST)
-                                       || (M(m)->type == MATCHER_AND)
-                                       || (M(m)->type == MATCHER_OR))
-                               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);
-                       else {
-                               char errbuf[1024];
-                               snprintf(errbuf, sizeof(errbuf),
-                                               YY_("syntax error, unexpected matcher type %d"),
-                                               M(m)->type);
-                               sdb_fe_yyerror(&yylloc, scanner, errbuf);
-                               YYABORT;
-                       }
+                       CONN_MATCHER($$)->matcher = $1;
                }
        ;
 
 matcher:
+       '(' matcher ')'
+               {
+                       $$ = $2;
+               }
+       |
        matcher AND matcher
                {
                        $$ = sdb_store_con_matcher($1, $3);
+                       sdb_object_deref(SDB_OBJ($1));
+                       sdb_object_deref(SDB_OBJ($3));
                }
        |
        matcher OR matcher
                {
                        $$ = sdb_store_dis_matcher($1, $3);
+                       sdb_object_deref(SDB_OBJ($1));
+                       sdb_object_deref(SDB_OBJ($3));
+               }
+       |
+       NOT matcher
+               {
+                       $$ = sdb_store_inv_matcher($2);
+                       sdb_object_deref(SDB_OBJ($2));
                }
        |
        compare_matcher
@@ -282,22 +298,39 @@ matcher:
  * Parse matchers comparing object attributes with a value.
  */
 compare_matcher:
-       IDENTIFIER '.' IDENTIFIER CMP_EQUAL STRING
+       IDENTIFIER '.' IDENTIFIER op data
                {
-                       $$ = sdb_store_matcher_parse_cmp($1, $3, "=", $5);
-                       /* TODO: simplify memory management in the parser */
+                       $$ = sdb_store_matcher_parse_cmp($1, $3, $4, &$5);
                        free($1); $1 = NULL;
                        free($3); $3 = NULL;
-                       free($5); $5 = NULL;
+                       sdb_data_free_datum(&$5);
                }
+       ;
+
+op:
+       CMP_EQUAL { $$ = "="; }
        |
-       IDENTIFIER '.' IDENTIFIER CMP_REGEX STRING
-               {
-                       $$ = sdb_store_matcher_parse_cmp($1, $3, "=~", $5);
-                       free($1); $1 = NULL;
-                       free($3); $3 = NULL;
-                       free($5); $5 = NULL;
-               }
+       CMP_NEQUAL { $$ = "!="; }
+       |
+       CMP_REGEX { $$ = "=~"; }
+       |
+       CMP_NREGEX { $$ = "!~"; }
+       |
+       CMP_LT { $$ = "<"; }
+       |
+       CMP_LE { $$ = "<="; }
+       |
+       CMP_GE { $$ = ">="; }
+       |
+       CMP_GT { $$ = ">"; }
+       ;
+
+data:
+       STRING { $$.type = SDB_TYPE_STRING; $$.data.string = $1; }
+       |
+       INTEGER { $$ = $1; }
+       |
+       FLOAT { $$ = $1; }
        ;
 
 %%