*
* NOTE NOTE NOTE:
*
- * The rules in this file must be kept in sync with psql's psqlscan.l!
+ * The rules in this file must be kept in sync with src/fe_utils/psqlscan.l!
*
* The rules are designed so that the scanner never has to backtrack,
* in the sense that there is always a rule that can match the input
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
-OBJS = pgbench.o exprparse.o psqlscan.o $(WIN32RES)
+OBJS = pgbench.o exprparse.o $(WIN32RES)
-override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) \
- -I$(top_srcdir)/src/bin/psql $(CPPFLAGS)
+override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
+LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils
ifneq ($(PORTNAME), win32)
override CFLAGS += $(PTHREAD_CFLAGS)
all: pgbench
-pgbench: $(OBJS) | submake-libpq submake-libpgport
+pgbench: $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils
$(CC) $(CFLAGS) $^ $(libpq_pgport) $(PTHREAD_LIBS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
# exprscan is compiled as part of exprparse
exprparse.o: exprscan.c
-# we import psqlscan.o as-is from psql
-submake-psqlscan:
- $(MAKE) -C $(top_builddir)/src/bin/psql psqlscan.o
-
-psqlscan.o: | submake-psqlscan
- rm -f $@ && $(LN_S) $(top_builddir)/src/bin/psql/psqlscan.o .
-
-.PHONY: submake-psqlscan
-
distprep: exprparse.c exprscan.c
install: all installdirs
*-------------------------------------------------------------------------
*/
-#include "psqlscan_int.h"
+#include "fe_utils/psqlscan_int.h"
/* context information for reporting errors in expressions */
static const char *expr_source = NULL;
#ifndef PGBENCH_H
#define PGBENCH_H
-#include "psqlscan.h"
+#include "fe_utils/psqlscan.h"
/*
* This file is included outside exprscan.l, in places where we can't see
-/psqlscan.c
/psqlscanslash.c
/sql_help.h
/sql_help.c
OBJS= command.o common.o help.o input.o stringutils.o mainloop.o copy.o \
startup.o prompt.o variables.o large_obj.o describe.o \
tab-complete.o \
- sql_help.o psqlscan.o psqlscanslash.o \
+ sql_help.o psqlscanslash.o \
$(WIN32RES)
sql_help.h: create_help.pl $(wildcard $(REFDOCDIR)/*.sgml)
$(PERL) $< $(REFDOCDIR) $*
-psqlscan.c: FLEXFLAGS = -Cfe -p -p
-psqlscan.c: FLEX_NO_BACKUP=yes
-
psqlscanslash.c: FLEXFLAGS = -Cfe -p -p
-# Ideally we'd check this, but parallel make causes problems:
-# psqlscanslash.c: FLEX_NO_BACKUP=yes
+psqlscanslash.c: FLEX_NO_BACKUP=yes
-# Latest flex causes warnings in these files.
+# Latest flex causes warnings in this file.
ifeq ($(GCC),yes)
-psqlscan.o: CFLAGS += -Wno-error
psqlscanslash.o: CFLAGS += -Wno-error
endif
-distprep: sql_help.h psqlscan.c psqlscanslash.c
+distprep: sql_help.h psqlscanslash.c
install: all installdirs
$(INSTALL_PROGRAM) psql$(X) '$(DESTDIR)$(bindir)/psql$(X)'
# files removed here are supposed to be in the distribution tarball,
# so do not clean them in the clean/distclean rules
maintainer-clean: distclean
- rm -f sql_help.h sql_help.c psqlscan.c psqlscanslash.c
+ rm -f sql_help.h sql_help.c psqlscanslash.c
#define COMMAND_H
#include "fe_utils/print.h"
-#include "psqlscan.h"
+#include "fe_utils/psqlscan.h"
typedef enum _backslashResult
#include "command.h"
#include "common.h"
#include "input.h"
+#include "prompt.h"
#include "settings.h"
#include "mb/pg_wchar.h"
#ifndef MAINLOOP_H
#define MAINLOOP_H
-#include "psqlscan.h"
+#include "fe_utils/psqlscan.h"
extern const PsqlScanCallbacks psqlscan_callbacks;
CATALOG_NAME = psql
AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru zh_CN zh_TW
GETTEXT_FILES = command.c common.c copy.c help.c input.c large_obj.c \
- mainloop.c psqlscan.c psqlscanslash.c startup.c \
+ mainloop.c psqlscanslash.c startup.c \
describe.c sql_help.h sql_help.c \
tab-complete.c variables.c \
- ../../fe_utils/print.c \
+ ../../fe_utils/print.c ../../fe_utils/psqlscan.c \
../../common/exec.c ../../common/fe_memutils.c ../../common/username.c \
../../common/wait_error.c
GETTEXT_TRIGGERS = N_ psql_error simple_prompt
#ifndef PROMPT_H
#define PROMPT_H
-typedef enum _promptStatus
-{
- PROMPT_READY,
- PROMPT_CONTINUE,
- PROMPT_COMMENT,
- PROMPT_SINGLEQUOTE,
- PROMPT_DOUBLEQUOTE,
- PROMPT_DOLLARQUOTE,
- PROMPT_PAREN,
- PROMPT_COPY
-} promptStatus_t;
+/* enum promptStatus_t is now defined by psqlscan.h */
+#include "fe_utils/psqlscan.h"
char *get_prompt(promptStatus_t status);
#ifndef PSQLSCANSLASH_H
#define PSQLSCANSLASH_H
-#include "psqlscan.h"
+#include "fe_utils/psqlscan.h"
/* Different ways for scan_slash_option to handle parameter words */
*
* XXX Avoid creating backtracking cases --- see the backend lexer for info.
*
- * See psqlscan_int.h for additional commentary.
+ * See fe_utils/psqlscan_int.h for additional commentary.
*
* Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
}
%{
-#include "psqlscan_int.h"
+#include "fe_utils/psqlscan_int.h"
/*
* We must have a typedef YYSTYPE for yylex's first argument, but this lexer
--- /dev/null
+/psqlscan.c
#-------------------------------------------------------------------------
#
-# Makefile
-# Makefile for src/fe_utils
+# Makefile for src/fe_utils
#
# This makefile generates a static library, libpgfeutils.a,
# for use by client applications
#
+# Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
+#
# IDENTIFICATION
# src/fe_utils/Makefile
#
override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
-OBJS = mbprint.o print.o simple_list.o string_utils.o
+OBJS = mbprint.o print.o psqlscan.o simple_list.o string_utils.o
all: libpgfeutils.a
rm -f $@
$(AR) $(AROPT) $@ $^
+psqlscan.c: FLEXFLAGS = -Cfe -p -p
+psqlscan.c: FLEX_NO_BACKUP=yes
+
+# Latest flex causes warnings in this file.
+ifeq ($(GCC),yes)
+psqlscan.o: CFLAGS += -Wno-error
+endif
+
+distprep: psqlscan.c
+
# libpgfeutils could be useful to contrib, so install it
install: all installdirs
$(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(libdir)/libpgfeutils.a'
uninstall:
rm -f '$(DESTDIR)$(libdir)/libpgfeutils.a'
-clean distclean maintainer-clean:
- rm -f libpgfeutils.a $(OBJS)
+clean distclean:
+ rm -f libpgfeutils.a $(OBJS) lex.backup
+
+# psqlscan.c is supposed to be in the distribution tarball,
+# so do not clean it in the clean/distclean rules
+maintainer-clean: distclean
+ rm -f psqlscan.c
/*-------------------------------------------------------------------------
*
* psqlscan.l
- * lexical scanner for psql (and other frontend programs)
+ * lexical scanner for SQL commands
*
- * This code is mainly needed to determine where the end of a SQL statement
- * is: we are looking for semicolons that are not within quotes, comments,
- * or parentheses. The most reliable way to handle this is to borrow the
- * backend's flex lexer rules, lock, stock, and barrel. The rules below
- * are (except for a few) the same as the backend's, but their actions are
- * just ECHO whereas the backend's actions generally do other things.
+ * This lexer used to be part of psql, and that heritage is reflected in
+ * the file name as well as function and typedef names, though it can now
+ * be used by other frontend programs as well. It's also possible to extend
+ * this lexer with a compatible add-on lexer to handle program-specific
+ * backslash commands.
+ *
+ * This code is mainly concerned with determining where the end of a SQL
+ * statement is: we are looking for semicolons that are not within quotes,
+ * comments, or parentheses. The most reliable way to handle this is to
+ * borrow the backend's flex lexer rules, lock, stock, and barrel. The rules
+ * below are (except for a few) the same as the backend's, but their actions
+ * are just ECHO whereas the backend's actions generally do other things.
*
* XXX The rules in this file must be kept in sync with the backend lexer!!!
*
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * src/bin/psql/psqlscan.l
+ * src/fe_utils/psqlscan.l
*
*-------------------------------------------------------------------------
*/
#include "postgres_fe.h"
-#include "psqlscan.h"
+#include "fe_utils/psqlscan.h"
#include "libpq-fe.h"
}
%{
-#include "psqlscan_int.h"
+#include "fe_utils/psqlscan_int.h"
/*
* We must have a typedef YYSTYPE for yylex's first argument, but this lexer
#define LEXRES_BACKSLASH 2 /* backslash command start */
-static bool var_is_current_source(PsqlScanState state, const char *varname);
-
#define ECHO psqlscan_emit(cur_state, yytext, yyleng)
/*
if (value)
{
/* It is a variable, check for recursion */
- if (var_is_current_source(cur_state, varname))
+ if (psqlscan_var_is_current_source(cur_state, varname))
{
/* Recursive expansion --- don't go there */
cur_state->callbacks->write_error("skipping recursive expansion of variable \"%s\"\n",
* Check if specified variable name is the source for any string
* currently being scanned
*/
-static bool
-var_is_current_source(PsqlScanState state, const char *varname)
+bool
+psqlscan_var_is_current_source(PsqlScanState state, const char *varname)
{
StackElem *stackelem;
-/*
- * psql - the PostgreSQL interactive terminal
+/*-------------------------------------------------------------------------
*
- * Copyright (c) 2000-2016, PostgreSQL Global Development Group
+ * psqlscan.h
+ * lexical scanner for SQL commands
*
- * src/bin/psql/psqlscan.h
+ * This lexer used to be part of psql, and that heritage is reflected in
+ * the file name as well as function and typedef names, though it can now
+ * be used by other frontend programs as well. It's also possible to extend
+ * this lexer with a compatible add-on lexer to handle program-specific
+ * backslash commands.
+ *
+ *
+ * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * src/include/fe_utils/psqlscan.h
+ *
+ *-------------------------------------------------------------------------
*/
#ifndef PSQLSCAN_H
#define PSQLSCAN_H
#include "pqexpbuffer.h"
-#include "prompt.h"
-
/* Abstract type for lexer's internal state */
typedef struct PsqlScanStateData *PsqlScanState;
PSCAN_EOL /* end of line, SQL possibly complete */
} PsqlScanResult;
+/* Prompt type returned by psql_scan() */
+typedef enum _promptStatus
+{
+ PROMPT_READY,
+ PROMPT_CONTINUE,
+ PROMPT_COMMENT,
+ PROMPT_SINGLEQUOTE,
+ PROMPT_DOUBLEQUOTE,
+ PROMPT_DOLLARQUOTE,
+ PROMPT_PAREN,
+ PROMPT_COPY
+} promptStatus_t;
+
/* Callback functions to be used by the lexer */
typedef struct PsqlScanCallbacks
{
-/*
+/*-------------------------------------------------------------------------
+ *
* psqlscan_int.h
* lexical scanner internal declarations
*
* if we were using lexers with separate static state we would soon end up
* with dangling buffer pointers in one or the other. Also note that this
* is unlikely to work very nicely if the lexers aren't all built with the
- * same flex version.
+ * same flex version, or if they don't use the same flex options.
+ *
+ *
+ * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
*
- * Copyright (c) 2000-2016, PostgreSQL Global Development Group
+ * src/include/fe_utils/psqlscan_int.h
*
- * src/bin/psql/psqlscan_int.h
+ *-------------------------------------------------------------------------
*/
#ifndef PSQLSCAN_INT_H
#define PSQLSCAN_INT_H
-#include "psqlscan.h"
+#include "fe_utils/psqlscan.h"
-/* This is just to allow this file to be compilable standalone */
+/*
+ * These are just to allow this file to be compilable standalone for header
+ * validity checking; in actual use, this file should always be included
+ * from the body of a flex file, where these symbols are already defined.
+ */
#ifndef YY_TYPEDEF_YY_BUFFER_STATE
#define YY_TYPEDEF_YY_BUFFER_STATE
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
+#ifndef YY_TYPEDEF_YY_SCANNER_T
+#define YY_TYPEDEF_YY_SCANNER_T
+typedef void *yyscan_t;
+#endif
/*
* We use a stack of flex buffers to handle substitution of psql variables.
const char *newstr, const char *varname);
extern void psqlscan_pop_buffer_stack(PsqlScanState state);
extern void psqlscan_select_top_buffer(PsqlScanState state);
+extern bool psqlscan_var_is_current_source(PsqlScanState state,
+ const char *varname);
extern YY_BUFFER_STATE psqlscan_prepare_buffer(PsqlScanState state,
const char *txt, int len,
char **txtcopy);
'psql' => ['ws2_32.lib'] };
my $frontend_extraincludes = {
'initdb' => ['src/timezone'],
- 'psql' => [ 'src/backend' ],
- 'pgbench' => [ 'src/bin/psql' ] };
+ 'psql' => [ 'src/backend' ] };
my $frontend_extrasource = {
- 'psql' => ['src/bin/psql/psqlscan.l', 'src/bin/psql/psqlscanslash.l'],
+ 'psql' => [ 'src/bin/psql/psqlscanslash.l' ],
'pgbench' =>
- [ 'src/bin/pgbench/exprscan.l', 'src/bin/pgbench/exprparse.y',
- 'src/bin/psql/psqlscan.l' ] };
+ [ 'src/bin/pgbench/exprscan.l', 'src/bin/pgbench/exprparse.y' ] };
my @frontend_excludes = (
'pgevent', 'pg_basebackup', 'pg_rewind', 'pg_dump',
- 'pg_xlogdump', 'scripts', 'pgbench');
+ 'pg_xlogdump', 'scripts');
sub mkvcbuild
{
our @pgcommonbkndfiles = @pgcommonallfiles;
our @pgfeutilsfiles = qw(
- mbprint.c print.c simple_list.c string_utils.c);
+ mbprint.c print.c psqlscan.l psqlscan.c simple_list.c string_utils.c);
$libpgport = $solution->AddProject('libpgport', 'lib', 'misc');
$libpgport->AddDefine('FRONTEND');
}
$pg_xlogdump->AddFile('src/backend/access/transam/xlogreader.c');
- # fix up pgbench once it's been set up
- # we're borrowing psqlscan.c from psql, so grab it from the correct place
- my $pgbench = AddSimpleFrontend('pgbench');
- $pgbench->ReplaceFile('src/bin/pgbench/psqlscan.c', 'src/bin/psql/psqlscan.c');
-
$solution->Save();
return $solution->{vcver};
}
if %DIST%==1 if exist src\pl\plpgsql\src\pl_gram.c del /q src\pl\plpgsql\src\pl_gram.c
if %DIST%==1 if exist src\pl\plpgsql\src\pl_gram.h del /q src\pl\plpgsql\src\pl_gram.h
-if %DIST%==1 if exist src\bin\psql\psqlscan.c del /q src\bin\psql\psqlscan.c
+if %DIST%==1 if exist src\fe_utils\psqlscan.c del /q src\fe_utils\psqlscan.c
if %DIST%==1 if exist src\bin\psql\psqlscanslash.c del /q src\bin\psql\psqlscanslash.c
if %DIST%==1 if exist contrib\cube\cubescan.c del /q contrib\cube\cubescan.c
projects / postgresql / commitdiff