diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index 24a13757833635acbeee7dc4e2e3328042202f2f..cc0d5b94d475d6ccce027aab7e3601e957ecdc1a 100644 (file)
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
sdb_object_deref(SDB_OBJ($3));
}
|
- IDENTIFIER '[' IDENTIFIER ']' cmp expression
+ IDENTIFIER '[' STRING ']' cmp expression
{
$$ = sdb_store_matcher_parse_cmp($1, $3, $5, $6);
free($1); $1 = NULL;
sdb_object_deref(SDB_OBJ($6));
}
|
- IDENTIFIER '[' IDENTIFIER ']' IS 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_isnull_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));
}
|
- IDENTIFIER '[' IDENTIFIER ']' IS NOT NULL_T
+ expression IS NOT 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_isnnull_matcher($1);
+ sdb_object_deref(SDB_OBJ($1));
}
;
$$ = sdb_store_expr_fieldvalue(field);
}
|
- IDENTIFIER '[' IDENTIFIER ']'
+ IDENTIFIER '[' STRING ']'
{
$$ = sdb_store_expr_attrvalue($3);
free($1); $1 = NULL;