X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fgrammar.y;h=a2ae448cc744166875afd8e0f4904b5a186ad5cf;hp=3802c9c97de1aa70c8d387acd99df728c70ed0bb;hb=b4d485cde96751e1ec832d0e75a3e6081006a1a4;hpb=192c24079685a32bcfff24e332c460ced0e51565

diff --git a/src/frontend/grammar.y b/src/frontend/grammar.y
index 3802c9c..a2ae448 100644
--- a/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
@@ -32,6 +32,7 @@
 #include "frontend/grammar.h"
 
 #include "core/store.h"
+#include "core/store-private.h"
 
 #include "utils/error.h"
 #include "utils/llist.h"
@@ -62,27 +63,74 @@ sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 %locations
 %error-verbose
 %expect 0
-%name-prefix="sdb_fe_yy"
+%name-prefix "sdb_fe_yy"
 
 %union {
+	const char *sstr; /* static string */
 	char *str;
 
+	sdb_data_t data;
+
 	sdb_llist_t     *list;
 	sdb_conn_node_t *node;
+
+	sdb_store_matcher_t *m;
+	sdb_store_expr_t *expr;
 }
 
 %start statements
 
 %token SCANNER_ERROR
 
+%token AND OR IS NOT MATCHING FILTER
+%token CMP_EQUAL CMP_NEQUAL CMP_REGEX CMP_NREGEX
+%token CMP_LT CMP_LE CMP_GE CMP_GT
+%token CONCAT
+
+/* NULL token */
+%token NULL_T
+
+%token FETCH LIST LOOKUP
+
 %token <str> IDENTIFIER STRING
-%token <node> FETCH LIST
+
+%token <data> INTEGER FLOAT
+
+/* Precedence (lowest first): */
+%left OR
+%left AND
+%right NOT
+%left CMP_EQUAL CMP_NEQUAL
+%left CMP_LT CMP_LE CMP_GE CMP_GT
+%nonassoc CMP_REGEX CMP_NREGEX
+%left CONCAT
+%nonassoc IS
+%left '+' '-'
+%left '*' '/' '%'
+%left '(' ')'
+%left '.'
 
 %type <list> statements
 %type <node> statement
 	fetch_statement
 	list_statement
-	expression
+	lookup_statement
+	matching_clause
+	filter_clause
+	condition
+
+%type <m> matcher
+	compare_matcher
+
+%type <expr> expression
+
+%type <sstr> op
+
+%type <data> data
+	interval interval_elem
+
+%destructor { free($$); } <str>
+%destructor { sdb_object_deref(SDB_OBJ($$)); } <node> <m> <expr>
 
 %%
 
@@ -93,7 +141,8 @@ statements:
 			if (parser_mode != SDB_PARSE_DEFAULT) {
 				sdb_fe_yyerror(&yylloc, scanner,
 						YY_("syntax error, unexpected statement, "
-							"expecting expression"));
+							"expecting condition"));
+				sdb_object_deref(SDB_OBJ($3));
 				YYABORT;
 			}
 
@@ -109,7 +158,8 @@ statements:
 			if (parser_mode != SDB_PARSE_DEFAULT) {
 				sdb_fe_yyerror(&yylloc, scanner,
 						YY_("syntax error, unexpected statement, "
-							"expecting expression"));
+							"expecting condition"));
+				sdb_object_deref(SDB_OBJ($1));
 				YYABORT;
 			}
 
@@ -119,13 +169,14 @@ statements:
 			}
 		}
 	|
