diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index 4f7a8913630c547b19c5edc86b4d320804ecd2ec..450a20f34218ef1df4db9e713bb3b0247cddc0bb 100644 (file)
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
#include "frontend/grammar.h"
#include "core/store.h"
#include "frontend/grammar.h"
#include "core/store.h"
+#include "core/store-private.h"
#include "utils/error.h"
#include "utils/llist.h"
#include "utils/error.h"
#include "utils/llist.h"
sdb_llist_t *list;
sdb_conn_node_t *node;
sdb_llist_t *list;
sdb_conn_node_t *node;
+
+ sdb_store_matcher_t *m;
}
%start statements
%token SCANNER_ERROR
}
%start statements
%token SCANNER_ERROR
-%token <str> IDENTIFIER
-%token <node> FETCH LIST
+%token AND OR NOT WHERE
+
+%token CMP_EQUAL CMP_NEQUAL CMP_REGEX CMP_NREGEX
+
+%token <str> IDENTIFIER STRING
+%token <node> FETCH LIST LOOKUP
+
+/* Precedence (lowest first): */
+%left OR
+%left AND
+%left NOT
+%left CMP_EQUAL CMP_NEQUAL
+%left CMP_REGEX CMP_NREGEX
+%left '(' ')'
+%left '.'
%type <list> statements
%type <node> statement
fetch_statement
list_statement
%type <list> statements
%type <node> statement
fetch_statement
list_statement
+ lookup_statement
expression
expression
+%type <m> matcher
+ compare_matcher
+
%%
statements:
%%
statements:
sdb_fe_yyerror(&yylloc, scanner,
YY_("syntax error, unexpected statement, "
"expecting expression"));
sdb_fe_yyerror(&yylloc, scanner,
YY_("syntax error, unexpected statement, "
"expecting expression"));
+ sdb_object_deref(SDB_OBJ($3));
YYABORT;
}
YYABORT;
}
sdb_fe_yyerror(&yylloc, scanner,
YY_("syntax error, unexpected statement, "
"expecting expression"));
sdb_fe_yyerror(&yylloc, scanner,
YY_("syntax error, unexpected statement, "
"expecting expression"));
+ sdb_object_deref(SDB_OBJ($1));
YYABORT;
}
YYABORT;
}
sdb_fe_yyerror(&yylloc, scanner,
YY_("syntax error, unexpected expression, "
"expecting statement"));
sdb_fe_yyerror(&yylloc, scanner,
YY_("syntax error, unexpected expression, "
"expecting statement"));
+ sdb_object_deref(SDB_OBJ($1));
YYABORT;
}
YYABORT;
}
|
list_statement
|
|
list_statement
|
+ lookup_statement
+ |
/* empty */
{
$$ = NULL;
}
;
/* empty */
{
$$ = NULL;
}
;
+/*
+ * FETCH <hostname>;
+ *
+ * Retrieve detailed information about a single host.
+ */
fetch_statement:
fetch_statement:
- FETCH IDENTIFIER
+ FETCH STRING
{
$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
conn_fetch_t, conn_fetch_destroy));
CONN_FETCH($$)->name = strdup($2);
$$->cmd = CONNECTION_FETCH;
{
$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
conn_fetch_t, conn_fetch_destroy));
CONN_FETCH($$)->name = strdup($2);
$$->cmd = CONNECTION_FETCH;
- free($2);
- $2 = NULL;
+ free($2); $2 = NULL;
}
;
}
;
+/*
+ * LIST;
+ *
+ * Returns a list of all hosts in the store.
+ */
list_statement:
LIST
{
list_statement:
LIST
{
}
;
}
;
+/*
+ * LOOKUP <type> WHERE <expression>;
+ *
+ * Returns detailed information about <type> matching expression.
+ */
+lookup_statement:
+ LOOKUP IDENTIFIER WHERE expression
+ {
+ /* TODO: support other types as well */
+ if (strcasecmp($2, "hosts")) {
+ char errmsg[strlen($2) + 32];
+ snprintf(errmsg, sizeof(errmsg),
+ YY_("unknown table %s"), $2);
+ sdb_fe_yyerror(&yylloc, scanner, errmsg);
+ free($2); $2 = NULL;
+ sdb_object_deref(SDB_OBJ($4));
+ YYABORT;
+ }
+
+ $$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
+ conn_lookup_t, conn_lookup_destroy));
+ CONN_LOOKUP($$)->matcher = CONN_MATCHER($4);
+ $$->cmd = CONNECTION_LOOKUP;
+ free($2); $2 = NULL;
+ }
+ ;
+
expression:
expression:
- IDENTIFIER
+ matcher
{
{
- $$ = SDB_CONN_NODE(sdb_object_create_T(/* name = */ NULL,
- conn_node_matcher_t));
+ if (! $1) {
+ /* TODO: improve error reporting */
+ sdb_fe_yyerror(&yylloc, scanner,
+ YY_("syntax error, invalid expression"));
+ YYABORT;
+ }
+
+ $$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
+ conn_node_matcher_t, conn_matcher_destroy));
$$->cmd = CONNECTION_EXPR;
$$->cmd = CONNECTION_EXPR;
- /* XXX: this is just a placeholder for now */
- CONN_MATCHER($$)->matcher = sdb_store_host_matcher($1,
- /* name_re = */ NULL, /* service = */ NULL,
- /* attr = */ NULL);
- free($1);
- $1 = NULL;
+ CONN_MATCHER($$)->matcher = $1;
+ }
+ ;
+
+matcher:
+ '(' matcher ')'
+ {
+ $$ = $2;
+ }
+ |
+ matcher AND matcher
+ {
+ $$ = sdb_store_con_matcher($1, $3);
+ sdb_object_deref(SDB_OBJ($1));
+ sdb_object_deref(SDB_OBJ($3));
+ }
+ |
+ matcher OR matcher
+ {
+ $$ = sdb_store_dis_matcher($1, $3);
+ sdb_object_deref(SDB_OBJ($1));
+ sdb_object_deref(SDB_OBJ($3));
+ }
+ |
+ NOT matcher
+ {
+ $$ = sdb_store_inv_matcher($2);
+ sdb_object_deref(SDB_OBJ($2));
+ }
+ |
+ compare_matcher
+ {
+ $$ = $1;
+ }
+ ;
+
+/*
+ * <object_type>.<object_attr> <op> <value>
+ *
+ * Parse matchers comparing object attributes with a value.
+ */
+compare_matcher:
+ IDENTIFIER '.' IDENTIFIER CMP_EQUAL STRING
+ {
+ $$ = sdb_store_matcher_parse_cmp($1, $3, "=", $5);
+ /* TODO: simplify memory management in the parser */
+ free($1); $1 = NULL;
+ free($3); $3 = NULL;
+ free($5); $5 = NULL;
+ }
+ |
+ IDENTIFIER '.' IDENTIFIER CMP_NEQUAL STRING
+ {
+ $$ = sdb_store_matcher_parse_cmp($1, $3, "!=", $5);
+ /* TODO: simplify memory management in the parser */
+ free($1); $1 = NULL;
+ free($3); $3 = NULL;
+ free($5); $5 = NULL;
+ }
+ |
+ IDENTIFIER '.' IDENTIFIER CMP_REGEX STRING
+ {
+ $$ = sdb_store_matcher_parse_cmp($1, $3, "=~", $5);
+ free($1); $1 = NULL;
+ free($3); $3 = NULL;
+ free($5); $5 = NULL;
+ }
+ |
+ IDENTIFIER '.' IDENTIFIER CMP_NREGEX STRING
+ {
+ $$ = sdb_store_matcher_parse_cmp($1, $3, "!~", $5);
+ free($1); $1 = NULL;
+ free($3); $3 = NULL;
+ free($5); $5 = NULL;
}
;
%%
}
;
%%
+/* XXX: on parse errors, allocated objects, strings, etc. need to be freed */
+
void
sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg)
{
void
sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg)
{