diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index abab594b53a58ee0ddf440ceced7d2a5357b6883..74e28dd837f7e8eb7a819e1a0a4ed2ebda032ffb 100644 (file)
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
%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 AND OR NOT WHERE
+%token AND OR IS NOT MATCHING
%token CMP_EQUAL CMP_NEQUAL CMP_REGEX CMP_NREGEX
+%token CMP_LT CMP_LE CMP_GE CMP_GT
+
+/* NULL token */
+%token NULL_T
%token FETCH LIST LOOKUP
%token <str> IDENTIFIER STRING
+%token <data> INTEGER FLOAT
+
/* Precedence (lowest first): */
%left OR
%left AND
-%left NOT
+%right NOT
%left CMP_EQUAL CMP_NEQUAL
-%left CMP_REGEX CMP_NREGEX
+%left CMP_LT CMP_LE CMP_GE CMP_GT
+%nonassoc CMP_REGEX CMP_NREGEX
+%nonassoc IS
%left '(' ')'
%left '.'
%type <m> matcher
compare_matcher
+%type <sstr> op
+
+%type <data> data
+
%destructor { free($$); } <str>
%destructor { sdb_object_deref(SDB_OBJ($$)); } <node> <m>
;
/*
- * LOOKUP <type> WHERE <expression>;
+ * LOOKUP <type> MATCHING <expression>;
*
* Returns detailed information about <type> matching expression.
*/
lookup_statement:
- LOOKUP IDENTIFIER WHERE expression
+ LOOKUP IDENTIFIER MATCHING expression
{
/* TODO: support other types as well */
if (strcasecmp($2, "hosts")) {
* Parse matchers comparing object attributes with a value.
*/
compare_matcher:
- IDENTIFIER '.' IDENTIFIER CMP_EQUAL STRING
+ IDENTIFIER op data
{
- $$ = sdb_store_matcher_parse_cmp($1, $3, "=", $5);
- /* TODO: simplify memory management in the parser */
+ $$ = sdb_store_matcher_parse_cmp($1, NULL, $2, &$3);
free($1); $1 = NULL;
- free($3); $3 = NULL;
- free($5); $5 = NULL;
+ sdb_data_free_datum(&$3);
}
|
- IDENTIFIER '.' IDENTIFIER CMP_NEQUAL 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);
}
|
- IDENTIFIER '.' IDENTIFIER CMP_REGEX STRING
+ IDENTIFIER '.' IDENTIFIER IS NULL_T
{
- $$ = sdb_store_matcher_parse_cmp($1, $3, "=~", $5);
+ $$ = sdb_store_matcher_parse_cmp($1, $3, "IS", NULL);
free($1); $1 = NULL;
free($3); $3 = NULL;
- free($5); $5 = NULL;
}
|
- IDENTIFIER '.' IDENTIFIER CMP_NREGEX STRING
+ IDENTIFIER '.' IDENTIFIER IS NOT NULL_T
{
- $$ = sdb_store_matcher_parse_cmp($1, $3, "!~", $5);
+ sdb_store_matcher_t *m;
+ m = sdb_store_matcher_parse_cmp($1, $3, "IS", NULL);
free($1); $1 = NULL;
free($3); $3 = NULL;
- free($5); $5 = NULL;
+
+ /* sdb_store_inv_matcher return NULL if m==NULL */
+ $$ = sdb_store_inv_matcher(m);
+ sdb_object_deref(SDB_OBJ(m));
}
;
-%%
+op:
+ CMP_EQUAL { $$ = "="; }
+ |
+ CMP_NEQUAL { $$ = "!="; }
+ |
+ CMP_REGEX { $$ = "=~"; }
+ |
+ CMP_NREGEX { $$ = "!~"; }
+ |
+ CMP_LT { $$ = "<"; }
+ |
+ CMP_LE { $$ = "<="; }
+ |
+ CMP_GE { $$ = ">="; }
+ |
+ CMP_GT { $$ = ">"; }
+ ;
-/* XXX: on parse errors, allocated objects, strings, etc. need to be freed */
+data:
+ STRING { $$.type = SDB_TYPE_STRING; $$.data.string = $1; }
+ |
+ INTEGER { $$ = $1; }
+ |
+ FLOAT { $$ = $1; }
+ ;
+
+%%
void
sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg)