![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index 08f8414142f58123dd63c9cf7c991d96c6bff5ff..24a13757833635acbeee7dc4e2e3328042202f2f 100644 (file)
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
/* 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
%type <expr> expression
-%type <sstr> op
+%type <sstr> cmp
%type <data> data
interval interval_elem
%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:
$$ = 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> <op> <value>
+ * <object_type>.<object_attr> <cmp> <value>
*
* Parse matchers comparing object attributes with a value.
*/
compare_matcher:
- ':' IDENTIFIER op expression
+ '.' IDENTIFIER cmp expression
{
$$ = sdb_store_matcher_parse_field_cmp($2, $3, $4);
free($2); $2 = NULL;
sdb_object_deref(SDB_OBJ($4));
}
|
- IDENTIFIER op expression
+ IDENTIFIER cmp expression
{
$$ = sdb_store_matcher_parse_cmp($1, NULL, $2, $3);
free($1); $1 = NULL;
sdb_object_deref(SDB_OBJ($3));
}
|
- IDENTIFIER '[' IDENTIFIER ']' op expression
+ IDENTIFIER '[' IDENTIFIER ']' cmp expression
{
$$ = sdb_store_matcher_parse_cmp($1, $3, $5, $6);
free($1); $1 = NULL;
|
IDENTIFIER '[' IDENTIFIER ']' IS NULL_T
{
- $$ = sdb_store_matcher_parse_cmp($1, $3, "IS", NULL);
+ 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;
}
|
IDENTIFIER '[' IDENTIFIER ']' IS NOT NULL_T
{
- sdb_store_matcher_t *m;
- m = sdb_store_matcher_parse_cmp($1, $3, "IS", NULL);
+ 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_inv_matcher return NULL if m==NULL */
- $$ = sdb_store_inv_matcher(m);
- sdb_object_deref(SDB_OBJ(m));
}
;
sdb_object_deref(SDB_OBJ($3)); $3 = NULL;
}
|
- ':' IDENTIFIER
+ expression CONCAT expression
+ {
+ $$ = sdb_store_expr_create(SDB_DATA_CONCAT, $1, $3);
+ sdb_object_deref(SDB_OBJ($1)); $1 = NULL;
+ sdb_object_deref(SDB_OBJ($3)); $3 = NULL;
+ }
+ |
+ '.' IDENTIFIER
{
int field = sdb_store_parse_field_name($2);
free($2); $2 = NULL;
$$ = sdb_store_expr_fieldvalue(field);
}
|
+ IDENTIFIER '[' IDENTIFIER ']'
+ {
+ $$ = sdb_store_expr_attrvalue($3);
+ free($1); $1 = NULL;
+ free($3); $3 = NULL;
+ }
+ |
data
{
$$ = sdb_store_expr_constvalue(&$1);
}
;
-op:
+cmp:
CMP_EQUAL { $$ = "="; }
|
CMP_NEQUAL { $$ = "!="; }