parser: Fixed setup of iterator nodes.

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

diff --git a/src/parser/grammar.y b/src/parser/grammar.y
index bdba4ea4e453022c19e8a8eaa5f7b80852fa53d4..801462617755d305739e4ef28ac237dd8ce4d5cd 100644 (file)
--- a/src/parser/grammar.y
+++ b/src/parser/grammar.y
@@ -279,7 +279,7 @@ statement:
 fetch_statement:
        FETCH object_type STRING filter_clause
                {
-                       $$ = sdb_ast_fetch_create($2, $3, NULL, $4);
+                       $$ = sdb_ast_fetch_create($2, NULL, $3, $4);
                        CK_OOM($$);
                }
        |
@@ -453,13 +453,17 @@ comparison:
        |
        ANY expression cmp expression
                {
-                       $$ = sdb_ast_iter_create(SDB_AST_ANY, $3, $2, $4);
+                       sdb_ast_node_t *n = sdb_ast_op_create($3, NULL, $4);
+                       CK_OOM(n);
+                       $$ = sdb_ast_iter_create(SDB_AST_ANY, $2, n);
                        CK_OOM($$);
                }
        |
        ALL expression cmp expression
                {
-                       $$ = sdb_ast_iter_create(SDB_AST_ALL, $3, $2, $4);
+                       sdb_ast_node_t *n = sdb_ast_op_create($3, NULL, $4);
+                       CK_OOM(n);
+                       $$ = sdb_ast_iter_create(SDB_AST_ALL, $2, n);
                        CK_OOM($$);
                }
        |