frontend/grammar: Make IS NULL operators available to any expression.

[sysdb.git] / src / frontend / grammar.y

diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index 0f01bd33e8a12ba517f4f062315c25a2444602d5..cc0d5b94d475d6ccce027aab7e3601e957ecdc1a 100644 (file)
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
@@ -56,6 +56,12 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 /* 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
@@ -142,17 +148,20 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 
 %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;
                        }
@@ -165,11 +174,13 @@ 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($1));
                                YYABORT;
                        }
@@ -182,11 +193,13 @@ statements:
        |
        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;
                        }
@@ -196,6 +209,31 @@ statements:
                                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:
@@ -355,7 +393,7 @@ condition:
 
                        $$ = 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;
                }
        ;
@@ -412,7 +450,7 @@ compare_matcher:
                        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;
@@ -420,23 +458,16 @@ compare_matcher:
                        sdb_object_deref(SDB_OBJ($6));
                }
        |
-       IDENTIFIER '[' IDENTIFIER ']' IS NULL_T
+       expression IS NULL_T
                {
-                       $$ = sdb_store_matcher_parse_cmp($1, $3, "IS", NULL);
-                       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_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_isnnull_matcher($1);
+                       sdb_object_deref(SDB_OBJ($1));
                }
        ;
 
@@ -495,7 +526,7 @@ expression:
                        $$ = sdb_store_expr_fieldvalue(field);
                }
        |
-       IDENTIFIER '[' IDENTIFIER ']'
+       IDENTIFIER '[' STRING ']'
                {
                        $$ = sdb_store_expr_attrvalue($3);
                        free($1); $1 = NULL;