-	expression
+	condition
 		{
-			/* only accept this in expression parse mode */
-			if (! (parser_mode & SDB_PARSE_EXPR)) {
+			/* only accept this in condition parse mode */
+			if (! (parser_mode & SDB_PARSE_COND)) {
 				sdb_fe_yyerror(&yylloc, scanner,
-						YY_("syntax error, unexpected expression, "
+						YY_("syntax error, unexpected condition, "
 							"expecting statement"));
+				sdb_object_deref(SDB_OBJ($1));
 				YYABORT;
 			}
 
@@ -141,6 +192,8 @@ statement:
 	|
 	list_statement
 	|
+	lookup_statement
+	|
 	/* empty */
 		{
 			$$ = NULL;
@@ -153,14 +206,14 @@ statement:
  * Retrieve detailed information about a single host.
  */
 fetch_statement:
-	FETCH STRING
+	FETCH STRING filter_clause
 		{
 			$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
 						conn_fetch_t, conn_fetch_destroy));
 			CONN_FETCH($$)->name = strdup($2);
+			CONN_FETCH($$)->filter = CONN_MATCHER($3);
 			$$->cmd = CONNECTION_FETCH;
-			free($2);
-			$2 = NULL;
+			free($2); $2 = NULL;
 		}
 	;
 
@@ -170,26 +223,271 @@ fetch_statement:
  * Returns a list of all hosts in the store.
  */
 list_statement:
-	LIST
+	LIST filter_clause
 		{
-			$$ = SDB_CONN_NODE(sdb_object_create_T(/* name = */ NULL,
-						sdb_conn_node_t));
+			$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
+						conn_list_t, conn_list_destroy));
+			CONN_LIST($$)->filter = CONN_MATCHER($2);
 			$$->cmd = CONNECTION_LIST;
 		}
 	;
 
-expression:
-	STRING
+/*
+ * LOOKUP <type> MATCHING <condition> [FILTER <condition>];
+ *
+ * Returns detailed information about <type> matching condition.
+ */
+lookup_statement:
+	LOOKUP IDENTIFIER matching_clause filter_clause
+		{
+			/* TODO: support other types as well */
+			if (strcasecmp($2, "hosts")) {
+				char errmsg[strlen($2) + 32];
+				snprintf(errmsg, sizeof(errmsg),
+						YY_("unknown data-source %s"), $2);
+				sdb_fe_yyerror(&yylloc, scanner, errmsg);
+				free($2); $2 = NULL;
+				sdb_object_deref(SDB_OBJ($3));
+				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($3);
+			CONN_LOOKUP($$)->filter = CONN_MATCHER($4);
+			$$->cmd = CONNECTION_LOOKUP;
+			free($2); $2 = NULL;
+		}
+	;
+
+matching_clause:
+	MATCHING condition { $$ = $2; }
+	|
+	/* empty */ { $$ = NULL; }
+
+filter_clause:
+	FILTER condition { $$ = $2; }
+	|
+	/* empty */ { $$ = NULL; }
+
+/*
+ * Basic expressions.
+ */
+
+condition:
+	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 condition"));
+				YYABORT;
+			}
+
+			$$ = SDB_CONN_NODE(sdb_object_create_dT(/* name = */ NULL,
+						conn_matcher_t, conn_matcher_destroy));
 			$$->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 op expression
