diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2016-03-19 00:24:55 -0400 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2016-03-19 00:24:55 -0400 |
commit | 0ea9efbe9ec1bf07cc6ae070bdd54700af08e44d (patch) | |
tree | 7d4594ecfec4b8663d80282282bc0cd1e7a7064f /src/bin/psql/variables.c | |
parent | 27199058d98ef7ff2f468af44654bc35bb70fe4a (diff) | |
download | postgresql-0ea9efbe9ec1bf07cc6ae070bdd54700af08e44d.tar.gz postgresql-0ea9efbe9ec1bf07cc6ae070bdd54700af08e44d.zip |
Split psql's lexer into two separate .l files for SQL and backslash cases.
This gets us to a point where psqlscan.l can be used by other frontend
programs for the same purpose psql uses it for, ie to detect when it's
collected a complete SQL command from input that is divided across
line boundaries. Moreover, other programs can supply their own lexers
for backslash commands of their own choosing. A follow-on patch will
use this in pgbench.
The end result here is roughly the same as in Kyotaro Horiguchi's
0001-Make-SQL-parser-part-of-psqlscan-independent-from-ps.patch, although
the details of the method for switching between lexers are quite different.
Basically, in this patch we share the entire PsqlScanState, YY_BUFFER_STATE
stack, *and* yyscan_t between different lexers. The only thing we need
to do to switch to a different lexer is to make sure the start_state is
valid for the new lexer. This works because flex doesn't keep any other
persistent state that depends on the specific lexing tables generated for
a particular .l file. (We are assuming that both lexers are built with
the same flex version, or at least versions that are compatible with
respect to the contents of yyscan_t; but that doesn't seem likely to
be a big problem in practice, considering how slowly flex changes.)
Aside from being more efficient than Horiguchi-san's original solution,
this avoids possible corner-case changes in semantics: the original code
was capable of popping the input buffer stack while still staying in
backslash-related parsing states. I'm not sure that that equates to any
useful user-visible behaviors, but I'm not sure it doesn't either, so
I'm loath to assume that we only need to consider the topmost buffer when
parsing a backslash command.
I've attempted to update the MSVC build scripts for the added .l file,
but will rely on the buildfarm to see if I missed anything.
Kyotaro Horiguchi and Tom Lane
Diffstat (limited to 'src/bin/psql/variables.c')
-rw-r--r-- | src/bin/psql/variables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bin/psql/variables.c b/src/bin/psql/variables.c index d0819f039a0..f43f418e874 100644 --- a/src/bin/psql/variables.c +++ b/src/bin/psql/variables.c @@ -16,7 +16,7 @@ * * We allow any non-ASCII character, as well as ASCII letters, digits, and * underscore. Keep this in sync with the definition of variable_char in - * psqlscan.l. + * psqlscan.l and psqlscanslash.l. */ static bool valid_variable_name(const char *name) |