![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index 0f01bd33e8a12ba517f4f062315c25a2444602d5..3c813dcddb05d6ff54ac4a1d93fde958f4afab08 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>
/* quick access to the parser mode */
#define parser_mode sdb_fe_yyget_extra(scanner)->mode
+#define MODE_TO_STRING(m) \
+ (((m) == SDB_PARSE_DEFAULT) ? "statement" \
+ : ((m) == SDB_PARSE_COND) ? "condition" \
+ : ((m) == SDB_PARSE_EXPR) ? "expression" \
+ : "UNKNOWN")
+
%}
%pure-parser
%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 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 '+' '-'
%destructor { free($$); } <str>
%destructor { sdb_object_deref(SDB_OBJ($$)); } <node> <m> <expr>
+%destructor { sdb_data_free_datum(&$$); } <data>
%%
statements:
statements ';' statement
{
- /* only accept this in default parse mode */
+ /* only accepted in default parse mode */
if (parser_mode != SDB_PARSE_DEFAULT) {
- sdb_fe_yyerror(&yylloc, scanner,
+ char errmsg[1024];
+ snprintf(errmsg, sizeof(errmsg),
YY_("syntax error, unexpected statement, "
- "expecting condition"));
+ "expecting %s"), MODE_TO_STRING(parser_mode));
+ sdb_fe_yyerror(&yylloc, scanner, errmsg);
sdb_object_deref(SDB_OBJ($3));
YYABORT;
}
|
statement
{
- /* only accept this in default parse mode */
+ /* only accepted in default parse mode */
if (parser_mode != SDB_PARSE_DEFAULT) {
- sdb_fe_yyerror(&yylloc, scanner,
+ char errmsg[1024];
+ snprintf(errmsg, sizeof(errmsg),
YY_("syntax error, unexpected statement, "
- "expecting condition"));
+ "expecting %s"), MODE_TO_STRING(parser_mode));
+ sdb_fe_yyerror(&yylloc, scanner, errmsg);
sdb_object_deref(SDB_OBJ($1));
YYABORT;
}
|
condition
{
- /* only accept this in condition parse mode */
+ /* only accepted in condition parse mode */
if (! (parser_mode & SDB_PARSE_COND)) {
- sdb_fe_yyerror(&yylloc, scanner,
+ char errmsg[1024];
+ snprintf(errmsg, sizeof(errmsg),
YY_("syntax error, unexpected condition, "
- "expecting statement"));
+ "expecting %s"), MODE_TO_STRING(parser_mode));
+ sdb_fe_yyerror(&yylloc, scanner, errmsg);
sdb_object_deref(SDB_OBJ($1));
YYABORT;
}
sdb_object_deref(SDB_OBJ($1));
}
}
+ |
+ expression
+ {
+ /* only accepted in expression parse mode */
+ if (! (parser_mode & SDB_PARSE_EXPR)) {
+ char errmsg[1024];
+ snprintf(errmsg, sizeof(errmsg),
+ YY_("syntax error, unexpected expression, "
+ "expecting %s"), MODE_TO_STRING(parser_mode));
+ sdb_fe_yyerror(&yylloc, scanner, errmsg);
+ sdb_object_deref(SDB_OBJ($1));
+ YYABORT;
+ }
+
+ if ($1) {
+ sdb_conn_node_t *n;
+ n = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
+ conn_expr_t, conn_expr_destroy));
+ n->cmd = CONNECTION_EXPR;
+ CONN_EXPR(n)->expr = $1;
+
+ sdb_llist_append(pt, SDB_OBJ(n));
+ sdb_object_deref(SDB_OBJ(n));
+ }
+ }
;
statement:
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);
$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
conn_matcher_t, conn_matcher_destroy));
- $$->cmd = CONNECTION_EXPR;
+ $$->cmd = CONNECTION_MATCHER;
CONN_MATCHER($$)->matcher = $1;
}
;
}
;
-/*
- * <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);
+ int type = sdb_store_parse_object_type($1);
+ sdb_store_expr_t *e = sdb_store_expr_fieldvalue(SDB_FIELD_NAME);
+ sdb_store_matcher_op_cb cb = sdb_store_parse_matcher_op($2);
+ sdb_store_matcher_t *m;
+ assert(cb);
+
+ m = cb(e, $3);
+ /* TODO: this only works as long as queries
+ * are limited to hosts */
+ if (type == SDB_HOST) {
+ $$ = m;
+ }
+ else {
+ $$ = sdb_store_child_matcher(type, m);
+ sdb_object_deref(SDB_OBJ(m));
+ }
+
free($1); $1 = NULL;
sdb_object_deref(SDB_OBJ($3));
+ sdb_object_deref(SDB_OBJ(e));
}
|
- IDENTIFIER '[' IDENTIFIER ']' cmp expression
+ expression IS NULL_T
{
- $$ = sdb_store_matcher_parse_cmp($1, $3, $5, $6);
- free($1); $1 = NULL;
- free($3); $3 = NULL;
- sdb_object_deref(SDB_OBJ($6));
+ $$ = sdb_store_isnull_matcher($1);
+ sdb_object_deref(SDB_OBJ($1));
}
|
- IDENTIFIER '[' IDENTIFIER ']' IS NULL_T
+ expression IS NOT NULL_T
{
- $$ = sdb_store_matcher_parse_cmp($1, $3, "IS", NULL);
- free($1); $1 = NULL;
- free($3); $3 = NULL;
+ $$ = sdb_store_isnnull_matcher($1);
+ sdb_object_deref(SDB_OBJ($1));
}
|
- IDENTIFIER '[' IDENTIFIER ']' IS NOT NULL_T
+ expression IN expression
{
- sdb_store_matcher_t *m;
- m = sdb_store_matcher_parse_cmp($1, $3, "IS", NULL);
- free($1); $1 = NULL;
- free($3); $3 = NULL;
-
- /* sdb_store_inv_matcher return NULL if m==NULL */
- $$ = sdb_store_inv_matcher(m);
- sdb_object_deref(SDB_OBJ(m));
+ $$ = sdb_store_in_matcher($1, $3);
+ sdb_object_deref(SDB_OBJ($1));
+ sdb_object_deref(SDB_OBJ($3));
}
;
$$ = sdb_store_expr_fieldvalue(field);
}
|
- IDENTIFIER '[' IDENTIFIER ']'
+ 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;