frontend: Added 'FILTER' support to the 'LOOKUP' command.

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

diff --git a/src/frontend/scanner.l b/src/frontend/scanner.l
index 5e80368d532872198edb7ea7bfb45dd60a9f0225..4bd5655e04bd9d870ccadcafa5da15d9c7c3ba74 100644 (file)
--- a/src/frontend/scanner.l
+++ b/src/frontend/scanner.l
@@ -44,6 +44,22 @@
 
 #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);
 
@@ -75,10 +91,16 @@ 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})
@@ -103,25 +125,10 @@ float             ({float1}|{float2}|{float3}|{float4}|{float5})
        }
 
 {identifier} {
-               /* XXX: simplify handling of reserved words */
-               if (! strcasecmp(yytext, "AND"))
-                       return AND;
-               else if (! strcasecmp(yytext, "FETCH"))
-                       return FETCH;
-               else if (! strcasecmp(yytext, "IS"))
-                       return IS;
-               else if (! strcasecmp(yytext, "LIST"))
-                       return LIST;
-               else if (! strcasecmp(yytext, "LOOKUP"))
-                       return LOOKUP;
-               else if (! strcasecmp(yytext, "MATCHING"))
-                       return MATCHING;
-               else if (! strcasecmp(yytext, "NOT"))
-                       return NOT;
-               else if (! strcasecmp(yytext, "NULL"))
-                       return NULL_T;
-               else if (! strcasecmp(yytext, "OR"))
-                       return OR;
+               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;