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 61f1743fa60560c69f2cf5835f9c49827e760b17..4bd5655e04bd9d870ccadcafa5da15d9c7c3ba74 100644 (file)
--- a/src/frontend/scanner.l
+++ b/src/frontend/scanner.l
@@ -31,6 +31,7 @@
 #      include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#include "core/data.h"
 #include "frontend/connection.h"
 #include "frontend/parser.h"
 #include "frontend/grammar.h"
@@ -39,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);
 
@@ -73,10 +91,26 @@ 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})
+
 %%
 
 {whitespace} |
@@ -91,15 +125,10 @@ string             ('[^']*')
        }
 
 {identifier} {
-               /* XXX: simplify handling of reserved words */
-               if (! strcasecmp(yytext, "FETCH"))
-                       return FETCH;
-               else if (! strcasecmp(yytext, "LIST"))
-                       return LIST;
-               else if (! strcasecmp(yytext, "LOOKUP"))
-                       return LOOKUP;
-               else if (! strcasecmp(yytext, "WHERE"))
-                       return WHERE;
+               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;
@@ -109,8 +138,28 @@ string             ('[^']*')
                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]; }
 
 %%