+		{
+			$$ = sdb_store_matcher_parse_field_cmp($2, $3, $4);
+			free($2); $2 = NULL;
+			sdb_object_deref(SDB_OBJ($4));
+		}
+	|
+	IDENTIFIER op expression
+		{
+			$$ = sdb_store_matcher_parse_cmp($1, NULL, $2, $3);
+			free($1); $1 = NULL;
+			sdb_object_deref(SDB_OBJ($3));
+		}
+	|
+	IDENTIFIER '.' IDENTIFIER op expression
+		{
+			$$ = sdb_store_matcher_parse_cmp($1, $3, $4, $5);
+			free($1); $1 = NULL;
+			free($3); $3 = NULL;
+			sdb_object_deref(SDB_OBJ($5));
+		}
+	|
+	IDENTIFIER '.' IDENTIFIER IS NULL_T
+		{
+			$$ = sdb_store_matcher_parse_cmp($1, $3, "IS", NULL);
+			free($1); $1 = NULL;
+			free($3); $3 = NULL;
+		}
+	|
+	IDENTIFIER '.' IDENTIFIER 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));
+		}
+	;
+
+expression:
+	'(' expression ')'
+		{
+			$$ = $2;
+		}
+	|
+	expression '+' expression
+		{
+			$$ = sdb_store_expr_create(SDB_DATA_ADD, $1, $3);
+			sdb_object_deref(SDB_OBJ($1)); $1 = NULL;
+			sdb_object_deref(SDB_OBJ($3)); $3 = NULL;
+		}
+	|
+	expression '-' expression
+		{
+			$$ = sdb_store_expr_create(SDB_DATA_SUB, $1, $3);
+			sdb_object_deref(SDB_OBJ($1)); $1 = NULL;
+			sdb_object_deref(SDB_OBJ($3)); $3 = NULL;
+		}
+	|
+	expression '*' expression
+		{
+			$$ = sdb_store_expr_create(SDB_DATA_MUL, $1, $3);
+			sdb_object_deref(SDB_OBJ($1)); $1 = NULL;
+			sdb_object_deref(SDB_OBJ($3)); $3 = NULL;
+		}
+	|
+	expression '/' expression
+		{
+			$$ = sdb_store_expr_create(SDB_DATA_DIV, $1, $3);
+			sdb_object_deref(SDB_OBJ($1)); $1 = NULL;
+			sdb_object_deref(SDB_OBJ($3)); $3 = NULL;
+		}
+	|
+	expression '%' expression
+		{
+			$$ = sdb_store_expr_create(SDB_DATA_MOD, $1, $3);
+			sdb_object_deref(SDB_OBJ($1)); $1 = NULL;
+			sdb_object_deref(SDB_OBJ($3)); $3 = NULL;
+		}
+	|
+	':' IDENTIFIER
+		{
+			int field = sdb_store_parse_field_name($2);
+			free($2); $2 = NULL;
+			$$ = sdb_store_expr_fieldvalue(field);
+		}
+	|
+	data
+		{
+			$$ = sdb_store_expr_constvalue(&$1);
+			sdb_data_free_datum(&$1);
+		}
+	;
+
+op:
+	CMP_EQUAL { $$ = "="; }
+	|
+	CMP_NEQUAL { $$ = "!="; }
+	|
+	CMP_REGEX { $$ = "=~"; }
+	|
+	CMP_NREGEX { $$ = "!~"; }
+	|
+	CMP_LT { $$ = "<"; }
+	|
+	CMP_LE { $$ = "<="; }
+	|
+	CMP_GE { $$ = ">="; }
+	|
+	CMP_GT { $$ = ">"; }
+	;
+
+data:
+	STRING { $$.type = SDB_TYPE_STRING; $$.data.string = $1; }
+	|
+	INTEGER { $$ = $1; }
+	|
+	FLOAT { $$ = $1; }
+	|
+	interval { $$ = $1; }
+	;
+
+interval:
+	interval interval_elem
+		{
+			$$.data.datetime = $1.data.datetime + $2.data.datetime;
+		}
+	|
+	interval_elem { $$ = $1; }
+	;
+
+interval_elem:
+	INTEGER IDENTIFIER
+		{
+			sdb_time_t unit = 1;
+
+			unit = sdb_strpunit($2);
+			if (! unit) {
+				char errmsg[strlen($2) + 32];
+				snprintf(errmsg, sizeof(errmsg),
+						YY_("invalid time unit %s"), $2);
+				sdb_fe_yyerror(&yylloc, scanner, errmsg);
+				free($2); $2 = NULL;
+				YYABORT;
+			}
+			free($2); $2 = NULL;
+
+			$$.type = SDB_TYPE_DATETIME;
+			$$.data.datetime = (sdb_time_t)$1.data.integer * unit;
+
+			if ($1.data.integer < 0) {
+				sdb_fe_yyerror(&yylloc, scanner,
+						YY_("syntax error, negative intervals not supported"));
+				YYABORT;
+			}
 		}
 	;