diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index fd268baf3a9c6ce5126891c9ff6edbcc8af16e4f..a261c4c81d3253320b9d8cf960378918f84d0249 100644 (file)
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
%token SCANNER_ERROR
%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
%token <str> IDENTIFIER STRING
%token <node> FETCH LIST LOOKUP
/* Precedence (lowest first): */
%left OR
%left AND
/* 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
%type <list> statements
%type <node> statement
sdb_fe_yyerror(&yylloc, scanner,
YY_("syntax error, unexpected statement, "
"expecting expression"));
sdb_fe_yyerror(&yylloc, scanner,
YY_("syntax error, unexpected statement, "
"expecting expression"));
+ sdb_object_deref(SDB_OBJ($3));
YYABORT;
}
YYABORT;
}
sdb_fe_yyerror(&yylloc, scanner,
YY_("syntax error, unexpected statement, "
"expecting expression"));
sdb_fe_yyerror(&yylloc, scanner,
YY_("syntax error, unexpected statement, "
"expecting expression"));
+ sdb_object_deref(SDB_OBJ($1));
YYABORT;
}
YYABORT;
}
sdb_fe_yyerror(&yylloc, scanner,
YY_("syntax error, unexpected expression, "
"expecting statement"));
sdb_fe_yyerror(&yylloc, scanner,
YY_("syntax error, unexpected expression, "
"expecting statement"));
+ sdb_object_deref(SDB_OBJ($1));
YYABORT;
}
YYABORT;
}
snprintf(errmsg, sizeof(errmsg),
YY_("unknown table %s"), $2);
sdb_fe_yyerror(&yylloc, scanner, errmsg);
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;
}
YYABORT;
}
expression:
matcher
{
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;
}
/* 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;
$$->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:
+ '(' matcher ')'
+ {
+ $$ = $2;
+ }
+ |
matcher AND matcher
{
$$ = sdb_store_con_matcher($1, $3);
matcher AND matcher
{
$$ = sdb_store_con_matcher($1, $3);
$$ = sdb_store_dis_matcher($1, $3);
}
|
$$ = sdb_store_dis_matcher($1, $3);
}
|
+ NOT matcher
+ {
+ $$ = sdb_store_inv_matcher($2);
+ }
+ |
compare_matcher
{
$$ = $1;
compare_matcher
{
$$ = $1;
free($5); $5 = NULL;
}
|
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);
IDENTIFIER '.' IDENTIFIER CMP_REGEX STRING
{
$$ = sdb_store_matcher_parse_cmp($1, $3, "=~", $5);
free($3); $3 = NULL;
free($5); $5 = NULL;
}
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;
+ }
;
%%
;
%%