X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ffrontend%2Fscanner.l;h=4bd5655e04bd9d870ccadcafa5da15d9c7c3ba74;hb=5128caf8acad1c6a4f308389e6866dfc80db7dbc;hp=a0c05d8ab495fdd7ed4da9e215f0caa280f1b36c;hpb=bf39a85b7764641b4a4f0c452331c8be8cb34a01;p=sysdb.git

diff --git a/src/frontend/scanner.l b/src/frontend/scanner.l
index a0c05d8..4bd5655 100644
--- a/src/frontend/scanner.l
+++ b/src/frontend/scanner.l
@@ -27,6 +27,11 @@
 
 %{
 
+#if HAVE_CONFIG_H
+#	include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#include "core/data.h"
 #include "frontend/connection.h"
 #include "frontend/parser.h"
 #include "frontend/grammar.h"
@@ -35,9 +40,26 @@
 #include <errno.h>
 
 #include <string.h>
+#include <stdlib.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 },
+};
+
 void
 sdb_fe_yyerror(YYLTYPE *lval, sdb_fe_yyscan_t scanner, const char *msg);
 
@@ -69,7 +91,25 @@ csc_start	\/\*
 csc_inside	([^*/]+|[^*]\/|\*[^/])
 csc_end		\*\/
 
+/*
+ * Strings and identifiers.
+ */
 identifier	([A-Za-z_][A-Za-z_0-9$]*)
+/* TODO: fully support SQL strings */
+string		('[^']*')
+
+/*
+ * Numeric constants.
+ */
+dec			([\+\-]?[0-9]+)
+exp			([\+\-]?[0-9]+[Ee]\+?[0-9]+)
+integer		({dec}|{exp})
+float1		([\+\-]?[0-9]+\.[0-9]*([Ee][\+\-]?[0-9]+)?)
+float2		([\+\-]?[0-9]*\.[0-9]+([Ee][\+\-]?[0-9]+)?)
+float3		([\+\-]?[0-9]+[Ee]\-[0-9]+)
+float4		([\+\-]?[Ii][Nn][Ff]([Ii][Nn][Ii][Tt][Yy])?)
+float5		([Nn][Aa][Nn])
+float		({float1}|{float2}|{float3}|{float4}|{float5})
 
 %%
 
@@ -80,19 +120,46 @@ identifier	([A-Za-z_][A-Za-z_0-9$]*)
 <CSC>{csc_inside}	{ /* ignore */ }
 <CSC>{csc_end}		{ BEGIN(INITIAL); }
 <CSC><<EOF>> {
-		sdb_fe_yyerror(yylval, yyscanner, "unterminated C-style comment");
+		sdb_fe_yyerror(yylloc, yyscanner, "unterminated C-style comment");
 		return SCANNER_ERROR;
 	}
 
 {identifier} {
-		/* XXX */
-		if (! strcasecmp(yytext, "LIST"))
-			return LIST;
+		size_t i;
+		for (i = 0; i < SDB_STATIC_ARRAY_LEN(reserved_words); ++i)
+			if (! strcasecmp(reserved_words[i].name, yytext))
+				return reserved_words[i].id;
 
+		yylval->str = strdup(yytext);
 		return IDENTIFIER;
 	}
+{string} {
+		yytext[yyleng - 1] = '\0';
+		yylval->str = strdup(yytext + 1);
+		return STRING;
+	}
+{integer} {
+		yylval->data.data.integer = (int64_t)strtoll(yytext, NULL, 10);
+		yylval->data.type = SDB_TYPE_INTEGER;
+		return INTEGER;
+	}
+{float} {
+		yylval->data.data.decimal = strtod(yytext, NULL);
+		yylval->data.type = SDB_TYPE_DECIMAL;
+		return FLOAT;
+	}
 
-.	{ /* do nothing for now */ }
+=	{ return CMP_EQUAL; }
+!=	{ return CMP_NEQUAL; }
+=~	{ return CMP_REGEX; }
+!~	{ return CMP_NREGEX; }
+\<	{ return CMP_LT; }
+\<=	{ return CMP_LE; }
+\>=	{ return CMP_GE; }
+\>	{ return CMP_GT; }
+\|\|	{ return CONCAT; }
+
+.	{ /* XXX: */ return yytext[0]; }
 
 %%