frontend: Improved parser error reporting.

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

diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index b400f9acc51736fc43ebed4cb7a02ea6b03036af..ab9345e22c80272b6cbd4b84b0fd7ce4472fda87 100644 (file)
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
@@ -63,6 +63,8 @@ sdb_fe_yyget_extra(sdb_fe_yyscan_t scanner);
 
 void
 sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
+void
+sdb_fe_yyerrorf(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *fmt, ...);
 
 /* quick access to the current parse tree */
 #define pt sdb_fe_yyget_extra(scanner)->parsetree
@@ -70,6 +72,9 @@ 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
 
+/* quick access to the parser's error buffer */
+#define errbuf sdb_fe_yyget_extra(scanner)->errbuf
+
 #define MODE_TO_STRING(m) \
        (((m) == SDB_PARSE_DEFAULT) ? "statement" \
                : ((m) == SDB_PARSE_COND) ? "condition" \
@@ -158,7 +163,7 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 
 %type <expr> expression
 
-%type <integer> object_type_plural
+%type <integer> object_type object_type_plural
 %type <integer> iterable
 %type <integer> field
 
@@ -181,11 +186,9 @@ statements:
                {
                        /* only accepted in default parse mode */
                        if (parser_mode != SDB_PARSE_DEFAULT) {
-                               char errmsg[1024];
-                               snprintf(errmsg, sizeof(errmsg),
+                               sdb_fe_yyerrorf(&yylloc, scanner,
                                                YY_("syntax error, unexpected statement, "
                                                        "expecting %s"), MODE_TO_STRING(parser_mode));
-                               sdb_fe_yyerror(&yylloc, scanner, errmsg);
                                sdb_object_deref(SDB_OBJ($3));
                                YYABORT;
                        }
@@ -200,11 +203,9 @@ statements:
                {
                        /* only accepted in default parse mode */
                        if (parser_mode != SDB_PARSE_DEFAULT) {
-                               char errmsg[1024];
-                               snprintf(errmsg, sizeof(errmsg),
+                               sdb_fe_yyerrorf(&yylloc, scanner,
                                                YY_("syntax error, unexpected statement, "
                                                        "expecting %s"), MODE_TO_STRING(parser_mode));
-                               sdb_fe_yyerror(&yylloc, scanner, errmsg);
                                sdb_object_deref(SDB_OBJ($1));
                                YYABORT;
                        }
@@ -219,11 +220,9 @@ statements:
                {
                        /* only accepted in condition parse mode */
                        if (! (parser_mode & SDB_PARSE_COND)) {
-                               char errmsg[1024];
-                               snprintf(errmsg, sizeof(errmsg),
+                               sdb_fe_yyerrorf(&yylloc, scanner,
                                                YY_("syntax error, unexpected condition, "
                                                        "expecting %s"), MODE_TO_STRING(parser_mode));
-                               sdb_fe_yyerror(&yylloc, scanner, errmsg);
                                sdb_object_deref(SDB_OBJ($1));
                                YYABORT;
                        }
@@ -238,11 +237,9 @@ statements:
                {
                        /* only accepted in expression parse mode */
                        if (! (parser_mode & SDB_PARSE_EXPR)) {
-                               char errmsg[1024];
-                               snprintf(errmsg, sizeof(errmsg),
+                               sdb_fe_yyerrorf(&yylloc, scanner,
                                                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;
                        }
@@ -281,18 +278,27 @@ statement:
  * Retrieve detailed information about a single host.
  */
 fetch_statement:
-       FETCH HOST_T STRING filter_clause
+       FETCH object_type STRING filter_clause
                {
-                       /* TODO: support other types as well */
-
                        $$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
                                                conn_fetch_t, conn_fetch_destroy));
-                       CONN_FETCH($$)->type = SDB_HOST;
+                       CONN_FETCH($$)->type = $2;
                        CONN_FETCH($$)->host = $3;
                        CONN_FETCH($$)->name = NULL;
                        CONN_FETCH($$)->filter = CONN_MATCHER($4);
                        $$->cmd = CONNECTION_FETCH;
                }
+       |
+       FETCH object_type STRING '.' STRING filter_clause
+               {
+                       $$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
+                                               conn_fetch_t, conn_fetch_destroy));
+                       CONN_FETCH($$)->type = $2;
+                       CONN_FETCH($$)->host = $3;
+                       CONN_FETCH($$)->name = $5;
+                       CONN_FETCH($$)->filter = CONN_MATCHER($6);
+                       $$->cmd = CONNECTION_FETCH;
+               }
        ;
 
 /*
@@ -536,6 +542,14 @@ expression:
                }
        ;
 
+object_type:
+       HOST_T { $$ = SDB_HOST; }
+       |
+       SERVICE_T { $$ = SDB_SERVICE; }
+       |
+       METRIC_T { $$ = SDB_METRIC; }
+       ;
+
 object_type_plural:
        HOSTS_T { $$ = SDB_HOST; }
        |
@@ -618,10 +632,8 @@ interval_elem:
 
                        unit = sdb_strpunit($2);
                        if (! unit) {
-                               char errmsg[strlen($2) + 32];
-                               snprintf(errmsg, sizeof(errmsg),
+                               sdb_fe_yyerrorf(&yylloc, scanner,
                                                YY_("invalid time unit %s"), $2);
-                               sdb_fe_yyerror(&yylloc, scanner, errmsg);
                                free($2); $2 = NULL;
                                YYABORT;
                        }
@@ -644,8 +656,20 @@ void
 sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg)
 {
        sdb_log(SDB_LOG_ERR, "frontend: parse error: %s", msg);
+       sdb_strbuf_sprintf(errbuf, "%s", msg);
 } /* sdb_fe_yyerror */
 
+void
+sdb_fe_yyerrorf(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *fmt, ...)
+{
+       va_list ap, aq;
+       va_start(ap, fmt);
+       va_copy(aq, ap);
+       sdb_vlog(SDB_LOG_ERR, fmt, ap);
+       sdb_strbuf_vsprintf(errbuf, "%s", aq);
+       va_end(ap);
+} /* sdb_fe_yyerrorf */
+
 static sdb_store_matcher_t *
 name_iter_matcher(int m_type, int type, const char *cmp,
                sdb_store_expr_t *expr)