diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index a261c4c81d3253320b9d8cf960378918f84d0249..8e5ddf6e5eff7a1e32646ad0d62795109a2b61f9 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:
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_store_matcher_parse_cmp($1, $3, $4, $5);
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 { $$ = "!~"; }
;
%%