![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index 30414d24a2a0eadc70d0342a7a92f871f94e1b5f..92b55ebbd509eb9d62c975a3866c5aa67ce07534 100644 (file)
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
#include "utils/error.h"
#include "utils/llist.h"
+#include <assert.h>
+
#include <stdio.h>
#include <string.h>
+/*
+ * private helper functions
+ */
+
+static sdb_store_matcher_t *
+name_matcher(const char *type_name, const char *cmp, sdb_store_expr_t *expr);
+
+static sdb_store_matcher_t *
+name_iter_matcher(int m_type, const char *type_name, const char *cmp,
+ sdb_store_expr_t *expr);
+
+/*
+ * public API
+ */
+
int
sdb_fe_yylex(YYSTYPE *yylval, YYLTYPE *yylloc, sdb_fe_yyscan_t yyscanner);
%token AND OR IS NOT MATCHING FILTER
%token CMP_EQUAL CMP_NEQUAL CMP_REGEX CMP_NREGEX
-%token CMP_LT CMP_LE CMP_GE CMP_GT
+%token CMP_LT CMP_LE CMP_GE CMP_GT ALL ANY IN
%token CONCAT
%token START END
%left CMP_EQUAL CMP_NEQUAL
%left CMP_LT CMP_LE CMP_GE CMP_GT
%nonassoc CMP_REGEX CMP_NREGEX
+%nonassoc IN
%left CONCAT
%nonassoc IS
%left '+' '-'
LIST IDENTIFIER filter_clause
{
int type = sdb_store_parse_object_type_plural($2);
- if (type < 0) {
+ if ((type < 0) || (type == SDB_ATTRIBUTE)) {
char errmsg[strlen($2) + 32];
snprintf(errmsg, sizeof(errmsg),
YY_("unknown data-source %s"), $2);
}
;
-/*
- * <object_type>.<object_attr> <cmp> <value>
- *
- * Parse matchers comparing object attributes with a value.
- */
compare_matcher:
- '.' IDENTIFIER cmp expression
+ expression cmp expression
{
- $$ = sdb_store_matcher_parse_field_cmp($2, $3, $4);
- free($2); $2 = NULL;
- sdb_object_deref(SDB_OBJ($4));
+ sdb_store_matcher_op_cb cb = sdb_store_parse_matcher_op($2);
+ assert(cb); /* else, the grammar accepts invalid 'cmp' */
+ $$ = cb($1, $3);
+ sdb_object_deref(SDB_OBJ($1));
+ sdb_object_deref(SDB_OBJ($3));
}
|
IDENTIFIER cmp expression
{
- $$ = sdb_store_matcher_parse_cmp($1, NULL, $2, $3);
+ $$ = name_matcher($1, $2, $3);
free($1); $1 = NULL;
sdb_object_deref(SDB_OBJ($3));
}
|
- IDENTIFIER '[' STRING ']' cmp expression
+ ANY IDENTIFIER cmp expression
{
- $$ = sdb_store_matcher_parse_cmp($1, $3, $5, $6);
- free($1); $1 = NULL;
- free($3); $3 = NULL;
- sdb_object_deref(SDB_OBJ($6));
+ $$ = name_iter_matcher(MATCHER_ANY, $2, $3, $4);
+ free($2); $2 = NULL;
+ sdb_object_deref(SDB_OBJ($4));
}
|
- IDENTIFIER '[' STRING ']' IS NULL_T
+ ALL IDENTIFIER cmp expression
{
- sdb_store_expr_t *expr;
-
- if (strcasecmp($1, "attribute")) {
- char errmsg[strlen($1) + strlen($3) + 32];
- snprintf(errmsg, sizeof(errmsg),
- YY_("unknown value %s[%s]"), $1);
- sdb_fe_yyerror(&yylloc, scanner, errmsg);
- free($1); $1 = NULL;
- free($3); $3 = NULL;
- YYABORT;
- }
-
- expr = sdb_store_expr_attrvalue($3);
- $$ = sdb_store_isnull_matcher(expr);
- sdb_object_deref(SDB_OBJ(expr));
- free($1); $1 = NULL;
- free($3); $3 = NULL;
+ $$ = name_iter_matcher(MATCHER_ALL, $2, $3, $4);
+ free($2); $2 = NULL;
+ sdb_object_deref(SDB_OBJ($4));
}
|
- IDENTIFIER '[' STRING ']' IS NOT NULL_T
+ expression IS NULL_T
{
- sdb_store_expr_t *expr;
-
- if (strcasecmp($1, "attribute")) {
- char errmsg[strlen($1) + strlen($3) + 32];
- snprintf(errmsg, sizeof(errmsg),
- YY_("unknown value %s[%s]"), $1);
- sdb_fe_yyerror(&yylloc, scanner, errmsg);
- free($1); $1 = NULL;
- free($3); $3 = NULL;
- YYABORT;
- }
-
- expr = sdb_store_expr_attrvalue($3);
- $$ = sdb_store_isnnull_matcher(expr);
- sdb_object_deref(SDB_OBJ(expr));
- free($1); $1 = NULL;
- free($3); $3 = NULL;
+ $$ = sdb_store_isnull_matcher($1);
+ sdb_object_deref(SDB_OBJ($1));
+ }
+ |
+ expression IS NOT NULL_T
+ {
+ $$ = sdb_store_isnnull_matcher($1);
+ sdb_object_deref(SDB_OBJ($1));
+ }
+ |
+ expression IN expression
+ {
+ $$ = sdb_store_in_matcher($1, $3);
+ sdb_object_deref(SDB_OBJ($1));
+ sdb_object_deref(SDB_OBJ($3));
}
;
|
IDENTIFIER '[' STRING ']'
{
+ if (strcasecmp($1, "attribute")) {
+ char errmsg[strlen($1) + strlen($3) + 32];
+ snprintf(errmsg, sizeof(errmsg),
+ YY_("unknown value %s[%s]"), $1, $3);
+ sdb_fe_yyerror(&yylloc, scanner, errmsg);
+ free($1); $1 = NULL;
+ free($3); $3 = NULL;
+ YYABORT;
+ }
$$ = sdb_store_expr_attrvalue($3);
free($1); $1 = NULL;
free($3); $3 = NULL;
sdb_log(SDB_LOG_ERR, "frontend: parse error: %s", msg);
} /* sdb_fe_yyerror */
+static sdb_store_matcher_t *
+name_matcher(const char *type_name, const char *cmp, sdb_store_expr_t *expr)
+{
+ int type = sdb_store_parse_object_type(type_name);
+ sdb_store_matcher_op_cb cb = sdb_store_parse_matcher_op(cmp);
+ sdb_store_expr_t *e;
+ sdb_store_matcher_t *m;
+ assert(cb);
+
+ /* TODO: this only works as long as queries
+ * are limited to hosts */
+ if (type != SDB_HOST)
+ return NULL;
+
+ e = sdb_store_expr_fieldvalue(SDB_FIELD_NAME);
+ m = cb(e, expr);
+ sdb_object_deref(SDB_OBJ(e));
+ return m;
+} /* name_matcher */
+
+static sdb_store_matcher_t *
+name_iter_matcher(int m_type, const char *type_name, const char *cmp,
+ sdb_store_expr_t *expr)
+{
+ int type = sdb_store_parse_object_type(type_name);
+ sdb_store_matcher_op_cb cb = sdb_store_parse_matcher_op(cmp);
+ sdb_store_expr_t *e;
+ sdb_store_matcher_t *m, *tmp = NULL;
+ assert(cb);
+
+ /* TODO: this only works as long as queries
+ * are limited to hosts */
+ if (type == SDB_HOST) {
+ return NULL;
+ }
+
+ e = sdb_store_expr_fieldvalue(SDB_FIELD_NAME);
+ m = cb(e, expr);
+ if (m_type == MATCHER_ANY)
+ tmp = sdb_store_any_matcher(type, m);
+ else if (m_type == MATCHER_ALL)
+ tmp = sdb_store_all_matcher(type, m);
+ sdb_object_deref(SDB_OBJ(m));
+ sdb_object_deref(SDB_OBJ(e));
+ return tmp;
+} /* name_iter_matcher */
+
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */