frontend: Always store errors in the error buffer.

[sysdb.git] / src / frontend / scanner.l

diff --git a/src/frontend/scanner.l b/src/frontend/scanner.l
index c0d167c00c0df1da371d8762098acd57c7ce5abc..dd2a86cf5273b4e5e3c450c02306820b282a1a46 100644 (file)
--- a/src/frontend/scanner.l
+++ b/src/frontend/scanner.l
@@ -91,11 +91,21 @@ string              ('[^']*')
        }
 
 {identifier} {
-               /* XXX */
-               if (! strcasecmp(yytext, "LIST"))
-                       return 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;
@@ -106,7 +116,12 @@ string             ('[^']*')
                return STRING;
        }
 
-.      { /* do nothing for now */ }
+=      { return CMP_EQUAL; }
+!=     { return CMP_NEQUAL; }
+=~     { return CMP_REGEX; }
+!~     { return CMP_NREGEX; }
+
+.      { /* XXX: */ return yytext[0]; }
 
 %%