X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffrontend%2Fscanner.l;fp=src%2Ffrontend%2Fscanner.l;h=5af85e047ec2913747f010638d884f9256cb1943;hb=265c305ba8a591217a2c54673c40a3e28665a5b9;hp=4bd5655e04bd9d870ccadcafa5da15d9c7c3ba74;hpb=eac4c0869db1f50e86910e082d72ed2731b8269a;p=sysdb.git

diff --git a/src/frontend/scanner.l b/src/frontend/scanner.l
index 4bd5655..5af85e0 100644
--- a/src/frontend/scanner.l
+++ b/src/frontend/scanner.l
@@ -37,27 +37,33 @@
 #include "frontend/grammar.h"
 #include "utils/error.h"
 
+#include <assert.h>
 #include <errno.h>
 
 #include <string.h>
 #include <stdlib.h>
 
+#include <time.h>
+
 #define YY_EXTRA_TYPE sdb_fe_yyextra_t *
 
 static struct {
 	const char *name;
 	int id;
 } reserved_words[] = {
-	{ "AND",      AND },
-	{ "FETCH",    FETCH },
-	{ "FILTER",   FILTER },
-	{ "IS",       IS },
-	{ "LIST",     LIST },
-	{ "LOOKUP",   LOOKUP },
-	{ "MATCHING", MATCHING },
-	{ "NOT",      NOT },
-	{ "NULL",     NULL_T },
-	{ "OR",       OR },
+	{ "AND",        AND },
+	{ "END",        END },
+	{ "FETCH",      FETCH },
+	{ "FILTER",     FILTER },
+	{ "IS",         IS },
+	{ "LIST",       LIST },
+	{ "LOOKUP",     LOOKUP },
+	{ "MATCHING",   MATCHING },
+	{ "NOT",        NOT },
+	{ "NULL",       NULL_T },
+	{ "OR",         OR },
+	{ "START",      START },
+	{ "TIMESERIES", TIMESERIES },
 };
 
 void
@@ -111,6 +117,12 @@ float4		([\+\-]?[Ii][Nn][Ff]([Ii][Nn][Ii][Tt][Yy])?)
 float5		([Nn][Aa][Nn])
 float		({float1}|{float2}|{float3}|{float4}|{float5})
 
+/*
+ * Time constants.
+ */
+date		([0-9]{4}-[0-9]{2}-[0-9]{2})
+time		([0-9]{1,2}:[0-9]{1,2}(:[0-9]{1,2}(\.[0-9]{1,9})?)?)
+
 %%
 
 {whitespace} |
@@ -149,6 +161,64 @@ float		({float1}|{float2}|{float3}|{float4}|{float5})
 		return FLOAT;
 	}
 
+{date} {
+		struct tm tm;
+		memset(&tm, 0, sizeof(tm));
+		if (! strptime(yytext, "%Y-%m-%d", &tm)) {
+			char errmsg[1024];
+			snprintf(errmsg, sizeof(errmsg),
+				"Failed to parse '%s' as date", yytext);
+			sdb_fe_yyerror(yylloc, yyscanner, errmsg);
+			return SCANNER_ERROR;
+		}
+		yylval->datetime = SECS_TO_SDB_TIME(mktime(&tm));
+		return DATE;
+	}
+{time} {
+		struct tm tm;
+		char time[9], ns[10];
+		char *tmp;
+
+		memset(&tm, 0, sizeof(tm));
+		memset(time, '\0', sizeof(time));
+		memset(ns, '0', sizeof(ns));
+		ns[sizeof(ns) - 1] = '\0';
+
+		tmp = strchr(yytext, '.');
+		if (tmp) {
+			size_t i;
+			*tmp = '\0';
+			++tmp;
+			strncpy(ns, tmp, sizeof(ns));
+			for (i = strlen(ns); i < 9; ++i)
+				ns[i] = '0';
+		}
+		strncpy(time, yytext, sizeof(time));
+		if (tmp) {
+			/* reset for better error messages */
+			--tmp;
+			*tmp = '.';
+		}
+
+		tmp = strchr(time, ':');
+		assert(tmp);
+		tmp = strchr(tmp + 1, ':');
+		if (! tmp)
+			strncat(time, ":00", sizeof(time));
+
+		if (! strptime(time, "%H:%M:%S", &tm)) {
+			char errmsg[1024];
+			snprintf(errmsg, sizeof(errmsg),
+				"Failed to parse '%s' as time", yytext);
+			sdb_fe_yyerror(yylloc, yyscanner, errmsg);
+			return SCANNER_ERROR;
+		}
+
+		yylval->datetime = SECS_TO_SDB_TIME(mktime(&tm));
+		yylval->datetime += (sdb_time_t)strtoll(ns, NULL, 10);
+		return TIME;
+	}
+
 =	{ return CMP_EQUAL; }
 !=	{ return CMP_NEQUAL; }
 =~	{ return CMP_REGEX; }