X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ffrontend%2Fscanner.l;h=dd2a86cf5273b4e5e3c450c02306820b282a1a46;hb=e2f1ad2dd762373e0fa6c4b2c732d9fb094ee45c;hp=6c2bfa148fd802ff4365187015d7636895af86bf;hpb=39a45905e0b237e458b1826ff9b4fad1c4a59550;p=sysdb.git

diff --git a/src/frontend/scanner.l b/src/frontend/scanner.l
index 6c2bfa1..dd2a86c 100644
--- a/src/frontend/scanner.l
+++ b/src/frontend/scanner.l
@@ -74,6 +74,8 @@ csc_inside	([^*/]+|[^*]\/|\*[^/])
 csc_end		\*\/
 
 identifier	([A-Za-z_][A-Za-z_0-9$]*)
+/* TODO: fully support SQL strings */
+string		('[^']*')
 
 %%
 
@@ -89,14 +91,37 @@ identifier	([A-Za-z_][A-Za-z_0-9$]*)
 	}
 
 {identifier} {
-		/* XXX */
-		if (! strcasecmp(yytext, "LIST"))
+		/* XXX: simplify handling of reserved words */
+		if (! strcasecmp(yytext, "AND"))
+			return AND;
+		else if (! strcasecmp(yytext, "FETCH"))
+			return FETCH;
+		else if (! strcasecmp(yytext, "LIST"))
 			return LIST;
-
+		else if (! strcasecmp(yytext, "LOOKUP"))
+			return LOOKUP;
+		else if (! strcasecmp(yytext, "NOT"))
+			return NOT;
+		else if (! strcasecmp(yytext, "OR"))
+			return OR;
+		else if (! strcasecmp(yytext, "WHERE"))
+			return WHERE;
+
+		yylval->str = strdup(yytext);
 		return IDENTIFIER;
 	}
+{string} {
+		yytext[yyleng - 1] = '\0';
+		yylval->str = strdup(yytext + 1);
+		return STRING;
+	}
+
+=	{ return CMP_EQUAL; }
+!=	{ return CMP_NEQUAL; }
+=~	{ return CMP_REGEX; }
+!~	{ return CMP_NREGEX; }
 
-.	{ /* do nothing for now */ }
+.	{ /* XXX: */ return yytext[0]; }
 
 %%