diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index 6c52b74907b17163d1c15c7890f9f85d0ed959bf..34a9c6b6474502d9fc059df45a6ed93a79890567 100644 (file)
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
%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;
%token SCANNER_ERROR
-%token 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
+%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
lookup_statement
expression
-%type <m> compare_matcher
+%type <m> matcher
+ compare_matcher
+
+%type <sstr> op
+
+%type <data> data
+
+%destructor { free($$); } <str>
+%destructor { sdb_object_deref(SDB_OBJ($$)); } <node> <m>
%%
sdb_fe_yyerror(&yylloc, scanner,
YY_("syntax error, unexpected statement, "
"expecting expression"));
+ sdb_object_deref(SDB_OBJ($3));
YYABORT;
}
sdb_fe_yyerror(&yylloc, scanner,
YY_("syntax error, unexpected statement, "
"expecting expression"));
+ sdb_object_deref(SDB_OBJ($1));
YYABORT;
}
sdb_fe_yyerror(&yylloc, scanner,
YY_("syntax error, unexpected expression, "
"expecting statement"));
+ sdb_object_deref(SDB_OBJ($1));
YYABORT;
}
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;
}
;
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);
+ 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
+ {
+ $$ = $1;
}
;
* 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; }
;
%%