Frontend: Improve debug log when destroying a connection.

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

diff --git a/src/frontend/scanner.l b/src/frontend/scanner.l
index c279a4876d11a66672fb54e209c81213608ed55b..dd2a86cf5273b4e5e3c450c02306820b282a1a46 100644 (file)
--- 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,17 +91,37 @@ identifier  ([A-Za-z_][A-Za-z_0-9$]*)
        }
 
 {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;
        }
+{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]; }
 
 %%