index c9b527e7d9cdb74785f891b6ea99553ff478a9b3..eb1ec180c2b73a9ce94743deecb23ea69422551e 100644 (file)
* find queries (terminated by semicolon).
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include "tools/sysdb/input.h"
-#include "tools/sysdb/command.h"
+#include <ctype.h>
#include <string.h>
#ifdef YY_INPUT
# undef YY_INPUT
#endif
#define YY_INPUT(buf, result, max_size) \
- sdb_input_readline(sdb_input, (buf), &(result), (max_size))
+ sdb_input_readline((buf), (size_t *)&(result), (max_size))
#define APPEND() \
do { \
- sdb_input->query_len += strlen(yytext); \
+ if (! isspace((int)yytext[0])) \
+ sysdb_input->have_input = 1; \
+ sysdb_input->query_len += strlen(yytext); \
} while (0)
-static sdb_input_t *sdb_input;
-
%}
%option interactive
%x CSC
-whitespace ([ \t\n\r\f]+)
+newline (\n|\r\n)
simple_comment ("--"[^\n\r]*)
/*
csc_inside ([^*/]+|[^*]\/|\*[^/])
csc_end \*\/
-identifier ([A-Za-z_][A-Za-z_0-9$]*)
+/*
+ * Strings.
+ */
+/* TODO: fully support SQL strings */
+string ('([^']|'')*')
%%
-{whitespace} { APPEND(); }
+ /*
+ * Here, we only care about syntax elements that may include semicolons
+ * and escape their meaning as a query terminator.
+ */
+
{simple_comment} { APPEND(); }
{csc_start} { APPEND(); BEGIN(CSC); }
<CSC>{csc_end} { APPEND(); BEGIN(INITIAL); }
<CSC><<EOF>> { return -1; }
-{identifier} { APPEND(); }
+{string} { APPEND(); }
/*
* The following rules are specific to the command line tool.
*/
-";" { APPEND(); sdb_command_exec(sdb_input); }
+";\n" { APPEND(); sdb_input_exec_query(); }
+";" { APPEND(); sdb_input_exec_query(); }
-. { APPEND(); }
+{newline} {
+ APPEND();
+ if (! sysdb_input->have_input)
+ /* give the input module a chance to do stuff on empty lines */
+ sdb_input_exec_query();
+ }
-%%
+. { APPEND(); }
-void
-sdb_input_set(sdb_input_t *new_input)
-{
- sdb_input = new_input;
-} /* sdb_input_set */
+%%
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */