diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index 858c766b698aa124308a292f8ddcf90250127120..402e17087f692744f2dea73068654daced1d1134 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_llist_t *list;
%token SCANNER_ERROR
%token AND OR NOT WHERE
-
%token CMP_EQUAL CMP_NEQUAL CMP_REGEX CMP_NREGEX
+%token FETCH LIST LOOKUP
+
%token <str> IDENTIFIER STRING
-%token <node> FETCH LIST LOOKUP
/* Precedence (lowest first): */
%left OR
%type <m> matcher
compare_matcher
+%type <sstr> op
+
+%destructor { free($$); } <str>
+%destructor { sdb_object_deref(SDB_OBJ($$)); } <node> <m>
+
%%
statements:
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"));
$$ = 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_object_deref(SDB_OBJ($$));
- sdb_fe_yyerror(&yylloc, scanner, errbuf);
- YYABORT;
- }
+ CONN_MATCHER($$)->matcher = $1;
}
;
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
* Parse matchers comparing object attributes with a value.
*/
compare_matcher:
- IDENTIFIER '.' IDENTIFIER CMP_EQUAL STRING
+ IDENTIFIER '.' IDENTIFIER op STRING
{
- $$ = sdb_store_matcher_parse_cmp($1, $3, "=", $5);
- /* TODO: simplify memory management in the parser */
+ sdb_data_t data = { SDB_TYPE_STRING, { .string = $5 } };
+ $$ = sdb_store_matcher_parse_cmp($1, $3, $4, &data);
free($1); $1 = NULL;
free($3); $3 = NULL;
free($5); $5 = NULL;
}
+ ;
+
+op:
+ CMP_EQUAL { $$ = "="; }
|
- 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;
- }
+ CMP_NEQUAL { $$ = "!="; }
|
- 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_REGEX { $$ = "=~"; }
|
- 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;
- }
+ CMP_NREGEX { $$ = "!~"; }
;
%%