Apply changes introduced in the previous commit to src/parser/gram_template.y and...

diff --git a/src/parser/Makefile.in b/src/parser/Makefile.in
index 8f2239286c7e81ab7183e2388b98539789e815b4..8d6a31789fa1b16a4a8904ec6ff4ae4a561b9f3a 100644 (file)
--- a/src/parser/Makefile.in
+++ b/src/parser/Makefile.in
@@ -106,7 +106,7 @@ libsql_parser_a_AR = $(AR) $(ARFLAGS)
 libsql_parser_a_LIBADD =
 am__libsql_parser_a_SOURCES_DIST = copyfuncs.c gram.y gram_minimal.y \
        keywords.c kwlookup.c list.c makefuncs.c nodes.c outfuncs.c \
-       parser.c pool_string.c scansup.c stringinfo.c value.c \
+       parser.c scansup.c stringinfo.c value.c \
        $(top_srcdir)/src/utils/mmgr/mcxt.c \
        $(top_srcdir)/src/utils/mmgr/aset.c \
        $(top_srcdir)/src/utils/error/elog.c wchar.c scan.c snprintf.c
@@ -115,8 +115,8 @@ am__dirstamp = $(am__leading_dot)dirstamp
 am_libsql_parser_a_OBJECTS = copyfuncs.$(OBJEXT) gram.$(OBJEXT) \
        gram_minimal.$(OBJEXT) keywords.$(OBJEXT) kwlookup.$(OBJEXT) \
        list.$(OBJEXT) makefuncs.$(OBJEXT) nodes.$(OBJEXT) \
-       outfuncs.$(OBJEXT) parser.$(OBJEXT) pool_string.$(OBJEXT) \
-       scansup.$(OBJEXT) stringinfo.$(OBJEXT) value.$(OBJEXT) \
+       outfuncs.$(OBJEXT) parser.$(OBJEXT) scansup.$(OBJEXT) \
+       stringinfo.$(OBJEXT) value.$(OBJEXT) \
        $(top_srcdir)/src/utils/mmgr/mcxt.$(OBJEXT) \
        $(top_srcdir)/src/utils/mmgr/aset.$(OBJEXT) \
        $(top_srcdir)/src/utils/error/elog.$(OBJEXT) wchar.$(OBJEXT) \
@@ -341,7 +341,7 @@ AM_CPPFLAGS = -D_GNU_SOURCE -I $(parser_incdir) -I @PGSQL_INCLUDE_DIR@
 noinst_LIBRARIES = libsql-parser.a
 libsql_parser_a_SOURCES = copyfuncs.c gram.y gram_minimal.y keywords.c \
        kwlookup.c list.c makefuncs.c nodes.c outfuncs.c parser.c \
-       pool_string.c scansup.c stringinfo.c value.c \
+       scansup.c stringinfo.c value.c \
        $(top_srcdir)/src/utils/mmgr/mcxt.c \
        $(top_srcdir)/src/utils/mmgr/aset.c \
        $(top_srcdir)/src/utils/error/elog.c wchar.c scan.c \

diff --git a/src/parser/gram_template.y b/src/parser/gram_template.y
index f43dcb74035c28c5e6ab343ccf8f5ed781bd43c1..5cc2ad45aed0d153dd9ac4c80aa99a58f27b368a 100644 (file)
--- a/src/parser/gram_template.y
+++ b/src/parser/gram_template.y
@@ -6,8 +6,8 @@
  * gram.y
  *       POSTGRESQL BISON rules/actions
  *
- * Portions Copyright (c) 2003-2021, PgPool Global Development Group
- * Portions Copyright (c) 1996-2021, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2003-2022, PgPool Global Development Group
+ * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -58,7 +58,6 @@
 #include "keywords.h"
 #include "gramparse.h"
 #include "makefuncs.h"
-#include "pool_string.h"
 #include "parser.h"
 #include "pg_class.h"
 #include "pg_trigger.h"