diff -Nru slony1-2-2.2.8/config.h.in slony1-2-2.2.10/config.h.in --- slony1-2-2.2.8/config.h.in 2019-08-27 01:24:54.000000000 +0000 +++ slony1-2-2.2.10/config.h.in 2020-12-05 02:07:59.000000000 +0000 @@ -12,9 +12,9 @@ #ifndef SLONY_I_CONFIG_H #define SLONY_I_CONFIG_H -#define SLONY_I_VERSION_STRING "2.2.8" -#define SLONY_I_VERSION_STRING_DEC 2,2,8 -#define SLONY_I_FUNC_VERSION_STRING 2_2_8 +#define SLONY_I_VERSION_STRING "2.2.10" +#define SLONY_I_VERSION_STRING_DEC 2,2.10, +#define SLONY_I_FUNC_VERSION_STRING 2_2_10_ #ifndef PG_VERSION_MAJOR #define PG_VERSION_MAJOR 0 diff -Nru slony1-2-2.2.8/config_msvc.h slony1-2-2.2.10/config_msvc.h --- slony1-2-2.2.8/config_msvc.h 2019-08-27 01:24:54.000000000 +0000 +++ slony1-2-2.2.10/config_msvc.h 2020-12-05 02:07:59.000000000 +0000 @@ -4,9 +4,9 @@ #include -#define SLONY_I_VERSION_STRING "2.2.8" -#define SLONY_I_VERSION_STRING_DEC 2,2,8 -#define SLONY_I_FUNC_VERSION_STRING 2_2_8 +#define SLONY_I_VERSION_STRING "2.2.10" +#define SLONY_I_VERSION_STRING_DEC 2,2,10 +#define SLONY_I_FUNC_VERSION_STRING 2_2_10 #if PG_VERSION_NUM >=90600 #define HAVE_GETACTIVESNAPSHOT 1 #define HAVE_TYPCACHE 1 diff -Nru slony1-2-2.2.8/configure slony1-2-2.2.10/configure --- slony1-2-2.2.8/configure 2019-08-27 03:14:29.000000000 +0000 +++ slony1-2-2.2.10/configure 2020-12-05 02:10:32.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for slony1 2.2.8. +# Generated by GNU Autoconf 2.69 for slony1 2.2.10. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='slony1' PACKAGE_TARNAME='slony1' -PACKAGE_VERSION='2.2.8' -PACKAGE_STRING='slony1 2.2.8' +PACKAGE_VERSION='2.2.10' +PACKAGE_STRING='slony1 2.2.10' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -712,6 +712,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -802,6 +803,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1054,6 +1056,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1191,7 +1202,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1304,7 +1315,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures slony1 2.2.8 to adapt to many kinds of systems. +\`configure' configures slony1 2.2.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1344,6 +1355,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1369,7 +1381,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of slony1 2.2.8:";; + short | recursive ) echo "Configuration of slony1 2.2.10:";; esac cat <<\_ACEOF @@ -1479,7 +1491,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -slony1 configure 2.2.8 +slony1 configure 2.2.10 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1944,7 +1956,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by slony1 $as_me 2.2.8, which was +It was created by slony1 $as_me 2.2.10, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -7123,7 +7135,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by slony1 $as_me 2.2.8, which was +This file was extended by slony1 $as_me 2.2.10, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7185,7 +7197,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -slony1 config.status 2.2.8 +slony1 config.status 2.2.10 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru slony1-2-2.2.8/configure.ac slony1-2-2.2.10/configure.ac --- slony1-2-2.2.8/configure.ac 2019-08-27 01:24:54.000000000 +0000 +++ slony1-2-2.2.10/configure.ac 2020-12-05 02:07:59.000000000 +0000 @@ -11,7 +11,7 @@ # ---------- m4_define([SLONREL_VERSION], esyscmd([echo "$Name: $" | \ sed -e 's/\:\ REL_//' -e 's/\$//g' -e 's/_/./g' -e 's/\./\_/3' \ - -e 's/\ //g' -e s/\:/`echo 2.2.8`/ | tr -d '\n'])) + -e 's/\ //g' -e s/\:/`echo 2.2.10`/ | tr -d '\n'])) m4_pattern_allow([^SLON_AC_]) diff -Nru slony1-2-2.2.8/debian/changelog slony1-2-2.2.10/debian/changelog --- slony1-2-2.2.8/debian/changelog 2020-10-13 12:57:32.000000000 +0000 +++ slony1-2-2.2.10/debian/changelog 2021-01-18 16:11:43.000000000 +0000 @@ -1,3 +1,11 @@ +slony1-2 (2.2.10-1) unstable; urgency=medium + + * New upstream version. + * debian/tests: Append extra _ to version in symbols. + * Drop "uupdate" from watch file. + + -- Christoph Berg Mon, 18 Jan 2021 17:11:43 +0100 + slony1-2 (2.2.8-6) unstable; urgency=medium * Test loading PG functions directly instead of relying on the brittle diff -Nru slony1-2-2.2.8/debian/patches/021494a6f761a872af90aa51d14c48a461edfe5c slony1-2-2.2.10/debian/patches/021494a6f761a872af90aa51d14c48a461edfe5c --- slony1-2-2.2.8/debian/patches/021494a6f761a872af90aa51d14c48a461edfe5c 2020-07-29 13:13:27.000000000 +0000 +++ slony1-2-2.2.10/debian/patches/021494a6f761a872af90aa51d14c48a461edfe5c 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -commit 021494a6f761a872af90aa51d14c48a461edfe5c -Author: Steve Singer -Date: Sat May 23 20:35:03 2020 -0400 - - move variable declarations to the .c file - headers should only include extern declarations. - - Add -fno-common to the default compiler options. - This is now standard with GCC 10+ - - compilers with -fno-common will error out on the duplicate - definitions. - -diff --git a/Makefile.global.in b/Makefile.global.in -index 71d13180..bd220247 100644 ---- a/Makefile.global.in -+++ b/Makefile.global.in -@@ -92,7 +92,7 @@ subdir=$(slony_subdir) - LDFLAGS += -lpq @NLSLIB@ - - ifeq ($(GCC), yes) -- CFLAGS += -Wall -Wmissing-prototypes -Wmissing-declarations -+ CFLAGS += -Wall -Wmissing-prototypes -Wmissing-declarations -fno-common - endif - - # Installation. -diff --git a/src/slon/confoptions.c b/src/slon/confoptions.c -index 4eb6b855..bf3ccc87 100644 ---- a/src/slon/confoptions.c -+++ b/src/slon/confoptions.c -@@ -24,7 +24,17 @@ static double real_placeholder; - void dump_configuration(void); - void build_conf_variables(void); - -- -+char *Syslog_ident; -+char *Syslog_facility; -+int Use_syslog; -+ -+bool logpid; -+bool logtimestamp; -+bool drop_indices; -+char *log_timestamp_format; -+char *sql_on_connection; -+char *lag_interval; -+char *command_on_logarchive; - - static struct config_int ConfigureNamesInt[] = - { -diff --git a/src/slon/confoptions.h b/src/slon/confoptions.h -index 63c5c8f4..e20d0600 100644 ---- a/src/slon/confoptions.h -+++ b/src/slon/confoptions.h -@@ -43,18 +43,8 @@ extern int apply_cache_size; - extern int vac_frequency; - extern char *cleanup_interval; - --char *Syslog_ident; --char *Syslog_facility; --int Use_syslog; -- --bool logpid; --bool logtimestamp; --bool drop_indices; --char *log_timestamp_format; --char *sql_on_connection; --char *lag_interval; --char *command_on_logarchive; - -+extern char *command_on_logarchive; - enum config_type - { - SLON_C_BOOL, diff -Nru slony1-2-2.2.8/debian/patches/series slony1-2-2.2.10/debian/patches/series --- slony1-2-2.2.8/debian/patches/series 2020-07-29 13:13:27.000000000 +0000 +++ slony1-2-2.2.10/debian/patches/series 2021-01-18 16:11:43.000000000 +0000 @@ -8,4 +8,3 @@ build-backend-separately.patch tests-run_test reproducible-build -021494a6f761a872af90aa51d14c48a461edfe5c diff -Nru slony1-2-2.2.8/debian/tests/load-functions slony1-2-2.2.10/debian/tests/load-functions --- slony1-2-2.2.8/debian/tests/load-functions 2020-10-13 12:54:38.000000000 +0000 +++ slony1-2-2.2.10/debian/tests/load-functions 2021-01-18 16:11:43.000000000 +0000 @@ -9,6 +9,6 @@ sed -e "s/@NAMESPACE@/public/g" \ -e "s/@CLUSTERNAME@/main/g" \ -e "s/@MODULEVERSION@/$VERSION/g" \ - -e "s/@FUNCVERSION@/$FUNCVERSION/g" \ + -e "s/@FUNCVERSION@/${FUNCVERSION}_/g" \ /usr/share/slony1/slony1_base.$VERSION.sql \ /usr/share/slony1/slony1_funcs.$VERSION.sql | pg_buildext psql diff -Nru slony1-2-2.2.8/debian/watch slony1-2-2.2.10/debian/watch --- slony1-2-2.2.8/debian/watch 2020-07-29 08:11:15.000000000 +0000 +++ slony1-2-2.2.10/debian/watch 2021-01-18 16:11:43.000000000 +0000 @@ -1,7 +1,7 @@ -version=3 +version=4 # main page for all branches opts=uversionmangle=s/-rc/~rc/ \ -http://www.slony.info/ .*/slony1-([0-9.]+).tar.bz2 debian uupdate +http://www.slony.info/ .*/slony1-([0-9.]+).tar.bz2 # list of all 2.2 tarballs opts=uversionmangle=s/-rc/~rc/ \ -http://www.slony.info/downloads/2.2/source/slony1-([0-9.]+).tar.bz2 debian uupdate +http://www.slony.info/downloads/2.2/source/slony1-([0-9.]+).tar.bz2 diff -Nru slony1-2-2.2.8/doc/adminguide/Makefile slony1-2-2.2.10/doc/adminguide/Makefile --- slony1-2-2.2.8/doc/adminguide/Makefile 2019-08-27 01:24:54.000000000 +0000 +++ slony1-2-2.2.10/doc/adminguide/Makefile 2020-12-05 02:07:59.000000000 +0000 @@ -146,7 +146,7 @@ # We drop bad lines "\end{document}" generated by dblatex grep -vE '^(\\end{document}|\\subsection\*)$$' slony-tmp.tex > slony.tex # We put the required '\end{document}' at the end of the Tex file - echo "\end{document}" >> slony.tex + printf '\\end{document}' >> slony.tex # Latex required to run the following command 3 times in order to generating the TOC of the document pdflatex slony.tex pdflatex slony.tex diff -Nru slony1-2-2.2.8/doc/adminguide/schemadoc.xml slony1-2-2.2.10/doc/adminguide/schemadoc.xml --- slony1-2-2.2.8/doc/adminguide/schemadoc.xml 2019-08-27 03:14:45.000000000 +0000 +++ slony1-2-2.2.10/doc/adminguide/schemadoc.xml 2020-12-05 02:10:50.000000000 +0000 @@ -10393,7 +10393,7 @@ Returns the version patch level of the slony schema begin - return 8; + return 10; end; diff -Nru slony1-2-2.2.8/doc/adminguide/slony.idx slony1-2-2.2.10/doc/adminguide/slony.idx --- slony1-2-2.2.8/doc/adminguide/slony.idx 2019-08-27 03:15:33.000000000 +0000 +++ slony1-2-2.2.10/doc/adminguide/slony.idx 2020-12-05 02:11:39.000000000 +0000 @@ -15,122 +15,122 @@ \indexentry{pgbench setup|hyperpage}{8} \indexentry{altperl script example|hyperpage}{11} \indexentry{starting \& stopping slon|hyperpage}{12} -\indexentry{installation instructions|hyperpage}{14} -\indexentry{installation: short version|hyperpage}{14} -\indexentry{configuration instructions|hyperpage}{14} -\indexentry{building Slony-{}I documentation|hyperpage}{19} -\indexentry{RPMs for Slony-{}I|hyperpage}{19} -\indexentry{installing Slony-{}I on Windows|hyperpage}{19} -\indexentry{adding objects to replication|hyperpage}{20} -\indexentry{adding a table to replication|hyperpage}{20} -\indexentry{adding columns to a replicated table|hyperpage}{20} -\indexentry{removing replication for a node|hyperpage}{21} -\indexentry{adding a node|hyperpage}{21} -\indexentry{adding a node to replication|hyperpage}{21} -\indexentry{reshaping subscriptions|hyperpage}{23} -\indexentry{moving master|hyperpage}{23} -\indexentry{DDL changes!database schema changes|hyperpage}{23} -\indexentry{failover!switchover|hyperpage}{25} -\indexentry{controlled switchover|hyperpage}{26} -\indexentry{failover due to system failure|hyperpage}{26} -\indexentry{automating failover|hyperpage}{28} -\indexentry{rebuilding after failover|hyperpage}{28} -\indexentry{events and confirmations|hyperpage}{30} -\indexentry{listen paths|hyperpage}{31} -\indexentry{listening breakage|hyperpage}{32} -\indexentry{automated listen path generation|hyperpage}{33} -\indexentry{trigger handling|hyperpage}{33} -\indexentry{locking issues|hyperpage}{36} -\indexentry{log shipping|hyperpage}{37} -\indexentry{monitoring Slony-{}I|hyperpage}{39} -\indexentry{script test\_slony\_state to test replication state|hyperpage}{40} -\indexentry{Nagios for monitoring replication|hyperpage}{41} -\indexentry{MRTG for monitoring replication|hyperpage}{41} -\indexentry{Bucardo monitoring|hyperpage}{42} -\indexentry{search Slony-{}I logs using search-{}logs.sh|hyperpage}{42} -\indexentry{generating Wiki documentation of a cluster|hyperpage}{42} -\indexentry{analysis of a SYNC|hyperpage}{43} -\indexentry{partitioning|hyperpage}{45} -\indexentry{partitioning: dynamic addition of partitions|hyperpage}{46} -\indexentry{Upgrading between minor slony versions|hyperpage}{46} -\indexentry{incompatibilities between versions|hyperpage}{47} -\indexentry{incompatibilities between versions|hyperpage}{48} -\indexentry{incompatibilities between versions|hyperpage}{48} -\indexentry{upgrading to Slony-{}I version 2|hyperpage}{49} -\indexentry{Log analysis|hyperpage}{50} -\indexentry{Logs: CONFIG level|hyperpage}{51} -\indexentry{Logs: INFO level|hyperpage}{51} -\indexentry{Logs: DEBUG level|hyperpage}{51} -\indexentry{Logs: thread name|hyperpage}{51} -\indexentry{logs: reading and understanding Slony-{}I logs|hyperpage}{51} -\indexentry{Logs: log shipping messages|hyperpage}{52} -\indexentry{Logs: DDL messages|hyperpage}{53} -\indexentry{Logs: threading messages|hyperpage}{54} -\indexentry{Logs: subscription messages|hyperpage}{54} -\indexentry{Logs: MERGE SET messages|hyperpage}{57} -\indexentry{Logs: routine SYNC messages|hyperpage}{58} -\indexentry{Logs: adding objects' messages|hyperpage}{59} -\indexentry{Logs: moving objects' messages|hyperpage}{61} -\indexentry{Logs: dropping objects' messages|hyperpage}{61} -\indexentry{Logs: messages for MOVE SET, FAILOVER, DROP NODE|hyperpage}{62} -\indexentry{Logs: log switching|hyperpage}{62} -\indexentry{Logs: miscellaneous|hyperpage}{63} -\indexentry{administration scripts for Slony-{}I|hyperpage}{67} -\indexentry{altperl scripts for Slony-{}I|hyperpage}{67} -\indexentry{Multiple Cluster support for the altperl tools|hyperpage}{67} -\indexentry{cluster.set1 -{} replication set configuration for Perl tools|hyperpage}{68} -\indexentry{slonik\_build\_env|hyperpage}{68} -\indexentry{altperl print preamble|hyperpage}{68} -\indexentry{altperl create set|hyperpage}{68} -\indexentry{altperl drop node|hyperpage}{68} -\indexentry{altperl drop set|hyperpage}{68} -\indexentry{altperl drop table|hyperpage}{69} -\indexentry{altperl execute script|hyperpage}{69} -\indexentry{altperl failover|hyperpage}{69} -\indexentry{altperl init cluster|hyperpage}{69} -\indexentry{altperl merge sets|hyperpage}{69} -\indexentry{altperl move set|hyperpage}{69} -\indexentry{altperl replication test|hyperpage}{69} -\indexentry{altperl restart node|hyperpage}{69} -\indexentry{altperl restart nodes|hyperpage}{69} -\indexentry{altperl show configuration|hyperpage}{69} -\indexentry{altperl kill slon|hyperpage}{69} -\indexentry{altperl start slon|hyperpage}{69} -\indexentry{altperl slon watchdog|hyperpage}{70} -\indexentry{altperl slon watchdog 2|hyperpage}{70} -\indexentry{altperl store node|hyperpage}{70} -\indexentry{altperl subscribe set|hyperpage}{70} -\indexentry{altperl unsubscribe nodes|hyperpage}{70} -\indexentry{altperl unsubscribe set|hyperpage}{70} -\indexentry{altperl update nodes|hyperpage}{70} -\indexentry{generating slon.conf files for Slony-{}I|hyperpage}{70} -\indexentry{launching Slony-{}I cluster using slon.conf files|hyperpage}{72} -\indexentry{upstart script|hyperpage}{72} -\indexentry{script -{} slony1\_extract\_schema.sh|hyperpage}{72} -\indexentry{script -{} slony-{}cluster-{}analysis|hyperpage}{73} -\indexentry{generate slonik scripts for a cluster|hyperpage}{73} -\indexentry{Apache-{}style profiles for FreeBSD!FreeBSD|hyperpage}{75} -\indexentry{duplicating nodes|hyperpage}{75} -\indexentry{altperl configuration dump|hyperpage}{76} -\indexentry{generate SYNCs|hyperpage}{77} -\indexentry{watchdogs to keep slon daemons running|hyperpage}{77} -\indexentry{testing cluster status|hyperpage}{77} -\indexentry{test scripts|hyperpage}{78} -\indexentry{testing replication|hyperpage}{78} -\indexentry{log files|hyperpage}{79} -\indexentry{mkservice for BSD|hyperpage}{79} -\indexentry{logrep -{} multilog filters|hyperpage}{80} -\indexentry{test bed framework|hyperpage}{84} -\indexentry{slon|hyperpage}{88} -\indexentry{configuration!of the slon daemon|hyperpage}{91} -\indexentry{slon configuration: logging|hyperpage}{91} -\indexentry{slon configuration: connections|hyperpage}{92} -\indexentry{slon configuration: log shipping|hyperpage}{92} -\indexentry{slon configuration: event tuning|hyperpage}{93} -\indexentry{slonik|hyperpage}{95} -\indexentry{logshipping: slony\_logshipper tool|hyperpage}{140} -\indexentry{Frequently Asked Questions about Slony-{}I|hyperpage}{142} -\indexentry{release checklist|hyperpage}{164} -\indexentry{slonik, usage|hyperpage}{166} -\indexentry{slonik, embedded in shell scripts|hyperpage}{167} -\indexentry{help -{} finding more assistance|hyperpage}{169} +\indexentry{installation instructions|hyperpage}{15} +\indexentry{installation: short version|hyperpage}{15} +\indexentry{configuration instructions|hyperpage}{15} +\indexentry{building Slony-{}I documentation|hyperpage}{20} +\indexentry{RPMs for Slony-{}I|hyperpage}{20} +\indexentry{installing Slony-{}I on Windows|hyperpage}{20} +\indexentry{adding objects to replication|hyperpage}{21} +\indexentry{adding a table to replication|hyperpage}{21} +\indexentry{adding columns to a replicated table|hyperpage}{21} +\indexentry{removing replication for a node|hyperpage}{22} +\indexentry{adding a node|hyperpage}{22} +\indexentry{adding a node to replication|hyperpage}{22} +\indexentry{reshaping subscriptions|hyperpage}{24} +\indexentry{moving master|hyperpage}{24} +\indexentry{DDL changes!database schema changes|hyperpage}{25} +\indexentry{failover!switchover|hyperpage}{27} +\indexentry{controlled switchover|hyperpage}{27} +\indexentry{failover due to system failure|hyperpage}{28} +\indexentry{automating failover|hyperpage}{29} +\indexentry{rebuilding after failover|hyperpage}{30} +\indexentry{events and confirmations|hyperpage}{31} +\indexentry{listen paths|hyperpage}{32} +\indexentry{listening breakage|hyperpage}{33} +\indexentry{automated listen path generation|hyperpage}{34} +\indexentry{trigger handling|hyperpage}{35} +\indexentry{locking issues|hyperpage}{37} +\indexentry{log shipping|hyperpage}{38} +\indexentry{monitoring Slony-{}I|hyperpage}{41} +\indexentry{script test\_slony\_state to test replication state|hyperpage}{42} +\indexentry{Nagios for monitoring replication|hyperpage}{43} +\indexentry{MRTG for monitoring replication|hyperpage}{43} +\indexentry{Bucardo monitoring|hyperpage}{44} +\indexentry{search Slony-{}I logs using search-{}logs.sh|hyperpage}{44} +\indexentry{generating Wiki documentation of a cluster|hyperpage}{44} +\indexentry{analysis of a SYNC|hyperpage}{45} +\indexentry{partitioning|hyperpage}{48} +\indexentry{partitioning: dynamic addition of partitions|hyperpage}{48} +\indexentry{Upgrading between minor slony versions|hyperpage}{49} +\indexentry{incompatibilities between versions|hyperpage}{50} +\indexentry{incompatibilities between versions|hyperpage}{50} +\indexentry{incompatibilities between versions|hyperpage}{51} +\indexentry{upgrading to Slony-{}I version 2|hyperpage}{52} +\indexentry{Log analysis|hyperpage}{53} +\indexentry{Logs: CONFIG level|hyperpage}{53} +\indexentry{Logs: INFO level|hyperpage}{53} +\indexentry{Logs: DEBUG level|hyperpage}{53} +\indexentry{Logs: thread name|hyperpage}{53} +\indexentry{logs: reading and understanding Slony-{}I logs|hyperpage}{54} +\indexentry{Logs: log shipping messages|hyperpage}{55} +\indexentry{Logs: DDL messages|hyperpage}{55} +\indexentry{Logs: threading messages|hyperpage}{56} +\indexentry{Logs: subscription messages|hyperpage}{57} +\indexentry{Logs: MERGE SET messages|hyperpage}{60} +\indexentry{Logs: routine SYNC messages|hyperpage}{60} +\indexentry{Logs: adding objects' messages|hyperpage}{62} +\indexentry{Logs: moving objects' messages|hyperpage}{63} +\indexentry{Logs: dropping objects' messages|hyperpage}{64} +\indexentry{Logs: messages for MOVE SET, FAILOVER, DROP NODE|hyperpage}{64} +\indexentry{Logs: log switching|hyperpage}{65} +\indexentry{Logs: miscellaneous|hyperpage}{65} +\indexentry{administration scripts for Slony-{}I|hyperpage}{70} +\indexentry{altperl scripts for Slony-{}I|hyperpage}{70} +\indexentry{Multiple Cluster support for the altperl tools|hyperpage}{70} +\indexentry{cluster.set1 -{} replication set configuration for Perl tools|hyperpage}{71} +\indexentry{slonik\_build\_env|hyperpage}{71} +\indexentry{altperl print preamble|hyperpage}{71} +\indexentry{altperl create set|hyperpage}{71} +\indexentry{altperl drop node|hyperpage}{71} +\indexentry{altperl drop set|hyperpage}{72} +\indexentry{altperl drop table|hyperpage}{72} +\indexentry{altperl execute script|hyperpage}{72} +\indexentry{altperl failover|hyperpage}{72} +\indexentry{altperl init cluster|hyperpage}{72} +\indexentry{altperl merge sets|hyperpage}{72} +\indexentry{altperl move set|hyperpage}{72} +\indexentry{altperl replication test|hyperpage}{72} +\indexentry{altperl restart node|hyperpage}{72} +\indexentry{altperl restart nodes|hyperpage}{72} +\indexentry{altperl show configuration|hyperpage}{72} +\indexentry{altperl kill slon|hyperpage}{73} +\indexentry{altperl start slon|hyperpage}{73} +\indexentry{altperl slon watchdog|hyperpage}{73} +\indexentry{altperl slon watchdog 2|hyperpage}{73} +\indexentry{altperl store node|hyperpage}{73} +\indexentry{altperl subscribe set|hyperpage}{73} +\indexentry{altperl unsubscribe nodes|hyperpage}{73} +\indexentry{altperl unsubscribe set|hyperpage}{73} +\indexentry{altperl update nodes|hyperpage}{73} +\indexentry{generating slon.conf files for Slony-{}I|hyperpage}{73} +\indexentry{launching Slony-{}I cluster using slon.conf files|hyperpage}{75} +\indexentry{upstart script|hyperpage}{75} +\indexentry{script -{} slony1\_extract\_schema.sh|hyperpage}{76} +\indexentry{script -{} slony-{}cluster-{}analysis|hyperpage}{76} +\indexentry{generate slonik scripts for a cluster|hyperpage}{76} +\indexentry{Apache-{}style profiles for FreeBSD!FreeBSD|hyperpage}{78} +\indexentry{duplicating nodes|hyperpage}{78} +\indexentry{altperl configuration dump|hyperpage}{79} +\indexentry{generate SYNCs|hyperpage}{80} +\indexentry{watchdogs to keep slon daemons running|hyperpage}{80} +\indexentry{testing cluster status|hyperpage}{81} +\indexentry{test scripts|hyperpage}{81} +\indexentry{testing replication|hyperpage}{82} +\indexentry{log files|hyperpage}{82} +\indexentry{mkservice for BSD|hyperpage}{82} +\indexentry{logrep -{} multilog filters|hyperpage}{83} +\indexentry{test bed framework|hyperpage}{87} +\indexentry{slon|hyperpage}{91} +\indexentry{configuration!of the slon daemon|hyperpage}{94} +\indexentry{slon configuration: logging|hyperpage}{94} +\indexentry{slon configuration: connections|hyperpage}{95} +\indexentry{slon configuration: log shipping|hyperpage}{95} +\indexentry{slon configuration: event tuning|hyperpage}{96} +\indexentry{slonik|hyperpage}{98} +\indexentry{logshipping: slony\_logshipper tool|hyperpage}{144} +\indexentry{Frequently Asked Questions about Slony-{}I|hyperpage}{146} +\indexentry{release checklist|hyperpage}{169} +\indexentry{slonik, usage|hyperpage}{170} +\indexentry{slonik, embedded in shell scripts|hyperpage}{171} +\indexentry{help -{} finding more assistance|hyperpage}{173} diff -Nru slony1-2-2.2.8/doc/adminguide/slony.lof slony1-2-2.2.10/doc/adminguide/slony.lof --- slony1-2-2.2.8/doc/adminguide/slony.lof 2019-08-27 03:15:33.000000000 +0000 +++ slony1-2-2.2.10/doc/adminguide/slony.lof 2020-12-05 02:11:39.000000000 +0000 @@ -12,5 +12,5 @@ \addvspace {10\p@ } \addvspace {10\p@ } \addvspace {10\p@ } -\contentsline {figure}{\numberline {14.1}{\ignorespaces Definition of view sl\_failover\_targets}}{174}{figure.14.1} -\contentsline {figure}{\numberline {14.2}{\ignorespaces Definition of view sl\_seqlastvalue}}{179}{figure.14.2} +\contentsline {figure}{\numberline {14.1}{\ignorespaces Definition of view sl\_failover\_targets}}{179}{figure.14.1}% +\contentsline {figure}{\numberline {14.2}{\ignorespaces Definition of view sl\_seqlastvalue}}{184}{figure.14.2}% diff -Nru slony1-2-2.2.8/Makefile.global.in slony1-2-2.2.10/Makefile.global.in --- slony1-2-2.2.8/Makefile.global.in 2019-08-27 01:24:54.000000000 +0000 +++ slony1-2-2.2.10/Makefile.global.in 2020-12-05 02:07:59.000000000 +0000 @@ -92,7 +92,7 @@ LDFLAGS += -lpq @NLSLIB@ ifeq ($(GCC), yes) - CFLAGS += -Wall -Wmissing-prototypes -Wmissing-declarations + CFLAGS += -Wall -Wmissing-prototypes -Wmissing-declarations -fno-common endif # Installation. diff -Nru slony1-2-2.2.8/RELEASE slony1-2-2.2.10/RELEASE --- slony1-2-2.2.8/RELEASE 2019-08-27 01:24:54.000000000 +0000 +++ slony1-2-2.2.10/RELEASE 2020-12-05 02:07:59.000000000 +0000 @@ -1,4 +1,17 @@ #+OPTIONS: ^:{} + +2.2.10 + + - Remove unsupported warning on PG13 + + +2.2.9 + + - Compile with -fno-common by default. Fix + compile errors caused by defining variables in headers + - Adjust slonik_build_env.pl so it works with PG11+ + - Remove unsupported warning on PG12 + 2.2.8 - Fix pg 8.4 messagaging in slonik diff -Nru slony1-2-2.2.8/src/backend/slony1_funcs.def slony1-2-2.2.10/src/backend/slony1_funcs.def --- slony1-2-2.2.8/src/backend/slony1_funcs.def 2019-08-27 01:24:54.000000000 +0000 +++ slony1-2-2.2.10/src/backend/slony1_funcs.def 2020-12-05 02:07:59.000000000 +0000 @@ -1,14 +1,14 @@ EXPORTS -_Slony_I_2_2_8_createEvent -_Slony_I_2_2_8_getModuleVersion -_Slony_I_2_2_8_denyAccess -_Slony_I_2_2_8_lockedSet -_Slony_I_2_2_8_getLocalNodeId -_Slony_I_2_2_8_killBackend -_Slony_I_2_2_8_seqtrack -_Slony_I_2_2_8_logTrigger -_Slony_I_2_2_8_resetSession -_Slony_I_2_2_8_logApply -_Slony_I_2_2_8_logApplySetCacheSize -_Slony_I_2_2_8_logApplySaveStats -_Slony_I_2_2_8_slon_decode_tgargs +_Slony_I_2_2_10_createEvent +_Slony_I_2_2_10_getModuleVersion +_Slony_I_2_2_10_denyAccess +_Slony_I_2_2_10_lockedSet +_Slony_I_2_2_10_getLocalNodeId +_Slony_I_2_2_10_killBackend +_Slony_I_2_2_10_seqtrack +_Slony_I_2_2_10_logTrigger +_Slony_I_2_2_10_resetSession +_Slony_I_2_2_10_logApply +_Slony_I_2_2_10_logApplySetCacheSize +_Slony_I_2_2_10_logApplySaveStats +_Slony_I_2_2_10_slon_decode_tgargs diff -Nru slony1-2-2.2.8/src/backend/slony1_funcs.sql slony1-2-2.2.10/src/backend/slony1_funcs.sql --- slony1-2-2.2.8/src/backend/slony1_funcs.sql 2019-08-27 01:24:54.000000000 +0000 +++ slony1-2-2.2.10/src/backend/slony1_funcs.sql 2020-12-05 02:07:59.000000000 +0000 @@ -477,7 +477,7 @@ returns int4 as $$ begin - return 8; + return 10; end; $$ language plpgsql; comment on function @NAMESPACE@.slonyVersionPatchlevel () is diff -Nru slony1-2-2.2.8/src/slon/conf-file.c slony1-2-2.2.10/src/slon/conf-file.c --- slony1-2-2.2.8/src/slon/conf-file.c 2019-08-27 03:14:35.000000000 +0000 +++ slony1-2-2.2.10/src/slon/conf-file.c 2020-12-05 02:10:39.000000000 +0000 @@ -8,8 +8,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 39 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -84,60 +84,48 @@ #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ +/* begin standard C++ headers. */ -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ #define BEGIN (yy_start) = 1 + 2 * - /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) - +#define YY_NEW_FILE yyrestart( yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ @@ -167,14 +155,14 @@ typedef size_t yy_size_t; #endif -extern yy_size_t yyleng; +extern int yyleng; extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + #define YY_LESS_LINENO(n) #define YY_LINENO_REWIND_TO(ptr) @@ -191,7 +179,6 @@ YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, (yytext_ptr) ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -206,12 +193,12 @@ /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -234,7 +221,7 @@ int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -262,7 +249,7 @@ /* Stack of input buffers. */ static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ +static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general @@ -273,7 +260,6 @@ #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ : NULL) - /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. */ @@ -281,11 +267,11 @@ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ -yy_size_t yyleng; +static int yy_n_chars; /* number of characters read into yy_ch_buf */ +int yyleng; /* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; +static char *yy_c_buf_p = NULL; static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ @@ -294,85 +280,81 @@ */ static int yy_did_buffer_switch_on_eof; -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); - -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); - -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) - -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); - -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); +void yyrestart ( FILE *input_file ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); +void yy_delete_buffer ( YY_BUFFER_STATE b ); +void yy_flush_buffer ( YY_BUFFER_STATE b ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state ( void ); + +static void yyensure_buffer_stack ( void ); +static void yy_load_buffer_state ( void ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) + +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); + +void *yyalloc ( yy_size_t ); +void *yyrealloc ( void *, yy_size_t ); +void yyfree ( void * ); #define yy_new_buffer yy_create_buffer - #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) /* Begin user sect3 */ -#define yywrap() 1 +#define yywrap() (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP +typedef flex_uint8_t YY_CHAR; -typedef unsigned char YY_CHAR; - -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; +FILE *yyin = NULL, *yyout = NULL; typedef int yy_state_type; extern int yylineno; - int yylineno = 1; extern char *yytext; +#ifdef yytext_ptr +#undef yytext_ptr +#endif #define yytext_ptr yytext -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yy_fatal_error (yyconst char msg[] ); +static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); +static int yy_get_next_buffer ( void ); +static void yynoreturn yy_fatal_error ( const char* msg ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ - yyleng = (size_t) (yy_cp - yy_bp); \ + yyleng = (int) (yy_cp - yy_bp); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; - #define YY_NUM_RULES 13 #define YY_END_OF_BUFFER 14 /* This struct is not used in this scanner, @@ -382,7 +364,7 @@ flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[49] = +static const flex_int16_t yy_accept[49] = { 0, 0, 0, 14, 12, 2, 1, 12, 3, 12, 12, 10, 9, 9, 11, 4, 2, 0, 8, 0, 3, @@ -391,7 +373,7 @@ 10, 9, 7, 5, 5, 5, 5, 0 } ; -static yyconst flex_int32_t yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, @@ -423,13 +405,13 @@ 16, 16, 16, 16, 16 } ; -static yyconst flex_int32_t yy_meta[20] = +static const YY_CHAR yy_meta[20] = { 0, 1, 1, 2, 1, 1, 1, 1, 3, 3, 3, 4, 4, 1, 5, 4, 3, 1, 3, 3 } ; -static yyconst flex_int16_t yy_base[59] = +static const flex_int16_t yy_base[59] = { 0, 0, 0, 75, 141, 72, 141, 16, 0, 15, 25, 58, 11, 61, 141, 30, 51, 24, 141, 25, 0, @@ -439,7 +421,7 @@ 114, 19, 117, 122, 127, 129, 132, 135 } ; -static yyconst flex_int16_t yy_def[59] = +static const flex_int16_t yy_def[59] = { 0, 48, 1, 48, 48, 48, 48, 49, 50, 51, 48, 52, 10, 10, 48, 53, 48, 49, 48, 54, 50, @@ -449,7 +431,7 @@ 48, 48, 48, 48, 48, 48, 48, 48 } ; -static yyconst flex_int16_t yy_nxt[161] = +static const flex_int16_t yy_nxt[161] = { 0, 4, 5, 6, 7, 8, 9, 10, 10, 11, 4, 12, 13, 14, 15, 15, 15, 4, 15, 15, 18, @@ -470,7 +452,7 @@ 48, 48, 48, 48, 48, 48, 48, 48, 48, 48 } ; -static yyconst flex_int16_t yy_chk[161] = +static const flex_int16_t yy_chk[161] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 7, @@ -547,7 +529,8 @@ /* prototype, so compiler is happy with our high warnings setting */ int SLON_yylex(void); char *SLON_scanstr(char *); -#line 551 "conf-file.c" +#line 533 "conf-file.c" +#line 534 "conf-file.c" #define INITIAL 0 @@ -563,36 +546,36 @@ #define YY_EXTRA_TYPE void * #endif -static int yy_init_globals (void ); +static int yy_init_globals ( void ); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy (void ); +int yylex_destroy ( void ); -int yyget_debug (void ); +int yyget_debug ( void ); -void yyset_debug (int debug_flag ); +void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra (void ); +YY_EXTRA_TYPE yyget_extra ( void ); -void yyset_extra (YY_EXTRA_TYPE user_defined ); +void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in (void ); +FILE *yyget_in ( void ); -void yyset_in (FILE * in_str ); +void yyset_in ( FILE * _in_str ); -FILE *yyget_out (void ); +FILE *yyget_out ( void ); -void yyset_out (FILE * out_str ); +void yyset_out ( FILE * _out_str ); -yy_size_t yyget_leng (void ); + int yyget_leng ( void ); -char *yyget_text (void ); +char *yyget_text ( void ); -int yyget_lineno (void ); +int yyget_lineno ( void ); -void yyset_lineno (int line_number ); +void yyset_lineno ( int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -600,26 +583,29 @@ #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (void ); +extern "C" int yywrap ( void ); #else -extern int yywrap (void ); +extern int yywrap ( void ); #endif #endif +#ifndef YY_NO_UNPUT + +#endif + #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy ( char *, const char *, int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen ( const char * ); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (void ); +static int yyinput ( void ); #else -static int input (void ); +static int input ( void ); #endif #endif @@ -639,7 +625,7 @@ /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -663,7 +649,7 @@ else \ { \ errno=0; \ - while ( (result = fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -718,7 +704,7 @@ /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK break; +#define YY_BREAK /*LINTED*/break; #endif #define YY_RULE_SETUP \ @@ -728,9 +714,9 @@ */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; if ( !(yy_init) ) { @@ -752,19 +738,19 @@ if ( ! YY_CURRENT_BUFFER ) { yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_load_buffer_state( ); + yy_load_buffer_state( ); } { #line 69 "conf-file.l" -#line 766 "conf-file.c" +#line 752 "conf-file.c" - while ( 1 ) /* loops until end-of-file is reached */ + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -780,7 +766,7 @@ yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -790,9 +776,9 @@ { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 49 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } while ( yy_current_state != 48 ); @@ -881,7 +867,7 @@ #line 86 "conf-file.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 885 "conf-file.c" +#line 871 "conf-file.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -960,7 +946,7 @@ { (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap( ) ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -1025,9 +1011,9 @@ */ static int yy_get_next_buffer (void) { - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = (yytext_ptr); + int number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -1056,7 +1042,7 @@ /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -1083,7 +1069,7 @@ if ( b->yy_is_our_buffer ) { - yy_size_t new_size = b->yy_buf_size * 2; + int new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1092,11 +1078,12 @@ b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) ); } else /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; + b->yy_ch_buf = NULL; if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( @@ -1124,7 +1111,7 @@ if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); + yyrestart( yyin ); } else @@ -1138,12 +1125,15 @@ else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } (yy_n_chars) += number_to_move; @@ -1159,14 +1149,14 @@ static yy_state_type yy_get_previous_state (void) { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; yy_current_state = (yy_start); for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1176,9 +1166,9 @@ { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 49 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; } return yy_current_state; @@ -1191,10 +1181,10 @@ */ static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) { - register int yy_is_jam; - register char *yy_cp = (yy_c_buf_p); + int yy_is_jam; + char *yy_cp = (yy_c_buf_p); - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1204,14 +1194,18 @@ { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 49 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; yy_is_jam = (yy_current_state == 48); return yy_is_jam ? 0 : yy_current_state; } +#ifndef YY_NO_UNPUT + +#endif + #ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput (void) @@ -1236,7 +1230,7 @@ else { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (int) ((yy_c_buf_p) - (yytext_ptr)); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -1253,14 +1247,14 @@ */ /* Reset buffer status. */ - yyrestart(yyin ); + yyrestart( yyin ); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap( ) ) - return EOF; + if ( yywrap( ) ) + return 0; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -1297,11 +1291,11 @@ if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file ); + yy_load_buffer_state( ); } /** Switch to a different input buffer. @@ -1329,7 +1323,7 @@ } YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag @@ -1357,7 +1351,7 @@ { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -1366,13 +1360,13 @@ /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer(b,file ); + yy_init_buffer( b, file ); return b; } @@ -1391,9 +1385,9 @@ YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); + yyfree( (void *) b->yy_ch_buf ); - yyfree((void *) b ); + yyfree( (void *) b ); } /* Initializes or reinitializes a buffer. @@ -1405,7 +1399,7 @@ { int oerrno = errno; - yy_flush_buffer(b ); + yy_flush_buffer( b ); b->yy_input_file = file; b->yy_fill_buffer = 1; @@ -1448,7 +1442,7 @@ b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); + yy_load_buffer_state( ); } /** Pushes the new state onto the stack. The new state becomes @@ -1479,7 +1473,7 @@ YY_CURRENT_BUFFER_LVALUE = new_buffer; /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } @@ -1498,7 +1492,7 @@ --(yy_buffer_stack_top); if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } } @@ -1516,15 +1510,15 @@ * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - num_to_alloc = 1; + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -1533,7 +1527,7 @@ if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; + yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = (yy_buffer_stack_max) + grow_size; (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc @@ -1553,7 +1547,7 @@ * @param base the character buffer * @param size the size in bytes of the character buffer * - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { @@ -1563,23 +1557,23 @@ base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ - return 0; + return NULL; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; - b->yy_input_file = 0; + b->yy_input_file = NULL; b->yy_n_chars = b->yy_buf_size; b->yy_is_interactive = 0; b->yy_at_bol = 1; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer(b ); + yy_switch_to_buffer( b ); return b; } @@ -1592,10 +1586,10 @@ * @note If you want to scan bytes that may contain NUL values, then use * yy_scan_bytes() instead. */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) +YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return yy_scan_bytes(yystr,strlen(yystr) ); + return yy_scan_bytes( yystr, (int) strlen(yystr) ); } /** Setup the input buffer state to scan the given bytes. The next call to yylex() will @@ -1605,16 +1599,16 @@ * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; yy_size_t n; - yy_size_t i; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) yyalloc(n ); + n = (yy_size_t) (_yybytes_len + 2); + buf = (char *) yyalloc( n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -1623,7 +1617,7 @@ buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer(buf,n ); + b = yy_scan_buffer( buf, n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -1639,9 +1633,9 @@ #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (const char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -1669,7 +1663,7 @@ */ int yyget_lineno (void) { - + return yylineno; } @@ -1692,7 +1686,7 @@ /** Get the length of the current token. * */ -yy_size_t yyget_leng (void) +int yyget_leng (void) { return yyleng; } @@ -1707,29 +1701,29 @@ } /** Set the current line number. - * @param line_number + * @param _line_number line number * */ -void yyset_lineno (int line_number ) +void yyset_lineno (int _line_number ) { - yylineno = line_number; + yylineno = _line_number; } /** Set the input stream. This does not discard the current * input buffer. - * @param in_str A readable stream. + * @param _in_str A readable stream. * * @see yy_switch_to_buffer */ -void yyset_in (FILE * in_str ) +void yyset_in (FILE * _in_str ) { - yyin = in_str ; + yyin = _in_str ; } -void yyset_out (FILE * out_str ) +void yyset_out (FILE * _out_str ) { - yyout = out_str ; + yyout = _out_str ; } int yyget_debug (void) @@ -1737,9 +1731,9 @@ return yy_flex_debug; } -void yyset_debug (int bdebug ) +void yyset_debug (int _bdebug ) { - yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } static int yy_init_globals (void) @@ -1748,10 +1742,10 @@ * This function is called from yylex_destroy(), so don't allocate here. */ - (yy_buffer_stack) = 0; + (yy_buffer_stack) = NULL; (yy_buffer_stack_top) = 0; (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char *) 0; + (yy_c_buf_p) = NULL; (yy_init) = 0; (yy_start) = 0; @@ -1760,8 +1754,8 @@ yyin = stdin; yyout = stdout; #else - yyin = (FILE *) 0; - yyout = (FILE *) 0; + yyin = NULL; + yyout = NULL; #endif /* For future reference: Set errno on error, since we are called by @@ -1776,7 +1770,7 @@ /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); + yy_delete_buffer( YY_CURRENT_BUFFER ); YY_CURRENT_BUFFER_LVALUE = NULL; yypop_buffer_state(); } @@ -1797,18 +1791,19 @@ */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +static void yy_flex_strncpy (char* s1, const char * s2, int n ) { - register int i; + + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) +static int yy_flex_strlen (const char * s ) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -1818,11 +1813,12 @@ void *yyalloc (yy_size_t size ) { - return (void *) malloc( size ); + return malloc(size); } void *yyrealloc (void * ptr, yy_size_t size ) { + /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -1830,18 +1826,17 @@ * any pointer type to void*, and deal with argument conversions * as though doing an assignment. */ - return (void *) realloc( (char *) ptr, size ); + return realloc(ptr, size); } void yyfree (void * ptr ) { - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" -#line 85 "conf-file.l" - +#line 86 "conf-file.l" struct name_value_pair diff -Nru slony1-2-2.2.8/src/slon/confoptions.c slony1-2-2.2.10/src/slon/confoptions.c --- slony1-2-2.2.8/src/slon/confoptions.c 2019-08-27 01:24:54.000000000 +0000 +++ slony1-2-2.2.10/src/slon/confoptions.c 2020-12-05 02:07:59.000000000 +0000 @@ -24,7 +24,17 @@ void dump_configuration(void); void build_conf_variables(void); +char *Syslog_ident; +char *Syslog_facility; +int Use_syslog; +bool logpid; +bool logtimestamp; +bool drop_indices; +char *log_timestamp_format; +char *sql_on_connection; +char *lag_interval; +char *command_on_logarchive; static struct config_int ConfigureNamesInt[] = { diff -Nru slony1-2-2.2.8/src/slon/confoptions.h slony1-2-2.2.10/src/slon/confoptions.h --- slony1-2-2.2.8/src/slon/confoptions.h 2019-08-27 01:24:54.000000000 +0000 +++ slony1-2-2.2.10/src/slon/confoptions.h 2020-12-05 02:07:59.000000000 +0000 @@ -43,18 +43,8 @@ extern int vac_frequency; extern char *cleanup_interval; -char *Syslog_ident; -char *Syslog_facility; -int Use_syslog; - -bool logpid; -bool logtimestamp; -bool drop_indices; -char *log_timestamp_format; -char *sql_on_connection; -char *lag_interval; -char *command_on_logarchive; +extern char *command_on_logarchive; enum config_type { SLON_C_BOOL, diff -Nru slony1-2-2.2.8/src/slonik/parser.c slony1-2-2.2.10/src/slonik/parser.c --- slony1-2-2.2.8/src/slonik/parser.c 2019-08-27 03:14:36.000000000 +0000 +++ slony1-2-2.2.10/src/slonik/parser.c 2020-12-05 02:10:40.000000000 +0000 @@ -1,8 +1,9 @@ -/* A Bison parser, made by GNU Bison 3.0.2. */ +/* A Bison parser, made by GNU Bison 3.3.2. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation, + Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -40,11 +41,14 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ +/* Undocumented macros, especially those whose name start with YY_, + are private implementation details. Do not rely on them. */ + /* Identify Bison output. */ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "3.0.2" +#define YYBISON_VERSION "3.3.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -61,8 +65,8 @@ -/* Copy the first part of user declarations. */ -#line 1 "parser.y" /* yacc.c:339 */ +/* First part of user prologue. */ +#line 1 "parser.y" /* yacc.c:337 */ /*------------------------------------------------------------------------- * parser.y @@ -112,13 +116,16 @@ -#line 116 "y.tab.c" /* yacc.c:339 */ - +#line 120 "y.tab.c" /* yacc.c:337 */ # ifndef YY_NULLPTR -# if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULLPTR nullptr +# if defined __cplusplus +# if 201103L <= __cplusplus +# define YY_NULLPTR nullptr +# else +# define YY_NULLPTR 0 +# endif # else -# define YY_NULLPTR 0 +# define YY_NULLPTR ((void*)0) # endif # endif @@ -321,10 +328,10 @@ /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE YYSTYPE; + union YYSTYPE { -#line 54 "parser.y" /* yacc.c:355 */ +#line 54 "parser.y" /* yacc.c:352 */ int32 ival; char *str; @@ -333,8 +340,10 @@ SlonikStmt *statement; failed_node_entry * failed_node_entry; -#line 337 "y.tab.c" /* yacc.c:355 */ +#line 344 "y.tab.c" /* yacc.c:352 */ }; + +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 #endif @@ -346,9 +355,7 @@ #endif /* !YY_YY_Y_TAB_H_INCLUDED */ -/* Copy the second part of user declarations. */ -#line 352 "y.tab.c" /* yacc.c:358 */ #ifdef short # undef short @@ -369,13 +376,13 @@ #ifdef YYTYPE_UINT16 typedef YYTYPE_UINT16 yytype_uint16; #else -typedef unsigned short int yytype_uint16; +typedef unsigned short yytype_uint16; #endif #ifdef YYTYPE_INT16 typedef YYTYPE_INT16 yytype_int16; #else -typedef short int yytype_int16; +typedef short yytype_int16; #endif #ifndef YYSIZE_T @@ -387,7 +394,7 @@ # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else -# define YYSIZE_T unsigned int +# define YYSIZE_T unsigned # endif #endif @@ -423,15 +430,6 @@ # define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) #endif -#if !defined _Noreturn \ - && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) -# if defined _MSC_VER && 1200 <= _MSC_VER -# define _Noreturn __declspec (noreturn) -# else -# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) -# endif -#endif - /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ # define YYUSE(E) ((void) (E)) @@ -439,7 +437,7 @@ # define YYUSE(E) /* empty */ #endif -#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ /* Suppress an incorrect diagnostic about yylval being uninitialized. */ # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ _Pragma ("GCC diagnostic push") \ @@ -601,16 +599,16 @@ /* YYNSTATES -- Number of states. */ #define YYNSTATES 349 -/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned - by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 #define YYMAXUTOK 341 +/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, with out-of-bounds checking. */ #define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM - as returned by yylex, without out-of-bounds checking. */ + as returned by yylex. */ static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1051,22 +1049,22 @@ #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (yylen); \ - yystate = *yyssp; \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (0) +#define YYBACKUP(Token, Value) \ + do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ + while (0) /* Error token number */ #define YYTERROR 1 @@ -1106,37 +1104,37 @@ } while (0) -/*----------------------------------------. -| Print this symbol's value on YYOUTPUT. | -`----------------------------------------*/ +/*-----------------------------------. +| Print this symbol's value on YYO. | +`-----------------------------------*/ static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep) { - FILE *yyo = yyoutput; - YYUSE (yyo); + FILE *yyoutput = yyo; + YYUSE (yyoutput); if (!yyvaluep) return; # ifdef YYPRINT if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); + YYPRINT (yyo, yytoknum[yytype], *yyvaluep); # endif YYUSE (yytype); } -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +/*---------------------------. +| Print this symbol on YYO. | +`---------------------------*/ static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep) { - YYFPRINTF (yyoutput, "%s %s (", + YYFPRINTF (yyo, "%s %s (", yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); - yy_symbol_value_print (yyoutput, yytype, yyvaluep); - YYFPRINTF (yyoutput, ")"); + yy_symbol_value_print (yyo, yytype, yyvaluep); + YYFPRINTF (yyo, ")"); } /*------------------------------------------------------------------. @@ -1170,7 +1168,7 @@ static void yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) { - unsigned long int yylno = yyrline[yyrule]; + unsigned long yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", @@ -1181,7 +1179,7 @@ YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yystos[yyssp[yyi + 1 - yynrhs]], - &(yyvsp[(yyi + 1) - (yynrhs)]) + &yyvsp[(yyi + 1) - (yynrhs)] ); YYFPRINTF (stderr, "\n"); } @@ -1285,7 +1283,10 @@ case '\\': if (*++yyp != '\\') goto do_not_strip_quotes; - /* Fall through. */ + else + goto append; + + append: default: if (yyres) yyres[yyn] = *yyp; @@ -1303,7 +1304,7 @@ if (! yyres) return yystrlen (yystr); - return yystpcpy (yyres, yystr) - yyres; + return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres); } # endif @@ -1381,10 +1382,10 @@ yyarg[yycount++] = yytname[yyx]; { YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) + yysize = yysize1; + else return 2; - yysize = yysize1; } } } @@ -1396,6 +1397,7 @@ case N: \ yyformat = S; \ break + default: /* Avoid compiler warnings. */ YYCASE_(0, YY_("syntax error")); YYCASE_(1, YY_("syntax error, unexpected %s")); YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); @@ -1407,9 +1409,10 @@ { YYSIZE_T yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) + yysize = yysize1; + else return 2; - yysize = yysize1; } if (*yymsg_alloc < yysize) @@ -1535,23 +1538,31 @@ yychar = YYEMPTY; /* Cause a token to be read. */ goto yysetstate; + /*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | +| yynewstate -- push a new state, which is found in yystate. | `------------------------------------------------------------*/ - yynewstate: +yynewstate: /* In all cases, when you get here, the value and location stacks have just been pushed. So pushing a state here evens the stacks. */ yyssp++; - yysetstate: - *yyssp = yystate; + +/*--------------------------------------------------------------------. +| yynewstate -- set current state (the top of the stack) to yystate. | +`--------------------------------------------------------------------*/ +yysetstate: + *yyssp = (yytype_int16) yystate; if (yyss + yystacksize - 1 <= yyssp) +#if !defined yyoverflow && !defined YYSTACK_RELOCATE + goto yyexhaustedlab; +#else { /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; + YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1); -#ifdef yyoverflow +# if defined yyoverflow { /* Give user a chance to reallocate the stack. Use copies of these so that the &'s don't force the real ones into @@ -1567,14 +1578,10 @@ &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), &yystacksize); - yyss = yyss1; yyvs = yyvs1; } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else +# else /* defined YYSTACK_RELOCATE */ /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) goto yyexhaustedlab; @@ -1590,22 +1597,22 @@ goto yyexhaustedlab; YYSTACK_RELOCATE (yyss_alloc, yyss); YYSTACK_RELOCATE (yyvs_alloc, yyvs); -# undef YYSTACK_RELOCATE +# undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); } # endif -#endif /* no yyoverflow */ yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) YYABORT; } +#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ YYDPRINTF ((stderr, "Entering state %d\n", yystate)); @@ -1614,11 +1621,11 @@ goto yybackup; + /*-----------. | yybackup. | `-----------*/ yybackup: - /* Do appropriate processing given the current state. Read a lookahead token if we need one and don't already have one. */ @@ -1691,7 +1698,7 @@ /*-----------------------------. -| yyreduce -- Do a reduction. | +| yyreduce -- do a reduction. | `-----------------------------*/ yyreduce: /* yyn is the number of a rule to reduce with. */ @@ -1712,7 +1719,7 @@ switch (yyn) { case 2: -#line 228 "parser.y" /* yacc.c:1646 */ +#line 228 "parser.y" /* yacc.c:1652 */ { parser_script = (SlonikScript *) malloc(sizeof(SlonikScript)); @@ -1723,31 +1730,31 @@ parser_script->adminfo_list = (yyvsp[-1].adm_info); parser_script->script_stmts = (yyvsp[0].statement); } -#line 1727 "y.tab.c" /* yacc.c:1646 */ +#line 1734 "y.tab.c" /* yacc.c:1652 */ break; case 3: -#line 241 "parser.y" /* yacc.c:1646 */ +#line 241 "parser.y" /* yacc.c:1652 */ { (yyval.str) = (yyvsp[-1].str); } -#line 1735 "y.tab.c" /* yacc.c:1646 */ +#line 1742 "y.tab.c" /* yacc.c:1652 */ break; case 4: -#line 247 "parser.y" /* yacc.c:1646 */ +#line 247 "parser.y" /* yacc.c:1652 */ { (yyval.adm_info) = (yyvsp[0].adm_info); } -#line 1741 "y.tab.c" /* yacc.c:1646 */ +#line 1748 "y.tab.c" /* yacc.c:1652 */ break; case 5: -#line 249 "parser.y" /* yacc.c:1646 */ +#line 249 "parser.y" /* yacc.c:1652 */ { (yyvsp[-1].adm_info)->next = (yyvsp[0].adm_info); (yyval.adm_info) = (yyvsp[-1].adm_info); } -#line 1747 "y.tab.c" /* yacc.c:1646 */ +#line 1754 "y.tab.c" /* yacc.c:1652 */ break; case 6: -#line 253 "parser.y" /* yacc.c:1646 */ +#line 253 "parser.y" /* yacc.c:1652 */ { SlonikAdmInfo *new; @@ -1763,41 +1770,41 @@ (yyval.adm_info) = new; } -#line 1767 "y.tab.c" /* yacc.c:1646 */ +#line 1774 "y.tab.c" /* yacc.c:1652 */ break; case 7: -#line 271 "parser.y" /* yacc.c:1646 */ +#line 271 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 1773 "y.tab.c" /* yacc.c:1646 */ +#line 1780 "y.tab.c" /* yacc.c:1652 */ break; case 8: -#line 273 "parser.y" /* yacc.c:1646 */ +#line 273 "parser.y" /* yacc.c:1652 */ { (yyvsp[-1].statement)->next = (yyvsp[0].statement); (yyval.statement) = (yyvsp[-1].statement); } -#line 1779 "y.tab.c" /* yacc.c:1646 */ +#line 1786 "y.tab.c" /* yacc.c:1652 */ break; case 9: -#line 277 "parser.y" /* yacc.c:1646 */ +#line 277 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 1785 "y.tab.c" /* yacc.c:1646 */ +#line 1792 "y.tab.c" /* yacc.c:1652 */ break; case 10: -#line 279 "parser.y" /* yacc.c:1646 */ +#line 279 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 1791 "y.tab.c" /* yacc.c:1646 */ +#line 1798 "y.tab.c" /* yacc.c:1652 */ break; case 11: -#line 281 "parser.y" /* yacc.c:1646 */ +#line 281 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 1797 "y.tab.c" /* yacc.c:1646 */ +#line 1804 "y.tab.c" /* yacc.c:1652 */ break; case 12: -#line 286 "parser.y" /* yacc.c:1646 */ +#line 286 "parser.y" /* yacc.c:1652 */ { SlonikStmt_try *new; @@ -1813,11 +1820,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 1817 "y.tab.c" /* yacc.c:1646 */ +#line 1824 "y.tab.c" /* yacc.c:1652 */ break; case 13: -#line 303 "parser.y" /* yacc.c:1646 */ +#line 303 "parser.y" /* yacc.c:1652 */ { SlonikStmt_try *new; @@ -1834,11 +1841,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 1838 "y.tab.c" /* yacc.c:1646 */ +#line 1845 "y.tab.c" /* yacc.c:1652 */ break; case 14: -#line 321 "parser.y" /* yacc.c:1646 */ +#line 321 "parser.y" /* yacc.c:1652 */ { SlonikStmt_try *new; @@ -1855,11 +1862,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 1859 "y.tab.c" /* yacc.c:1646 */ +#line 1866 "y.tab.c" /* yacc.c:1652 */ break; case 15: -#line 339 "parser.y" /* yacc.c:1646 */ +#line 339 "parser.y" /* yacc.c:1652 */ { SlonikStmt_try *new; @@ -1875,11 +1882,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 1879 "y.tab.c" /* yacc.c:1646 */ +#line 1886 "y.tab.c" /* yacc.c:1652 */ break; case 16: -#line 355 "parser.y" /* yacc.c:1646 */ +#line 355 "parser.y" /* yacc.c:1652 */ { SlonikStmt_try *new; @@ -1894,270 +1901,270 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 1898 "y.tab.c" /* yacc.c:1646 */ +#line 1905 "y.tab.c" /* yacc.c:1652 */ break; case 17: -#line 372 "parser.y" /* yacc.c:1646 */ +#line 372 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[-1].statement); } -#line 1904 "y.tab.c" /* yacc.c:1646 */ +#line 1911 "y.tab.c" /* yacc.c:1652 */ break; case 18: -#line 375 "parser.y" /* yacc.c:1646 */ +#line 375 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[-1].statement); } -#line 1910 "y.tab.c" /* yacc.c:1646 */ +#line 1917 "y.tab.c" /* yacc.c:1652 */ break; case 19: -#line 379 "parser.y" /* yacc.c:1646 */ +#line 379 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 1916 "y.tab.c" /* yacc.c:1646 */ +#line 1923 "y.tab.c" /* yacc.c:1652 */ break; case 20: -#line 381 "parser.y" /* yacc.c:1646 */ +#line 381 "parser.y" /* yacc.c:1652 */ { (yyvsp[-1].statement)->next = (yyvsp[0].statement); (yyval.statement) = (yyvsp[-1].statement); } -#line 1922 "y.tab.c" /* yacc.c:1646 */ +#line 1929 "y.tab.c" /* yacc.c:1652 */ break; case 21: -#line 385 "parser.y" /* yacc.c:1646 */ +#line 385 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 1928 "y.tab.c" /* yacc.c:1646 */ +#line 1935 "y.tab.c" /* yacc.c:1652 */ break; case 22: -#line 387 "parser.y" /* yacc.c:1646 */ +#line 387 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 1934 "y.tab.c" /* yacc.c:1646 */ +#line 1941 "y.tab.c" /* yacc.c:1652 */ break; case 23: -#line 389 "parser.y" /* yacc.c:1646 */ +#line 389 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 1940 "y.tab.c" /* yacc.c:1646 */ +#line 1947 "y.tab.c" /* yacc.c:1652 */ break; case 24: -#line 391 "parser.y" /* yacc.c:1646 */ +#line 391 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 1946 "y.tab.c" /* yacc.c:1646 */ +#line 1953 "y.tab.c" /* yacc.c:1652 */ break; case 25: -#line 393 "parser.y" /* yacc.c:1646 */ +#line 393 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 1952 "y.tab.c" /* yacc.c:1646 */ +#line 1959 "y.tab.c" /* yacc.c:1652 */ break; case 26: -#line 395 "parser.y" /* yacc.c:1646 */ +#line 395 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 1958 "y.tab.c" /* yacc.c:1646 */ +#line 1965 "y.tab.c" /* yacc.c:1652 */ break; case 27: -#line 397 "parser.y" /* yacc.c:1646 */ +#line 397 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 1964 "y.tab.c" /* yacc.c:1646 */ +#line 1971 "y.tab.c" /* yacc.c:1652 */ break; case 28: -#line 399 "parser.y" /* yacc.c:1646 */ +#line 399 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 1970 "y.tab.c" /* yacc.c:1646 */ +#line 1977 "y.tab.c" /* yacc.c:1652 */ break; case 29: -#line 401 "parser.y" /* yacc.c:1646 */ +#line 401 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 1976 "y.tab.c" /* yacc.c:1646 */ +#line 1983 "y.tab.c" /* yacc.c:1652 */ break; case 30: -#line 403 "parser.y" /* yacc.c:1646 */ +#line 403 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 1982 "y.tab.c" /* yacc.c:1646 */ +#line 1989 "y.tab.c" /* yacc.c:1652 */ break; case 31: -#line 405 "parser.y" /* yacc.c:1646 */ +#line 405 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 1988 "y.tab.c" /* yacc.c:1646 */ +#line 1995 "y.tab.c" /* yacc.c:1652 */ break; case 32: -#line 407 "parser.y" /* yacc.c:1646 */ +#line 407 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 1994 "y.tab.c" /* yacc.c:1646 */ +#line 2001 "y.tab.c" /* yacc.c:1652 */ break; case 33: -#line 409 "parser.y" /* yacc.c:1646 */ +#line 409 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2000 "y.tab.c" /* yacc.c:1646 */ +#line 2007 "y.tab.c" /* yacc.c:1652 */ break; case 34: -#line 411 "parser.y" /* yacc.c:1646 */ +#line 411 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2006 "y.tab.c" /* yacc.c:1646 */ +#line 2013 "y.tab.c" /* yacc.c:1652 */ break; case 35: -#line 413 "parser.y" /* yacc.c:1646 */ +#line 413 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2012 "y.tab.c" /* yacc.c:1646 */ +#line 2019 "y.tab.c" /* yacc.c:1652 */ break; case 36: -#line 415 "parser.y" /* yacc.c:1646 */ +#line 415 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2018 "y.tab.c" /* yacc.c:1646 */ +#line 2025 "y.tab.c" /* yacc.c:1652 */ break; case 37: -#line 417 "parser.y" /* yacc.c:1646 */ +#line 417 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2024 "y.tab.c" /* yacc.c:1646 */ +#line 2031 "y.tab.c" /* yacc.c:1652 */ break; case 38: -#line 419 "parser.y" /* yacc.c:1646 */ +#line 419 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2030 "y.tab.c" /* yacc.c:1646 */ +#line 2037 "y.tab.c" /* yacc.c:1652 */ break; case 39: -#line 421 "parser.y" /* yacc.c:1646 */ +#line 421 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2036 "y.tab.c" /* yacc.c:1646 */ +#line 2043 "y.tab.c" /* yacc.c:1652 */ break; case 40: -#line 423 "parser.y" /* yacc.c:1646 */ +#line 423 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2042 "y.tab.c" /* yacc.c:1646 */ +#line 2049 "y.tab.c" /* yacc.c:1652 */ break; case 41: -#line 425 "parser.y" /* yacc.c:1646 */ +#line 425 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2048 "y.tab.c" /* yacc.c:1646 */ +#line 2055 "y.tab.c" /* yacc.c:1652 */ break; case 42: -#line 427 "parser.y" /* yacc.c:1646 */ +#line 427 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2054 "y.tab.c" /* yacc.c:1646 */ +#line 2061 "y.tab.c" /* yacc.c:1652 */ break; case 43: -#line 429 "parser.y" /* yacc.c:1646 */ +#line 429 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2060 "y.tab.c" /* yacc.c:1646 */ +#line 2067 "y.tab.c" /* yacc.c:1652 */ break; case 44: -#line 431 "parser.y" /* yacc.c:1646 */ +#line 431 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2066 "y.tab.c" /* yacc.c:1646 */ +#line 2073 "y.tab.c" /* yacc.c:1652 */ break; case 45: -#line 433 "parser.y" /* yacc.c:1646 */ +#line 433 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2072 "y.tab.c" /* yacc.c:1646 */ +#line 2079 "y.tab.c" /* yacc.c:1652 */ break; case 46: -#line 435 "parser.y" /* yacc.c:1646 */ +#line 435 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2078 "y.tab.c" /* yacc.c:1646 */ +#line 2085 "y.tab.c" /* yacc.c:1652 */ break; case 47: -#line 437 "parser.y" /* yacc.c:1646 */ +#line 437 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2084 "y.tab.c" /* yacc.c:1646 */ +#line 2091 "y.tab.c" /* yacc.c:1652 */ break; case 48: -#line 439 "parser.y" /* yacc.c:1646 */ +#line 439 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2090 "y.tab.c" /* yacc.c:1646 */ +#line 2097 "y.tab.c" /* yacc.c:1652 */ break; case 49: -#line 441 "parser.y" /* yacc.c:1646 */ +#line 441 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2096 "y.tab.c" /* yacc.c:1646 */ +#line 2103 "y.tab.c" /* yacc.c:1652 */ break; case 50: -#line 443 "parser.y" /* yacc.c:1646 */ +#line 443 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2102 "y.tab.c" /* yacc.c:1646 */ +#line 2109 "y.tab.c" /* yacc.c:1652 */ break; case 51: -#line 445 "parser.y" /* yacc.c:1646 */ +#line 445 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2108 "y.tab.c" /* yacc.c:1646 */ +#line 2115 "y.tab.c" /* yacc.c:1652 */ break; case 52: -#line 447 "parser.y" /* yacc.c:1646 */ +#line 447 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2114 "y.tab.c" /* yacc.c:1646 */ +#line 2121 "y.tab.c" /* yacc.c:1652 */ break; case 53: -#line 449 "parser.y" /* yacc.c:1646 */ +#line 449 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2120 "y.tab.c" /* yacc.c:1646 */ +#line 2127 "y.tab.c" /* yacc.c:1652 */ break; case 54: -#line 451 "parser.y" /* yacc.c:1646 */ +#line 451 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2126 "y.tab.c" /* yacc.c:1646 */ +#line 2133 "y.tab.c" /* yacc.c:1652 */ break; case 55: -#line 453 "parser.y" /* yacc.c:1646 */ +#line 453 "parser.y" /* yacc.c:1652 */ { yyerrok; (yyval.statement) = (yyvsp[-1].statement); } -#line 2133 "y.tab.c" /* yacc.c:1646 */ +#line 2140 "y.tab.c" /* yacc.c:1652 */ break; case 56: -#line 456 "parser.y" /* yacc.c:1646 */ +#line 456 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2139 "y.tab.c" /* yacc.c:1646 */ +#line 2146 "y.tab.c" /* yacc.c:1652 */ break; case 57: -#line 458 "parser.y" /* yacc.c:1646 */ +#line 458 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2145 "y.tab.c" /* yacc.c:1646 */ +#line 2152 "y.tab.c" /* yacc.c:1652 */ break; case 58: -#line 462 "parser.y" /* yacc.c:1646 */ +#line 462 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2151 "y.tab.c" /* yacc.c:1646 */ +#line 2158 "y.tab.c" /* yacc.c:1652 */ break; case 59: -#line 464 "parser.y" /* yacc.c:1646 */ +#line 464 "parser.y" /* yacc.c:1652 */ { (yyval.statement) = (yyvsp[0].statement); } -#line 2157 "y.tab.c" /* yacc.c:1646 */ +#line 2164 "y.tab.c" /* yacc.c:1652 */ break; case 60: -#line 468 "parser.y" /* yacc.c:1646 */ +#line 468 "parser.y" /* yacc.c:1652 */ { SlonikStmt_echo *new; @@ -2172,11 +2179,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2176 "y.tab.c" /* yacc.c:1646 */ +#line 2183 "y.tab.c" /* yacc.c:1652 */ break; case 61: -#line 485 "parser.y" /* yacc.c:1646 */ +#line 485 "parser.y" /* yacc.c:1652 */ { SlonikStmt_date *new; statement_option opt[] = { @@ -2200,11 +2207,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2204 "y.tab.c" /* yacc.c:1646 */ +#line 2211 "y.tab.c" /* yacc.c:1652 */ break; case 62: -#line 511 "parser.y" /* yacc.c:1646 */ +#line 511 "parser.y" /* yacc.c:1652 */ { SlonikStmt_exit *new; @@ -2219,11 +2226,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2223 "y.tab.c" /* yacc.c:1646 */ +#line 2230 "y.tab.c" /* yacc.c:1652 */ break; case 63: -#line 528 "parser.y" /* yacc.c:1646 */ +#line 528 "parser.y" /* yacc.c:1652 */ { SlonikStmt_restart_node *new; @@ -2238,11 +2245,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2242 "y.tab.c" /* yacc.c:1646 */ +#line 2249 "y.tab.c" /* yacc.c:1652 */ break; case 64: -#line 544 "parser.y" /* yacc.c:1646 */ +#line 544 "parser.y" /* yacc.c:1652 */ { SlonikStmt_resubscribe_node * new; statement_option opt[] = { @@ -2269,23 +2276,23 @@ parser_errors++; (yyval.statement) = (SlonikStmt *)new; } -#line 2273 "y.tab.c" /* yacc.c:1646 */ +#line 2280 "y.tab.c" /* yacc.c:1652 */ break; case 65: -#line 572 "parser.y" /* yacc.c:1646 */ +#line 572 "parser.y" /* yacc.c:1652 */ { (yyval.ival) = strtol(yytext, NULL, 10); } -#line 2279 "y.tab.c" /* yacc.c:1646 */ +#line 2286 "y.tab.c" /* yacc.c:1652 */ break; case 66: -#line 574 "parser.y" /* yacc.c:1646 */ +#line 574 "parser.y" /* yacc.c:1652 */ { (yyval.ival) = -(yyvsp[0].ival); } -#line 2285 "y.tab.c" /* yacc.c:1646 */ +#line 2292 "y.tab.c" /* yacc.c:1652 */ break; case 67: -#line 578 "parser.y" /* yacc.c:1646 */ +#line 578 "parser.y" /* yacc.c:1652 */ { SlonikStmt *new; @@ -2298,11 +2305,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2302 "y.tab.c" /* yacc.c:1646 */ +#line 2309 "y.tab.c" /* yacc.c:1652 */ break; case 68: -#line 593 "parser.y" /* yacc.c:1646 */ +#line 593 "parser.y" /* yacc.c:1652 */ { SlonikStmt_init_cluster *new; statement_option opt[] = { @@ -2328,11 +2335,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2332 "y.tab.c" /* yacc.c:1646 */ +#line 2339 "y.tab.c" /* yacc.c:1652 */ break; case 69: -#line 621 "parser.y" /* yacc.c:1646 */ +#line 621 "parser.y" /* yacc.c:1652 */ { SlonikStmt_store_node *new; statement_option opt[] = { @@ -2360,11 +2367,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2364 "y.tab.c" /* yacc.c:1646 */ +#line 2371 "y.tab.c" /* yacc.c:1652 */ break; case 70: -#line 651 "parser.y" /* yacc.c:1646 */ +#line 651 "parser.y" /* yacc.c:1652 */ { SlonikStmt_drop_node *new; statement_option opt[] = { @@ -2420,11 +2427,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2424 "y.tab.c" /* yacc.c:1646 */ +#line 2431 "y.tab.c" /* yacc.c:1652 */ break; case 71: -#line 708 "parser.y" /* yacc.c:1646 */ +#line 708 "parser.y" /* yacc.c:1652 */ { SlonikStmt_failed_node *new; @@ -2439,11 +2446,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2443 "y.tab.c" /* yacc.c:1646 */ +#line 2450 "y.tab.c" /* yacc.c:1652 */ break; case 72: -#line 723 "parser.y" /* yacc.c:1646 */ +#line 723 "parser.y" /* yacc.c:1652 */ { SlonikStmt_failed_node *new; statement_option opt[] = { @@ -2472,11 +2479,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2476 "y.tab.c" /* yacc.c:1646 */ +#line 2483 "y.tab.c" /* yacc.c:1652 */ break; case 73: -#line 754 "parser.y" /* yacc.c:1646 */ +#line 754 "parser.y" /* yacc.c:1652 */ { failed_node_entry *new; statement_option opt[] = { @@ -2499,11 +2506,11 @@ (yyval.failed_node_entry) = new; } -#line 2503 "y.tab.c" /* yacc.c:1646 */ +#line 2510 "y.tab.c" /* yacc.c:1652 */ break; case 74: -#line 777 "parser.y" /* yacc.c:1646 */ +#line 777 "parser.y" /* yacc.c:1652 */ { failed_node_entry *new; statement_option opt[] = { @@ -2526,11 +2533,11 @@ (yyval.failed_node_entry) = new; } -#line 2530 "y.tab.c" /* yacc.c:1646 */ +#line 2537 "y.tab.c" /* yacc.c:1652 */ break; case 75: -#line 801 "parser.y" /* yacc.c:1646 */ +#line 801 "parser.y" /* yacc.c:1652 */ { SlonikStmt_uninstall_node *new; statement_option opt[] = { @@ -2554,11 +2561,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2558 "y.tab.c" /* yacc.c:1646 */ +#line 2565 "y.tab.c" /* yacc.c:1652 */ break; case 76: -#line 827 "parser.y" /* yacc.c:1646 */ +#line 827 "parser.y" /* yacc.c:1652 */ { SlonikStmt_clone_prepare *new; statement_option opt[] = { @@ -2586,11 +2593,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2590 "y.tab.c" /* yacc.c:1646 */ +#line 2597 "y.tab.c" /* yacc.c:1652 */ break; case 77: -#line 857 "parser.y" /* yacc.c:1646 */ +#line 857 "parser.y" /* yacc.c:1652 */ { SlonikStmt_clone_finish *new; statement_option opt[] = { @@ -2616,11 +2623,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2620 "y.tab.c" /* yacc.c:1646 */ +#line 2627 "y.tab.c" /* yacc.c:1652 */ break; case 78: -#line 885 "parser.y" /* yacc.c:1646 */ +#line 885 "parser.y" /* yacc.c:1652 */ { SlonikStmt_store_path *new; statement_option opt[] = { @@ -2650,11 +2657,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2654 "y.tab.c" /* yacc.c:1646 */ +#line 2661 "y.tab.c" /* yacc.c:1652 */ break; case 79: -#line 917 "parser.y" /* yacc.c:1646 */ +#line 917 "parser.y" /* yacc.c:1652 */ { SlonikStmt_drop_path *new; statement_option opt[] = { @@ -2682,11 +2689,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2686 "y.tab.c" /* yacc.c:1646 */ +#line 2693 "y.tab.c" /* yacc.c:1652 */ break; case 80: -#line 947 "parser.y" /* yacc.c:1646 */ +#line 947 "parser.y" /* yacc.c:1652 */ { SlonikStmt_store_listen *new; statement_option opt[] = { @@ -2714,11 +2721,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2718 "y.tab.c" /* yacc.c:1646 */ +#line 2725 "y.tab.c" /* yacc.c:1652 */ break; case 81: -#line 977 "parser.y" /* yacc.c:1646 */ +#line 977 "parser.y" /* yacc.c:1652 */ { SlonikStmt_drop_listen *new; statement_option opt[] = { @@ -2746,11 +2753,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2750 "y.tab.c" /* yacc.c:1646 */ +#line 2757 "y.tab.c" /* yacc.c:1652 */ break; case 82: -#line 1007 "parser.y" /* yacc.c:1646 */ +#line 1007 "parser.y" /* yacc.c:1652 */ { SlonikStmt_create_set *new; statement_option opt[] = { @@ -2778,11 +2785,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2782 "y.tab.c" /* yacc.c:1646 */ +#line 2789 "y.tab.c" /* yacc.c:1652 */ break; case 83: -#line 1037 "parser.y" /* yacc.c:1646 */ +#line 1037 "parser.y" /* yacc.c:1652 */ { SlonikStmt_drop_set *new; statement_option opt[] = { @@ -2808,11 +2815,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2812 "y.tab.c" /* yacc.c:1646 */ +#line 2819 "y.tab.c" /* yacc.c:1652 */ break; case 84: -#line 1065 "parser.y" /* yacc.c:1646 */ +#line 1065 "parser.y" /* yacc.c:1652 */ { SlonikStmt_merge_set *new; statement_option opt[] = { @@ -2840,11 +2847,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2844 "y.tab.c" /* yacc.c:1646 */ +#line 2851 "y.tab.c" /* yacc.c:1652 */ break; case 85: -#line 1096 "parser.y" /* yacc.c:1646 */ +#line 1096 "parser.y" /* yacc.c:1652 */ { SlonikStmt_set_add_table *new; statement_option opt[] = { @@ -2882,11 +2889,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2886 "y.tab.c" /* yacc.c:1646 */ +#line 2893 "y.tab.c" /* yacc.c:1652 */ break; case 86: -#line 1136 "parser.y" /* yacc.c:1646 */ +#line 1136 "parser.y" /* yacc.c:1652 */ { SlonikStmt_set_add_sequence *new; statement_option opt[] = { @@ -2920,11 +2927,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2924 "y.tab.c" /* yacc.c:1646 */ +#line 2931 "y.tab.c" /* yacc.c:1652 */ break; case 87: -#line 1172 "parser.y" /* yacc.c:1646 */ +#line 1172 "parser.y" /* yacc.c:1652 */ { SlonikStmt_set_drop_table *new; statement_option opt[] = { @@ -2948,11 +2955,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2952 "y.tab.c" /* yacc.c:1646 */ +#line 2959 "y.tab.c" /* yacc.c:1652 */ break; case 88: -#line 1198 "parser.y" /* yacc.c:1646 */ +#line 1198 "parser.y" /* yacc.c:1652 */ { SlonikStmt_set_drop_sequence *new; statement_option opt[] = { @@ -2978,11 +2985,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 2982 "y.tab.c" /* yacc.c:1646 */ +#line 2989 "y.tab.c" /* yacc.c:1652 */ break; case 89: -#line 1226 "parser.y" /* yacc.c:1646 */ +#line 1226 "parser.y" /* yacc.c:1652 */ { SlonikStmt_set_move_table *new; statement_option opt[] = { @@ -3008,11 +3015,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 3012 "y.tab.c" /* yacc.c:1646 */ +#line 3019 "y.tab.c" /* yacc.c:1652 */ break; case 90: -#line 1254 "parser.y" /* yacc.c:1646 */ +#line 1254 "parser.y" /* yacc.c:1652 */ { SlonikStmt_set_move_sequence *new; statement_option opt[] = { @@ -3040,11 +3047,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 3044 "y.tab.c" /* yacc.c:1646 */ +#line 3051 "y.tab.c" /* yacc.c:1652 */ break; case 91: -#line 1284 "parser.y" /* yacc.c:1646 */ +#line 1284 "parser.y" /* yacc.c:1652 */ { SlonikStmt_subscribe_set *new; statement_option opt[] = { @@ -3076,11 +3083,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 3080 "y.tab.c" /* yacc.c:1646 */ +#line 3087 "y.tab.c" /* yacc.c:1652 */ break; case 92: -#line 1317 "parser.y" /* yacc.c:1646 */ +#line 1317 "parser.y" /* yacc.c:1652 */ { SlonikStmt_unsubscribe_set *new; statement_option opt[] = { @@ -3106,11 +3113,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 3110 "y.tab.c" /* yacc.c:1646 */ +#line 3117 "y.tab.c" /* yacc.c:1652 */ break; case 93: -#line 1345 "parser.y" /* yacc.c:1646 */ +#line 1345 "parser.y" /* yacc.c:1652 */ { SlonikStmt_lock_set *new; statement_option opt[] = { @@ -3136,11 +3143,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 3140 "y.tab.c" /* yacc.c:1646 */ +#line 3147 "y.tab.c" /* yacc.c:1652 */ break; case 94: -#line 1373 "parser.y" /* yacc.c:1646 */ +#line 1373 "parser.y" /* yacc.c:1652 */ { SlonikStmt_unlock_set *new; statement_option opt[] = { @@ -3166,11 +3173,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 3170 "y.tab.c" /* yacc.c:1646 */ +#line 3177 "y.tab.c" /* yacc.c:1652 */ break; case 95: -#line 1401 "parser.y" /* yacc.c:1646 */ +#line 1401 "parser.y" /* yacc.c:1652 */ { SlonikStmt_move_set *new; statement_option opt[] = { @@ -3198,11 +3205,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 3202 "y.tab.c" /* yacc.c:1646 */ +#line 3209 "y.tab.c" /* yacc.c:1652 */ break; case 96: -#line 1431 "parser.y" /* yacc.c:1646 */ +#line 1431 "parser.y" /* yacc.c:1652 */ { SlonikStmt_ddl_script *new; statement_option opt[] = { @@ -3235,11 +3242,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 3239 "y.tab.c" /* yacc.c:1646 */ +#line 3246 "y.tab.c" /* yacc.c:1652 */ break; case 97: -#line 1466 "parser.y" /* yacc.c:1646 */ +#line 1466 "parser.y" /* yacc.c:1652 */ { SlonikStmt_update_functions *new; statement_option opt[] = { @@ -3263,11 +3270,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 3267 "y.tab.c" /* yacc.c:1646 */ +#line 3274 "y.tab.c" /* yacc.c:1652 */ break; case 98: -#line 1491 "parser.y" /* yacc.c:1646 */ +#line 1491 "parser.y" /* yacc.c:1652 */ { SlonikStmt_repair_config *new; statement_option opt[] = { @@ -3296,11 +3303,11 @@ } (yyval.statement) = (SlonikStmt *)new; } -#line 3300 "y.tab.c" /* yacc.c:1646 */ +#line 3307 "y.tab.c" /* yacc.c:1652 */ break; case 99: -#line 1522 "parser.y" /* yacc.c:1646 */ +#line 1522 "parser.y" /* yacc.c:1652 */ { SlonikStmt_wait_event *new; statement_option opt[] = { @@ -3330,11 +3337,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 3334 "y.tab.c" /* yacc.c:1646 */ +#line 3341 "y.tab.c" /* yacc.c:1652 */ break; case 100: -#line 1554 "parser.y" /* yacc.c:1646 */ +#line 1554 "parser.y" /* yacc.c:1652 */ { SlonikStmt_wait_event *new; @@ -3352,11 +3359,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 3356 "y.tab.c" /* yacc.c:1646 */ +#line 3363 "y.tab.c" /* yacc.c:1652 */ break; case 101: -#line 1574 "parser.y" /* yacc.c:1646 */ +#line 1574 "parser.y" /* yacc.c:1652 */ { SlonikStmt_switch_log *new; statement_option opt[] = { @@ -3380,11 +3387,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 3384 "y.tab.c" /* yacc.c:1646 */ +#line 3391 "y.tab.c" /* yacc.c:1652 */ break; case 102: -#line 1600 "parser.y" /* yacc.c:1646 */ +#line 1600 "parser.y" /* yacc.c:1652 */ { SlonikStmt_sync *new; statement_option opt[] = { @@ -3408,11 +3415,11 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 3412 "y.tab.c" /* yacc.c:1646 */ +#line 3419 "y.tab.c" /* yacc.c:1652 */ break; case 103: -#line 1626 "parser.y" /* yacc.c:1646 */ +#line 1626 "parser.y" /* yacc.c:1652 */ { SlonikStmt_sleep *new; statement_option opt[] = { @@ -3436,260 +3443,260 @@ (yyval.statement) = (SlonikStmt *)new; } -#line 3440 "y.tab.c" /* yacc.c:1646 */ +#line 3447 "y.tab.c" /* yacc.c:1652 */ break; case 104: -#line 1652 "parser.y" /* yacc.c:1646 */ +#line 1652 "parser.y" /* yacc.c:1652 */ { (yyval.opt_list) = NULL; } -#line 3446 "y.tab.c" /* yacc.c:1646 */ +#line 3453 "y.tab.c" /* yacc.c:1652 */ break; case 105: -#line 1654 "parser.y" /* yacc.c:1646 */ +#line 1654 "parser.y" /* yacc.c:1652 */ { (yyval.opt_list) = (yyvsp[-2].opt_list); } -#line 3452 "y.tab.c" /* yacc.c:1646 */ +#line 3459 "y.tab.c" /* yacc.c:1652 */ break; case 106: -#line 1658 "parser.y" /* yacc.c:1646 */ +#line 1658 "parser.y" /* yacc.c:1652 */ { (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3458 "y.tab.c" /* yacc.c:1646 */ +#line 3465 "y.tab.c" /* yacc.c:1652 */ break; case 107: -#line 1660 "parser.y" /* yacc.c:1646 */ +#line 1660 "parser.y" /* yacc.c:1652 */ { (yyvsp[-2].opt_list)->next = (yyvsp[0].opt_list); (yyval.opt_list) = (yyvsp[-2].opt_list); } -#line 3464 "y.tab.c" /* yacc.c:1646 */ +#line 3471 "y.tab.c" /* yacc.c:1652 */ break; case 108: -#line 1664 "parser.y" /* yacc.c:1646 */ +#line 1664 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_ID; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3473 "y.tab.c" /* yacc.c:1646 */ +#line 3480 "y.tab.c" /* yacc.c:1652 */ break; case 109: -#line 1669 "parser.y" /* yacc.c:1646 */ +#line 1669 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code= O_ID; (yyval.opt_list)=(yyvsp[0].opt_list); } -#line 3482 "y.tab.c" /* yacc.c:1646 */ +#line 3489 "y.tab.c" /* yacc.c:1652 */ break; case 110: -#line 1674 "parser.y" /* yacc.c:1646 */ +#line 1674 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_BACKUP_NODE; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3491 "y.tab.c" /* yacc.c:1646 */ +#line 3498 "y.tab.c" /* yacc.c:1652 */ break; case 111: -#line 1679 "parser.y" /* yacc.c:1646 */ +#line 1679 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_EVENT_NODE; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3500 "y.tab.c" /* yacc.c:1646 */ +#line 3507 "y.tab.c" /* yacc.c:1652 */ break; case 112: -#line 1684 "parser.y" /* yacc.c:1646 */ +#line 1684 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_SERVER; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3509 "y.tab.c" /* yacc.c:1646 */ +#line 3516 "y.tab.c" /* yacc.c:1652 */ break; case 113: -#line 1689 "parser.y" /* yacc.c:1646 */ +#line 1689 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_CLIENT; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3518 "y.tab.c" /* yacc.c:1646 */ +#line 3525 "y.tab.c" /* yacc.c:1652 */ break; case 114: -#line 1694 "parser.y" /* yacc.c:1646 */ +#line 1694 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_ORIGIN; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3527 "y.tab.c" /* yacc.c:1646 */ +#line 3534 "y.tab.c" /* yacc.c:1652 */ break; case 115: -#line 1699 "parser.y" /* yacc.c:1646 */ +#line 1699 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_OLD_ORIGIN; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3536 "y.tab.c" /* yacc.c:1646 */ +#line 3543 "y.tab.c" /* yacc.c:1652 */ break; case 116: -#line 1704 "parser.y" /* yacc.c:1646 */ +#line 1704 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_OMIT_COPY; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3545 "y.tab.c" /* yacc.c:1646 */ +#line 3552 "y.tab.c" /* yacc.c:1652 */ break; case 117: -#line 1709 "parser.y" /* yacc.c:1646 */ +#line 1709 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_NEW_ORIGIN; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3554 "y.tab.c" /* yacc.c:1646 */ +#line 3561 "y.tab.c" /* yacc.c:1652 */ break; case 118: -#line 1714 "parser.y" /* yacc.c:1646 */ +#line 1714 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_NEW_SET; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3563 "y.tab.c" /* yacc.c:1646 */ +#line 3570 "y.tab.c" /* yacc.c:1652 */ break; case 119: -#line 1719 "parser.y" /* yacc.c:1646 */ +#line 1719 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_RECEIVER; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3572 "y.tab.c" /* yacc.c:1646 */ +#line 3579 "y.tab.c" /* yacc.c:1652 */ break; case 120: -#line 1724 "parser.y" /* yacc.c:1646 */ +#line 1724 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_PROVIDER; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3581 "y.tab.c" /* yacc.c:1646 */ +#line 3588 "y.tab.c" /* yacc.c:1652 */ break; case 121: -#line 1729 "parser.y" /* yacc.c:1646 */ +#line 1729 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_CONNRETRY; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3590 "y.tab.c" /* yacc.c:1646 */ +#line 3597 "y.tab.c" /* yacc.c:1652 */ break; case 122: -#line 1734 "parser.y" /* yacc.c:1646 */ +#line 1734 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_COMMENT; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3599 "y.tab.c" /* yacc.c:1646 */ +#line 3606 "y.tab.c" /* yacc.c:1652 */ break; case 123: -#line 1739 "parser.y" /* yacc.c:1646 */ +#line 1739 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_CONNINFO; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3608 "y.tab.c" /* yacc.c:1646 */ +#line 3615 "y.tab.c" /* yacc.c:1652 */ break; case 124: -#line 1744 "parser.y" /* yacc.c:1646 */ +#line 1744 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_DATE_FORMAT; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3617 "y.tab.c" /* yacc.c:1646 */ +#line 3624 "y.tab.c" /* yacc.c:1652 */ break; case 125: -#line 1749 "parser.y" /* yacc.c:1646 */ +#line 1749 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_SET_ID; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3626 "y.tab.c" /* yacc.c:1646 */ +#line 3633 "y.tab.c" /* yacc.c:1652 */ break; case 126: -#line 1754 "parser.y" /* yacc.c:1646 */ +#line 1754 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_ADD_ID; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3635 "y.tab.c" /* yacc.c:1646 */ +#line 3642 "y.tab.c" /* yacc.c:1652 */ break; case 127: -#line 1759 "parser.y" /* yacc.c:1646 */ +#line 1759 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_NODE_ID; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3644 "y.tab.c" /* yacc.c:1646 */ +#line 3651 "y.tab.c" /* yacc.c:1652 */ break; case 128: -#line 1764 "parser.y" /* yacc.c:1646 */ +#line 1764 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_TAB_ID; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3653 "y.tab.c" /* yacc.c:1646 */ +#line 3660 "y.tab.c" /* yacc.c:1652 */ break; case 129: -#line 1769 "parser.y" /* yacc.c:1646 */ +#line 1769 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_FQNAME; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3662 "y.tab.c" /* yacc.c:1646 */ +#line 3669 "y.tab.c" /* yacc.c:1652 */ break; case 130: -#line 1774 "parser.y" /* yacc.c:1646 */ +#line 1774 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_USE_KEY; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3671 "y.tab.c" /* yacc.c:1646 */ +#line 3678 "y.tab.c" /* yacc.c:1652 */ break; case 131: -#line 1779 "parser.y" /* yacc.c:1646 */ +#line 1779 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_FORWARD; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3680 "y.tab.c" /* yacc.c:1646 */ +#line 3687 "y.tab.c" /* yacc.c:1652 */ break; case 132: -#line 1784 "parser.y" /* yacc.c:1646 */ +#line 1784 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_FILENAME; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3689 "y.tab.c" /* yacc.c:1646 */ +#line 3696 "y.tab.c" /* yacc.c:1652 */ break; case 133: -#line 1789 "parser.y" /* yacc.c:1646 */ +#line 1789 "parser.y" /* yacc.c:1652 */ { option_list *new; new = (option_list *)malloc(sizeof(option_list)); @@ -3702,20 +3709,20 @@ (yyval.opt_list) = new; } -#line 3706 "y.tab.c" /* yacc.c:1646 */ +#line 3713 "y.tab.c" /* yacc.c:1652 */ break; case 134: -#line 1802 "parser.y" /* yacc.c:1646 */ +#line 1802 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_WAIT_CONFIRMED; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3715 "y.tab.c" /* yacc.c:1646 */ +#line 3722 "y.tab.c" /* yacc.c:1652 */ break; case 135: -#line 1807 "parser.y" /* yacc.c:1646 */ +#line 1807 "parser.y" /* yacc.c:1652 */ { option_list *new; new = (option_list *)malloc(sizeof(option_list)); @@ -3728,93 +3735,93 @@ (yyval.opt_list) = new; } -#line 3732 "y.tab.c" /* yacc.c:1646 */ +#line 3739 "y.tab.c" /* yacc.c:1652 */ break; case 136: -#line 1820 "parser.y" /* yacc.c:1646 */ +#line 1820 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_WAIT_ON; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3741 "y.tab.c" /* yacc.c:1646 */ +#line 3748 "y.tab.c" /* yacc.c:1652 */ break; case 137: -#line 1825 "parser.y" /* yacc.c:1646 */ +#line 1825 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_TIMEOUT; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3750 "y.tab.c" /* yacc.c:1646 */ +#line 3757 "y.tab.c" /* yacc.c:1652 */ break; case 138: -#line 1830 "parser.y" /* yacc.c:1646 */ +#line 1830 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_EXECUTE_ONLY_ON; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3759 "y.tab.c" /* yacc.c:1646 */ +#line 3766 "y.tab.c" /* yacc.c:1652 */ break; case 139: -#line 1835 "parser.y" /* yacc.c:1646 */ +#line 1835 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_EXECUTE_ONLY_LIST; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3768 "y.tab.c" /* yacc.c:1646 */ +#line 3775 "y.tab.c" /* yacc.c:1652 */ break; case 140: -#line 1840 "parser.y" /* yacc.c:1646 */ +#line 1840 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_SECONDS; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3777 "y.tab.c" /* yacc.c:1646 */ +#line 3784 "y.tab.c" /* yacc.c:1652 */ break; case 141: -#line 1845 "parser.y" /* yacc.c:1646 */ +#line 1845 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_SQL; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3786 "y.tab.c" /* yacc.c:1646 */ +#line 3793 "y.tab.c" /* yacc.c:1652 */ break; case 142: -#line 1850 "parser.y" /* yacc.c:1646 */ +#line 1850 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_TABLES; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3795 "y.tab.c" /* yacc.c:1646 */ +#line 3802 "y.tab.c" /* yacc.c:1652 */ break; case 143: -#line 1855 "parser.y" /* yacc.c:1646 */ +#line 1855 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code = O_SEQUENCES; (yyval.opt_list) = (yyvsp[0].opt_list); } -#line 3804 "y.tab.c" /* yacc.c:1646 */ +#line 3811 "y.tab.c" /* yacc.c:1652 */ break; case 144: -#line 1860 "parser.y" /* yacc.c:1646 */ +#line 1860 "parser.y" /* yacc.c:1652 */ { (yyvsp[0].opt_list)->opt_code=O_ADD_SEQUENCES; (yyval.opt_list)=(yyvsp[0].opt_list); } -#line 3814 "y.tab.c" /* yacc.c:1646 */ +#line 3821 "y.tab.c" /* yacc.c:1652 */ break; case 145: -#line 1868 "parser.y" /* yacc.c:1646 */ +#line 1868 "parser.y" /* yacc.c:1652 */ { option_list *new; new = (option_list *)malloc(sizeof(option_list)); @@ -3826,11 +3833,11 @@ (yyval.opt_list) = new; } -#line 3830 "y.tab.c" /* yacc.c:1646 */ +#line 3837 "y.tab.c" /* yacc.c:1652 */ break; case 146: -#line 1882 "parser.y" /* yacc.c:1646 */ +#line 1882 "parser.y" /* yacc.c:1652 */ { option_list *new; new = (option_list *)malloc(sizeof(option_list)); @@ -3842,11 +3849,11 @@ (yyval.opt_list) = new; } -#line 3846 "y.tab.c" /* yacc.c:1646 */ +#line 3853 "y.tab.c" /* yacc.c:1652 */ break; case 147: -#line 1896 "parser.y" /* yacc.c:1646 */ +#line 1896 "parser.y" /* yacc.c:1652 */ { option_list *new; new = (option_list *)malloc(sizeof(option_list)); @@ -3858,11 +3865,11 @@ (yyval.opt_list) = new; } -#line 3862 "y.tab.c" /* yacc.c:1646 */ +#line 3869 "y.tab.c" /* yacc.c:1652 */ break; case 148: -#line 1908 "parser.y" /* yacc.c:1646 */ +#line 1908 "parser.y" /* yacc.c:1652 */ { option_list *new; new = (option_list *)malloc(sizeof(option_list)); @@ -3874,19 +3881,19 @@ (yyval.opt_list) = new; } -#line 3878 "y.tab.c" /* yacc.c:1646 */ +#line 3885 "y.tab.c" /* yacc.c:1652 */ break; case 155: -#line 1932 "parser.y" /* yacc.c:1646 */ +#line 1932 "parser.y" /* yacc.c:1652 */ { (yyval.ival) = strtol(yytext, NULL, 10); } -#line 3886 "y.tab.c" /* yacc.c:1646 */ +#line 3893 "y.tab.c" /* yacc.c:1652 */ break; case 156: -#line 1938 "parser.y" /* yacc.c:1646 */ +#line 1938 "parser.y" /* yacc.c:1652 */ { char *ret; size_t toklen=yyget_leng(); @@ -3896,11 +3903,11 @@ (yyval.str) = ret; } -#line 3900 "y.tab.c" /* yacc.c:1646 */ +#line 3907 "y.tab.c" /* yacc.c:1652 */ break; case 157: -#line 1950 "parser.y" /* yacc.c:1646 */ +#line 1950 "parser.y" /* yacc.c:1652 */ { char *ret; size_t toklen=yyget_leng(); @@ -3910,17 +3917,17 @@ (yyval.str) = ret; } -#line 3914 "y.tab.c" /* yacc.c:1646 */ +#line 3921 "y.tab.c" /* yacc.c:1652 */ break; case 158: -#line 1962 "parser.y" /* yacc.c:1646 */ +#line 1962 "parser.y" /* yacc.c:1652 */ { (yyval.ival) = yylineno; } -#line 3920 "y.tab.c" /* yacc.c:1646 */ +#line 3927 "y.tab.c" /* yacc.c:1652 */ break; -#line 3924 "y.tab.c" /* yacc.c:1646 */ +#line 3931 "y.tab.c" /* yacc.c:1652 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -3945,14 +3952,13 @@ /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; + { + const int yylhs = yyr1[yyn] - YYNTOKENS; + const int yyi = yypgoto[yylhs] + *yyssp; + yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp + ? yytable[yyi] + : yydefgoto[yylhs]); + } goto yynewstate; @@ -4035,12 +4041,10 @@ | yyerrorlab -- error raised explicitly by YYERROR. | `---------------------------------------------------*/ yyerrorlab: - - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; + /* Pacify compilers when the user code never invokes YYERROR and the + label yyerrorlab therefore never appears in user code. */ + if (0) + YYERROR; /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ @@ -4102,6 +4106,7 @@ yyresult = 0; goto yyreturn; + /*-----------------------------------. | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ @@ -4109,6 +4114,7 @@ yyresult = 1; goto yyreturn; + #if !defined yyoverflow || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | @@ -4119,6 +4125,10 @@ /* Fall through. */ #endif + +/*-----------------------------------------------------. +| yyreturn -- parsing is finished, return the result. | +`-----------------------------------------------------*/ yyreturn: if (yychar != YYEMPTY) { @@ -4148,7 +4158,7 @@ #endif return yyresult; } -#line 1965 "parser.y" /* yacc.c:1906 */ +#line 1965 "parser.y" /* yacc.c:1918 */ diff -Nru slony1-2-2.2.8/src/slonik/scan.c slony1-2-2.2.10/src/slonik/scan.c --- slony1-2-2.2.8/src/slonik/scan.c 2019-08-27 03:14:36.000000000 +0000 +++ slony1-2-2.2.10/src/slonik/scan.c 2020-12-05 02:10:40.000000000 +0000 @@ -8,8 +8,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 39 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -84,60 +84,48 @@ #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST +/* begin standard C++ headers. */ -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ #define BEGIN (yy_start) = 1 + 2 * - /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) - +#define YY_NEW_FILE yyrestart( yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ @@ -167,17 +155,17 @@ typedef size_t yy_size_t; #endif -extern yy_size_t yyleng; +extern int yyleng; extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires * access to the local variable yy_act. Since yyless() is a macro, it would break - * existing scanners that call yyless() from OUTSIDE yylex. + * existing scanners that call yyless() from OUTSIDE yylex. * One obvious solution it to make yy_act a global. I tried that, and saw * a 5% performance hit in a non-yylineno scanner, because yy_act is * normally declared as a register variable-- so it is not worth it. @@ -210,7 +198,6 @@ YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, (yytext_ptr) ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -225,12 +212,12 @@ /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -253,7 +240,7 @@ int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -281,7 +268,7 @@ /* Stack of input buffers. */ static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ +static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general @@ -292,7 +279,6 @@ #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ : NULL) - /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. */ @@ -300,11 +286,11 @@ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ -yy_size_t yyleng; +static int yy_n_chars; /* number of characters read into yy_ch_buf */ +int yyleng; /* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; +static char *yy_c_buf_p = NULL; static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ @@ -313,85 +299,81 @@ */ static int yy_did_buffer_switch_on_eof; -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); - -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); - -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) - -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); - -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); +void yyrestart ( FILE *input_file ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); +void yy_delete_buffer ( YY_BUFFER_STATE b ); +void yy_flush_buffer ( YY_BUFFER_STATE b ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state ( void ); + +static void yyensure_buffer_stack ( void ); +static void yy_load_buffer_state ( void ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) + +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); + +void *yyalloc ( yy_size_t ); +void *yyrealloc ( void *, yy_size_t ); +void yyfree ( void * ); #define yy_new_buffer yy_create_buffer - #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) /* Begin user sect3 */ -#define yywrap() 1 +#define yywrap() (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP +typedef flex_uint8_t YY_CHAR; -typedef unsigned char YY_CHAR; - -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; +FILE *yyin = NULL, *yyout = NULL; typedef int yy_state_type; extern int yylineno; - int yylineno = 1; extern char *yytext; +#ifdef yytext_ptr +#undef yytext_ptr +#endif #define yytext_ptr yytext -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yy_fatal_error (yyconst char msg[] ); +static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); +static int yy_get_next_buffer ( void ); +static void yynoreturn yy_fatal_error ( const char* msg ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ - yyleng = (size_t) (yy_cp - yy_bp); \ + yyleng = (int) (yy_cp - yy_bp); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; - #define YY_NUM_RULES 96 #define YY_END_OF_BUFFER 97 /* This struct is not used in this scanner, @@ -401,7 +383,7 @@ flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[387] = +static const flex_int16_t yy_accept[387] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 97, 95, 86, 86, 94, 87, 84, 95, 85, 85, 85, 85, @@ -447,7 +429,7 @@ 85, 85, 85, 59, 80, 0 } ; -static yyconst flex_int32_t yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 2, 4, 1, 1, 1, 1, 1, 1, 1, @@ -479,7 +461,7 @@ 22, 22, 22, 22, 22 } ; -static yyconst flex_int32_t yy_meta[62] = +static const YY_CHAR yy_meta[62] = { 0, 1, 2, 3, 3, 1, 4, 5, 4, 1, 1, 6, 1, 7, 7, 7, 7, 7, 7, 7, 7, @@ -490,7 +472,7 @@ 7 } ; -static yyconst flex_int16_t yy_base[398] = +static const flex_int16_t yy_base[398] = { 0, 0, 0, 155, 147, 61, 73, 136, 106, 111, 891, 84, 87, 0, 891, 101, 0, 76, 80, 71, 90, @@ -538,7 +520,7 @@ } ; -static yyconst flex_int16_t yy_def[398] = +static const flex_int16_t yy_def[398] = { 0, 386, 1, 387, 387, 388, 388, 389, 389, 386, 386, 386, 386, 390, 386, 386, 391, 392, 392, 392, 392, @@ -586,7 +568,7 @@ } ; -static yyconst flex_int16_t yy_nxt[953] = +static const flex_int16_t yy_nxt[953] = { 0, 10, 11, 12, 11, 13, 10, 14, 15, 10, 10, 10, 16, 17, 18, 19, 20, 21, 22, 23, 23, @@ -695,7 +677,7 @@ 386, 386 } ; -static yyconst flex_int16_t yy_chk[953] = +static const flex_int16_t yy_chk[953] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -805,7 +787,7 @@ } ; /* Table of booleans, true if rule could match eol. */ -static yyconst flex_int32_t yy_rule_can_match_eol[97] = +static const flex_int32_t yy_rule_can_match_eol[97] = { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -864,18 +846,19 @@ static void popBuffer( void ); /* Pop previous lexer buffer */ extern char * current_file; +#line 850 "scan.c" #line 40 "scan.l" #include "libpq-fe.h" #include "slonik.h" #include "y.tab.h" - +#line 856 "scan.c" /* quoted_ident (\"[^\"]*\")+ identifier ({ident_start}{ident_cont}*|{quoted_ident}) */ -#line 879 "scan.c" +#line 862 "scan.c" #define INITIAL 0 #define incl 1 @@ -894,36 +877,36 @@ #define YY_EXTRA_TYPE void * #endif -static int yy_init_globals (void ); +static int yy_init_globals ( void ); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy (void ); +int yylex_destroy ( void ); -int yyget_debug (void ); +int yyget_debug ( void ); -void yyset_debug (int debug_flag ); +void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra (void ); +YY_EXTRA_TYPE yyget_extra ( void ); -void yyset_extra (YY_EXTRA_TYPE user_defined ); +void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in (void ); +FILE *yyget_in ( void ); -void yyset_in (FILE * in_str ); +void yyset_in ( FILE * _in_str ); -FILE *yyget_out (void ); +FILE *yyget_out ( void ); -void yyset_out (FILE * out_str ); +void yyset_out ( FILE * _out_str ); -yy_size_t yyget_leng (void ); + int yyget_leng ( void ); -char *yyget_text (void ); +char *yyget_text ( void ); -int yyget_lineno (void ); +int yyget_lineno ( void ); -void yyset_lineno (int line_number ); +void yyset_lineno ( int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -931,26 +914,29 @@ #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (void ); +extern "C" int yywrap ( void ); #else -extern int yywrap (void ); +extern int yywrap ( void ); #endif #endif +#ifndef YY_NO_UNPUT + +#endif + #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy ( char *, const char *, int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen ( const char * ); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (void ); +static int yyinput ( void ); #else -static int input (void ); +static int input ( void ); #endif #endif @@ -970,7 +956,7 @@ /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -994,7 +980,7 @@ else \ { \ errno=0; \ - while ( (result = fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -1049,7 +1035,7 @@ /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK break; +#define YY_BREAK /*LINTED*/break; #endif #define YY_RULE_SETUP \ @@ -1059,9 +1045,9 @@ */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; if ( !(yy_init) ) { @@ -1083,25 +1069,26 @@ if ( ! YY_CURRENT_BUFFER ) { yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_load_buffer_state( ); + yy_load_buffer_state( ); } { #line 67 "scan.l" +#line 70 "scan.l" char *instring_buffer = NULL; int instring_length=0; int instring_buf_length=0; BEGIN(INITIAL); -#line 1103 "scan.c" +#line 1090 "scan.c" - while ( 1 ) /* loops until end-of-file is reached */ + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -1117,7 +1104,7 @@ yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1127,9 +1114,9 @@ { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 387 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } while ( yy_base[yy_current_state] != 891 ); @@ -1147,10 +1134,10 @@ if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) { - yy_size_t yyl; + int yyl; for ( yyl = 0; yyl < yyleng; ++yyl ) if ( yytext[yyl] == '\n' ) - + yylineno++; ; } @@ -1169,439 +1156,439 @@ case 1: /* rule 1 can match eol */ YY_RULE_SETUP -#line 75 "scan.l" +#line 76 "scan.l" { BEGIN(incl); } YY_BREAK case 2: /* rule 2 can match eol */ YY_RULE_SETUP -#line 76 "scan.l" +#line 77 "scan.l" { BEGIN(define); } YY_BREAK case 3: YY_RULE_SETUP -#line 78 "scan.l" +#line 79 "scan.l" { return K_ADD; } YY_BREAK case 4: YY_RULE_SETUP -#line 79 "scan.l" +#line 80 "scan.l" { return K_ADMIN; } YY_BREAK case 5: YY_RULE_SETUP -#line 80 "scan.l" +#line 81 "scan.l" { return K_ALL; } YY_BREAK case 6: YY_RULE_SETUP -#line 81 "scan.l" +#line 82 "scan.l" { return K_BACKUP; } YY_BREAK case 7: YY_RULE_SETUP -#line 82 "scan.l" +#line 83 "scan.l" { return K_CLIENT; } YY_BREAK case 8: YY_RULE_SETUP -#line 83 "scan.l" +#line 84 "scan.l" { return K_CLONE; } YY_BREAK case 9: YY_RULE_SETUP -#line 84 "scan.l" +#line 85 "scan.l" { return K_CLUSTER; } YY_BREAK case 10: YY_RULE_SETUP -#line 85 "scan.l" +#line 86 "scan.l" { return K_COMMENT; } YY_BREAK case 11: YY_RULE_SETUP -#line 86 "scan.l" +#line 87 "scan.l" { return K_CONFIG; } YY_BREAK case 12: YY_RULE_SETUP -#line 87 "scan.l" +#line 88 "scan.l" { return K_CONFIRMED; } YY_BREAK case 13: YY_RULE_SETUP -#line 88 "scan.l" +#line 89 "scan.l" { return K_CONNINFO; } YY_BREAK case 14: YY_RULE_SETUP -#line 89 "scan.l" +#line 90 "scan.l" { return K_CONNRETRY; } YY_BREAK case 15: YY_RULE_SETUP -#line 90 "scan.l" +#line 91 "scan.l" { return K_COPY; } YY_BREAK case 16: YY_RULE_SETUP -#line 91 "scan.l" +#line 92 "scan.l" { return K_CREATE; } YY_BREAK case 17: YY_RULE_SETUP -#line 92 "scan.l" +#line 93 "scan.l" { return K_DATE; } YY_BREAK case 18: YY_RULE_SETUP -#line 93 "scan.l" +#line 94 "scan.l" { return K_DROP; } YY_BREAK case 19: YY_RULE_SETUP -#line 94 "scan.l" +#line 95 "scan.l" { return K_ECHO; } YY_BREAK case 20: YY_RULE_SETUP -#line 95 "scan.l" +#line 96 "scan.l" { return K_ERROR; } YY_BREAK case 21: YY_RULE_SETUP -#line 96 "scan.l" +#line 97 "scan.l" { return K_EVENT; } YY_BREAK case 22: YY_RULE_SETUP -#line 97 "scan.l" +#line 98 "scan.l" { return K_EXECUTE; } YY_BREAK case 23: YY_RULE_SETUP -#line 98 "scan.l" +#line 99 "scan.l" { return K_EXIT; } YY_BREAK case 24: YY_RULE_SETUP -#line 99 "scan.l" +#line 100 "scan.l" { return K_FAILOVER; } YY_BREAK case 25: YY_RULE_SETUP -#line 100 "scan.l" +#line 101 "scan.l" { return K_FALSE; } YY_BREAK case 26: YY_RULE_SETUP -#line 101 "scan.l" +#line 102 "scan.l" { return K_FILENAME; } YY_BREAK case 27: YY_RULE_SETUP -#line 102 "scan.l" +#line 103 "scan.l" { return K_FINISH; } YY_BREAK case 28: YY_RULE_SETUP -#line 103 "scan.l" +#line 104 "scan.l" { return K_FOR; } YY_BREAK case 29: YY_RULE_SETUP -#line 104 "scan.l" +#line 105 "scan.l" { return K_DFORMAT; } YY_BREAK case 30: YY_RULE_SETUP -#line 105 "scan.l" +#line 106 "scan.l" { return K_FORWARD; } YY_BREAK case 31: YY_RULE_SETUP -#line 106 "scan.l" +#line 107 "scan.l" { return K_FULL; } YY_BREAK case 32: YY_RULE_SETUP -#line 107 "scan.l" +#line 108 "scan.l" { return K_FULL; } YY_BREAK case 33: YY_RULE_SETUP -#line 108 "scan.l" +#line 109 "scan.l" { return K_FUNCTIONS; } YY_BREAK case 34: YY_RULE_SETUP -#line 109 "scan.l" +#line 110 "scan.l" { return K_ID; } YY_BREAK case 35: YY_RULE_SETUP -#line 110 "scan.l" +#line 111 "scan.l" { return K_INIT; } YY_BREAK case 36: YY_RULE_SETUP -#line 111 "scan.l" +#line 112 "scan.l" { return K_KEY; } YY_BREAK case 37: YY_RULE_SETUP -#line 112 "scan.l" +#line 113 "scan.l" { return K_LISTEN; } YY_BREAK case 38: YY_RULE_SETUP -#line 113 "scan.l" +#line 114 "scan.l" { return K_LOCK; } YY_BREAK case 39: YY_RULE_SETUP -#line 114 "scan.l" +#line 115 "scan.l" { return K_LOG; } YY_BREAK case 40: YY_RULE_SETUP -#line 115 "scan.l" +#line 116 "scan.l" { return K_MERGE; } YY_BREAK case 41: YY_RULE_SETUP -#line 116 "scan.l" +#line 117 "scan.l" { return K_MOVE; } YY_BREAK case 42: YY_RULE_SETUP -#line 117 "scan.l" +#line 118 "scan.l" { return K_NAME; } YY_BREAK case 43: YY_RULE_SETUP -#line 118 "scan.l" +#line 119 "scan.l" { return K_NEW; } YY_BREAK case 44: YY_RULE_SETUP -#line 119 "scan.l" +#line 120 "scan.l" { return K_NO; } YY_BREAK case 45: YY_RULE_SETUP -#line 120 "scan.l" +#line 121 "scan.l" { return K_NODE; } YY_BREAK case 46: YY_RULE_SETUP -#line 121 "scan.l" +#line 122 "scan.l" { return K_OFF; } YY_BREAK case 47: YY_RULE_SETUP -#line 122 "scan.l" +#line 123 "scan.l" { return K_OLD; } YY_BREAK case 48: YY_RULE_SETUP -#line 123 "scan.l" +#line 124 "scan.l" { return K_OMIT; } YY_BREAK case 49: YY_RULE_SETUP -#line 124 "scan.l" +#line 125 "scan.l" { return K_ON; } YY_BREAK case 50: YY_RULE_SETUP -#line 125 "scan.l" +#line 126 "scan.l" { return K_ONLY; } YY_BREAK case 51: YY_RULE_SETUP -#line 126 "scan.l" +#line 127 "scan.l" { return K_ORIGIN; } YY_BREAK case 52: YY_RULE_SETUP -#line 127 "scan.l" +#line 128 "scan.l" { return K_PATH; } YY_BREAK case 53: YY_RULE_SETUP -#line 128 "scan.l" +#line 129 "scan.l" { return K_PREPARE; } YY_BREAK case 54: YY_RULE_SETUP -#line 129 "scan.l" +#line 130 "scan.l" { return K_PROVIDER; } YY_BREAK case 55: YY_RULE_SETUP -#line 130 "scan.l" +#line 131 "scan.l" { return K_QUALIFIED; } YY_BREAK case 56: YY_RULE_SETUP -#line 131 "scan.l" +#line 132 "scan.l" { return K_RECEIVER; } YY_BREAK case 57: YY_RULE_SETUP -#line 132 "scan.l" +#line 133 "scan.l" { return K_REPAIR; } YY_BREAK case 58: YY_RULE_SETUP -#line 133 "scan.l" +#line 134 "scan.l" { return K_RESTART; } YY_BREAK case 59: YY_RULE_SETUP -#line 134 "scan.l" +#line 135 "scan.l" { return K_RESUBSCRIBE; } YY_BREAK case 60: YY_RULE_SETUP -#line 135 "scan.l" +#line 136 "scan.l" { return K_SCRIPT; } YY_BREAK case 61: YY_RULE_SETUP -#line 136 "scan.l" +#line 137 "scan.l" { return K_SECONDS; } YY_BREAK case 62: YY_RULE_SETUP -#line 137 "scan.l" +#line 138 "scan.l" { return K_SEQUENCE; } YY_BREAK case 63: YY_RULE_SETUP -#line 138 "scan.l" +#line 139 "scan.l" { return K_SEQUENCES; } YY_BREAK case 64: YY_RULE_SETUP -#line 139 "scan.l" +#line 140 "scan.l" { return K_SERVER; } YY_BREAK case 65: YY_RULE_SETUP -#line 140 "scan.l" +#line 141 "scan.l" { return K_SET; } YY_BREAK case 66: YY_RULE_SETUP -#line 141 "scan.l" +#line 142 "scan.l" { return K_SLEEP; } YY_BREAK case 67: YY_RULE_SETUP -#line 142 "scan.l" +#line 143 "scan.l" { return K_SQL; } YY_BREAK case 68: YY_RULE_SETUP -#line 143 "scan.l" +#line 144 "scan.l" { return K_STORE; } YY_BREAK case 69: YY_RULE_SETUP -#line 144 "scan.l" +#line 145 "scan.l" { return K_SUBSCRIBE; } YY_BREAK case 70: YY_RULE_SETUP -#line 145 "scan.l" +#line 146 "scan.l" { return K_SUCCESS; } YY_BREAK case 71: YY_RULE_SETUP -#line 146 "scan.l" +#line 147 "scan.l" { return K_SWITCH; } YY_BREAK case 72: YY_RULE_SETUP -#line 147 "scan.l" +#line 148 "scan.l" { return K_SYNC; } YY_BREAK case 73: YY_RULE_SETUP -#line 148 "scan.l" +#line 149 "scan.l" { return K_TABLE; } YY_BREAK case 74: YY_RULE_SETUP -#line 149 "scan.l" +#line 150 "scan.l" { return K_TABLES; } YY_BREAK case 75: YY_RULE_SETUP -#line 150 "scan.l" +#line 151 "scan.l" { return K_TIMEOUT; } YY_BREAK case 76: YY_RULE_SETUP -#line 151 "scan.l" +#line 152 "scan.l" { return K_TRUE; } YY_BREAK case 77: YY_RULE_SETUP -#line 152 "scan.l" +#line 153 "scan.l" { return K_TRY; } YY_BREAK case 78: YY_RULE_SETUP -#line 153 "scan.l" +#line 154 "scan.l" { return K_UNINSTALL; } YY_BREAK case 79: YY_RULE_SETUP -#line 154 "scan.l" +#line 155 "scan.l" { return K_UNLOCK; } YY_BREAK case 80: YY_RULE_SETUP -#line 155 "scan.l" +#line 156 "scan.l" { return K_UNSUBSCRIBE; } YY_BREAK case 81: YY_RULE_SETUP -#line 156 "scan.l" +#line 157 "scan.l" { return K_UPDATE; } YY_BREAK case 82: YY_RULE_SETUP -#line 157 "scan.l" +#line 158 "scan.l" { return K_WAIT; } YY_BREAK case 83: YY_RULE_SETUP -#line 158 "scan.l" +#line 159 "scan.l" { return K_YES; } YY_BREAK case 84: YY_RULE_SETUP -#line 159 "scan.l" +#line 160 "scan.l" { return T_NUMBER; } YY_BREAK case 85: YY_RULE_SETUP -#line 160 "scan.l" +#line 161 "scan.l" { return T_IDENT; } YY_BREAK case 86: /* rule 86 can match eol */ YY_RULE_SETUP -#line 162 "scan.l" +#line 163 "scan.l" ; YY_BREAK case 87: YY_RULE_SETUP -#line 164 "scan.l" +#line 165 "scan.l" { if( instring_buffer==NULL ) { @@ -1622,7 +1609,7 @@ YY_BREAK case 88: YY_RULE_SETUP -#line 181 "scan.l" +#line 182 "scan.l" { if ( instring_buf_length < instring_length + yyleng+1 ) { @@ -1637,7 +1624,7 @@ case 89: /* rule 89 can match eol */ YY_RULE_SETUP -#line 191 "scan.l" +#line 192 "scan.l" { if ( instring_buf_length < instring_length + yyleng+1 ) { @@ -1652,7 +1639,7 @@ YY_BREAK case 90: YY_RULE_SETUP -#line 202 "scan.l" +#line 203 "scan.l" { instring_buffer[instring_length]='\0'; yytext = instring_buffer; @@ -1665,26 +1652,26 @@ case 91: /* rule 91 can match eol */ YY_RULE_SETUP -#line 210 "scan.l" +#line 211 "scan.l" { addSymbol( yytext ); BEGIN(INITIAL); } YY_BREAK case 92: YY_RULE_SETUP -#line 212 "scan.l" +#line 213 "scan.l" { char * value = getSymbol( yytext ); if( value ) { pushBuffer( strdup( current_file )); - yy_scan_string(value ); + yy_scan_string( value ); } } YY_BREAK case 93: /* rule 93 can match eol */ YY_RULE_SETUP -#line 222 "scan.l" +#line 223 "scan.l" { char * fileName = strdup( yytext + 1 ); /* Skip '<' */ @@ -1699,7 +1686,7 @@ exit( 1 ); } - yy_switch_to_buffer(yy_create_buffer(yyin,YY_BUF_SIZE )); + yy_switch_to_buffer( yy_create_buffer( yyin, YY_BUF_SIZE )); BEGIN(INITIAL); } @@ -1708,7 +1695,7 @@ case YY_STATE_EOF(incl): case YY_STATE_EOF(define): case YY_STATE_EOF(IN_STRING): -#line 241 "scan.l" +#line 242 "scan.l" { if( yy_buffer == NULL ) yyterminate(); @@ -1718,20 +1705,20 @@ YY_BREAK case 94: YY_RULE_SETUP -#line 248 "scan.l" +#line 249 "scan.l" ; YY_BREAK case 95: YY_RULE_SETUP -#line 250 "scan.l" +#line 251 "scan.l" { return yytext[0]; } YY_BREAK case 96: YY_RULE_SETUP -#line 252 "scan.l" +#line 253 "scan.l" ECHO; YY_BREAK -#line 1735 "scan.c" +#line 1722 "scan.c" case YY_END_OF_BUFFER: { @@ -1807,7 +1794,7 @@ { (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap( ) ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -1872,9 +1859,9 @@ */ static int yy_get_next_buffer (void) { - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = (yytext_ptr); + int number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -1903,7 +1890,7 @@ /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -1930,7 +1917,7 @@ if ( b->yy_is_our_buffer ) { - yy_size_t new_size = b->yy_buf_size * 2; + int new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1939,11 +1926,12 @@ b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) ); } else /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; + b->yy_ch_buf = NULL; if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( @@ -1971,7 +1959,7 @@ if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); + yyrestart( yyin ); } else @@ -1985,12 +1973,15 @@ else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } (yy_n_chars) += number_to_move; @@ -2006,14 +1997,14 @@ static yy_state_type yy_get_previous_state (void) { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; yy_current_state = (yy_start); for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -2023,9 +2014,9 @@ { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 387 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; } return yy_current_state; @@ -2038,10 +2029,10 @@ */ static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) { - register int yy_is_jam; - register char *yy_cp = (yy_c_buf_p); + int yy_is_jam; + char *yy_cp = (yy_c_buf_p); - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -2051,14 +2042,18 @@ { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 387 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; yy_is_jam = (yy_current_state == 386); return yy_is_jam ? 0 : yy_current_state; } +#ifndef YY_NO_UNPUT + +#endif + #ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput (void) @@ -2083,7 +2078,7 @@ else { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (int) ((yy_c_buf_p) - (yytext_ptr)); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -2100,14 +2095,14 @@ */ /* Reset buffer status. */ - yyrestart(yyin ); + yyrestart( yyin ); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap( ) ) - return EOF; + if ( yywrap( ) ) + return 0; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -2130,7 +2125,7 @@ (yy_hold_char) = *++(yy_c_buf_p); if ( c == '\n' ) - + yylineno++; ; @@ -2149,11 +2144,11 @@ if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file ); + yy_load_buffer_state( ); } /** Switch to a different input buffer. @@ -2181,7 +2176,7 @@ } YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag @@ -2209,7 +2204,7 @@ { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -2218,13 +2213,13 @@ /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer(b,file ); + yy_init_buffer( b, file ); return b; } @@ -2243,9 +2238,9 @@ YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); + yyfree( (void *) b->yy_ch_buf ); - yyfree((void *) b ); + yyfree( (void *) b ); } /* Initializes or reinitializes a buffer. @@ -2257,7 +2252,7 @@ { int oerrno = errno; - yy_flush_buffer(b ); + yy_flush_buffer( b ); b->yy_input_file = file; b->yy_fill_buffer = 1; @@ -2300,7 +2295,7 @@ b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); + yy_load_buffer_state( ); } /** Pushes the new state onto the stack. The new state becomes @@ -2331,7 +2326,7 @@ YY_CURRENT_BUFFER_LVALUE = new_buffer; /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } @@ -2350,7 +2345,7 @@ --(yy_buffer_stack_top); if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } } @@ -2368,15 +2363,15 @@ * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - num_to_alloc = 1; + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -2385,7 +2380,7 @@ if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; + yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = (yy_buffer_stack_max) + grow_size; (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc @@ -2405,7 +2400,7 @@ * @param base the character buffer * @param size the size in bytes of the character buffer * - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { @@ -2415,23 +2410,23 @@ base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ - return 0; + return NULL; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; - b->yy_input_file = 0; + b->yy_input_file = NULL; b->yy_n_chars = b->yy_buf_size; b->yy_is_interactive = 0; b->yy_at_bol = 1; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer(b ); + yy_switch_to_buffer( b ); return b; } @@ -2444,10 +2439,10 @@ * @note If you want to scan bytes that may contain NUL values, then use * yy_scan_bytes() instead. */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) +YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return yy_scan_bytes(yystr,strlen(yystr) ); + return yy_scan_bytes( yystr, (int) strlen(yystr) ); } /** Setup the input buffer state to scan the given bytes. The next call to yylex() will @@ -2457,16 +2452,16 @@ * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; yy_size_t n; - yy_size_t i; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) yyalloc(n ); + n = (yy_size_t) (_yybytes_len + 2); + buf = (char *) yyalloc( n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -2475,7 +2470,7 @@ buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer(buf,n ); + b = yy_scan_buffer( buf, n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -2491,9 +2486,9 @@ #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (const char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -2521,7 +2516,7 @@ */ int yyget_lineno (void) { - + return yylineno; } @@ -2544,7 +2539,7 @@ /** Get the length of the current token. * */ -yy_size_t yyget_leng (void) +int yyget_leng (void) { return yyleng; } @@ -2559,29 +2554,29 @@ } /** Set the current line number. - * @param line_number + * @param _line_number line number * */ -void yyset_lineno (int line_number ) +void yyset_lineno (int _line_number ) { - yylineno = line_number; + yylineno = _line_number; } /** Set the input stream. This does not discard the current * input buffer. - * @param in_str A readable stream. + * @param _in_str A readable stream. * * @see yy_switch_to_buffer */ -void yyset_in (FILE * in_str ) +void yyset_in (FILE * _in_str ) { - yyin = in_str ; + yyin = _in_str ; } -void yyset_out (FILE * out_str ) +void yyset_out (FILE * _out_str ) { - yyout = out_str ; + yyout = _out_str ; } int yyget_debug (void) @@ -2589,9 +2584,9 @@ return yy_flex_debug; } -void yyset_debug (int bdebug ) +void yyset_debug (int _bdebug ) { - yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } static int yy_init_globals (void) @@ -2603,10 +2598,10 @@ /* We do not touch yylineno unless the option is enabled. */ yylineno = 1; - (yy_buffer_stack) = 0; + (yy_buffer_stack) = NULL; (yy_buffer_stack_top) = 0; (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char *) 0; + (yy_c_buf_p) = NULL; (yy_init) = 0; (yy_start) = 0; @@ -2615,8 +2610,8 @@ yyin = stdin; yyout = stdout; #else - yyin = (FILE *) 0; - yyout = (FILE *) 0; + yyin = NULL; + yyout = NULL; #endif /* For future reference: Set errno on error, since we are called by @@ -2631,7 +2626,7 @@ /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); + yy_delete_buffer( YY_CURRENT_BUFFER ); YY_CURRENT_BUFFER_LVALUE = NULL; yypop_buffer_state(); } @@ -2652,18 +2647,19 @@ */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +static void yy_flex_strncpy (char* s1, const char * s2, int n ) { - register int i; + + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) +static int yy_flex_strlen (const char * s ) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -2673,11 +2669,12 @@ void *yyalloc (yy_size_t size ) { - return (void *) malloc( size ); + return malloc(size); } void *yyrealloc (void * ptr, yy_size_t size ) { + /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -2685,18 +2682,17 @@ * any pointer type to void*, and deal with argument conversions * as though doing an assignment. */ - return (void *) realloc( (char *) ptr, size ); + return realloc(ptr, size); } void yyfree (void * ptr ) { - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" -#line 251 "scan.l" - +#line 253 "scan.l" void @@ -2744,8 +2740,8 @@ if( yyin != NULL ) fclose( yyin ); - yy_delete_buffer(YY_CURRENT_BUFFER ); - yy_switch_to_buffer(yy_buffer->buffer ); + yy_delete_buffer( YY_CURRENT_BUFFER ); + yy_switch_to_buffer( yy_buffer->buffer ); free( current_file ); diff -Nru slony1-2-2.2.8/src/slonik/scan.h slony1-2-2.2.10/src/slonik/scan.h --- slony1-2-2.2.8/src/slonik/scan.h 2019-08-27 03:14:36.000000000 +0000 +++ slony1-2-2.2.10/src/slonik/scan.h 2020-12-05 02:10:40.000000000 +0000 @@ -12,8 +12,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 39 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -88,29 +88,23 @@ #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ +/* begin standard C++ headers. */ -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* Size of default input buffer. */ @@ -136,7 +130,7 @@ typedef size_t yy_size_t; #endif -extern yy_size_t yyleng; +extern int yyleng; extern FILE *yyin, *yyout; @@ -152,12 +146,12 @@ /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -180,7 +174,7 @@ int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -191,30 +185,33 @@ }; #endif /* !YY_STRUCT_YY_BUFFER_STATE */ -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); - -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); - -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); +void yyrestart ( FILE *input_file ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); +void yy_delete_buffer ( YY_BUFFER_STATE b ); +void yy_flush_buffer ( YY_BUFFER_STATE b ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state ( void ); + +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); + +void *yyalloc ( yy_size_t ); +void *yyrealloc ( void *, yy_size_t ); +void yyfree ( void * ); /* Begin user sect3 */ -#define yywrap() 1 +#define yywrap() (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP extern int yylineno; extern char *yytext; +#ifdef yytext_ptr +#undef yytext_ptr +#endif #define yytext_ptr yytext #ifdef YY_HEADER_EXPORT_START_CONDITIONS @@ -240,31 +237,31 @@ /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy (void ); +int yylex_destroy ( void ); -int yyget_debug (void ); +int yyget_debug ( void ); -void yyset_debug (int debug_flag ); +void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra (void ); +YY_EXTRA_TYPE yyget_extra ( void ); -void yyset_extra (YY_EXTRA_TYPE user_defined ); +void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in (void ); +FILE *yyget_in ( void ); -void yyset_in (FILE * in_str ); +void yyset_in ( FILE * _in_str ); -FILE *yyget_out (void ); +FILE *yyget_out ( void ); -void yyset_out (FILE * out_str ); +void yyset_out ( FILE * _out_str ); -yy_size_t yyget_leng (void ); + int yyget_leng ( void ); -char *yyget_text (void ); +char *yyget_text ( void ); -int yyget_lineno (void ); +int yyget_lineno ( void ); -void yyset_lineno (int line_number ); +void yyset_lineno ( int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -272,18 +269,18 @@ #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (void ); +extern "C" int yywrap ( void ); #else -extern int yywrap (void ); +extern int yywrap ( void ); #endif #endif #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy ( char *, const char *, int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen ( const char * ); #endif #ifndef YY_NO_INPUT @@ -330,9 +327,154 @@ #undef YY_DECL #endif -#line 251 "scan.l" +#ifndef yy_create_buffer_ALREADY_DEFINED +#undef yy_create_buffer +#endif +#ifndef yy_delete_buffer_ALREADY_DEFINED +#undef yy_delete_buffer +#endif +#ifndef yy_scan_buffer_ALREADY_DEFINED +#undef yy_scan_buffer +#endif +#ifndef yy_scan_string_ALREADY_DEFINED +#undef yy_scan_string +#endif +#ifndef yy_scan_bytes_ALREADY_DEFINED +#undef yy_scan_bytes +#endif +#ifndef yy_init_buffer_ALREADY_DEFINED +#undef yy_init_buffer +#endif +#ifndef yy_flush_buffer_ALREADY_DEFINED +#undef yy_flush_buffer +#endif +#ifndef yy_load_buffer_state_ALREADY_DEFINED +#undef yy_load_buffer_state +#endif +#ifndef yy_switch_to_buffer_ALREADY_DEFINED +#undef yy_switch_to_buffer +#endif +#ifndef yypush_buffer_state_ALREADY_DEFINED +#undef yypush_buffer_state +#endif +#ifndef yypop_buffer_state_ALREADY_DEFINED +#undef yypop_buffer_state +#endif +#ifndef yyensure_buffer_stack_ALREADY_DEFINED +#undef yyensure_buffer_stack +#endif +#ifndef yylex_ALREADY_DEFINED +#undef yylex +#endif +#ifndef yyrestart_ALREADY_DEFINED +#undef yyrestart +#endif +#ifndef yylex_init_ALREADY_DEFINED +#undef yylex_init +#endif +#ifndef yylex_init_extra_ALREADY_DEFINED +#undef yylex_init_extra +#endif +#ifndef yylex_destroy_ALREADY_DEFINED +#undef yylex_destroy +#endif +#ifndef yyget_debug_ALREADY_DEFINED +#undef yyget_debug +#endif +#ifndef yyset_debug_ALREADY_DEFINED +#undef yyset_debug +#endif +#ifndef yyget_extra_ALREADY_DEFINED +#undef yyget_extra +#endif +#ifndef yyset_extra_ALREADY_DEFINED +#undef yyset_extra +#endif +#ifndef yyget_in_ALREADY_DEFINED +#undef yyget_in +#endif +#ifndef yyset_in_ALREADY_DEFINED +#undef yyset_in +#endif +#ifndef yyget_out_ALREADY_DEFINED +#undef yyget_out +#endif +#ifndef yyset_out_ALREADY_DEFINED +#undef yyset_out +#endif +#ifndef yyget_leng_ALREADY_DEFINED +#undef yyget_leng +#endif +#ifndef yyget_text_ALREADY_DEFINED +#undef yyget_text +#endif +#ifndef yyget_lineno_ALREADY_DEFINED +#undef yyget_lineno +#endif +#ifndef yyset_lineno_ALREADY_DEFINED +#undef yyset_lineno +#endif +#ifndef yyget_column_ALREADY_DEFINED +#undef yyget_column +#endif +#ifndef yyset_column_ALREADY_DEFINED +#undef yyset_column +#endif +#ifndef yywrap_ALREADY_DEFINED +#undef yywrap +#endif +#ifndef yyget_lval_ALREADY_DEFINED +#undef yyget_lval +#endif +#ifndef yyset_lval_ALREADY_DEFINED +#undef yyset_lval +#endif +#ifndef yyget_lloc_ALREADY_DEFINED +#undef yyget_lloc +#endif +#ifndef yyset_lloc_ALREADY_DEFINED +#undef yyset_lloc +#endif +#ifndef yyalloc_ALREADY_DEFINED +#undef yyalloc +#endif +#ifndef yyrealloc_ALREADY_DEFINED +#undef yyrealloc +#endif +#ifndef yyfree_ALREADY_DEFINED +#undef yyfree +#endif +#ifndef yytext_ALREADY_DEFINED +#undef yytext +#endif +#ifndef yyleng_ALREADY_DEFINED +#undef yyleng +#endif +#ifndef yyin_ALREADY_DEFINED +#undef yyin +#endif +#ifndef yyout_ALREADY_DEFINED +#undef yyout +#endif +#ifndef yy_flex_debug_ALREADY_DEFINED +#undef yy_flex_debug +#endif +#ifndef yylineno_ALREADY_DEFINED +#undef yylineno +#endif +#ifndef yytables_fload_ALREADY_DEFINED +#undef yytables_fload +#endif +#ifndef yytables_destroy_ALREADY_DEFINED +#undef yytables_destroy +#endif +#ifndef yyTABLES_NAME_ALREADY_DEFINED +#undef yyTABLES_NAME +#endif + +#line 253 "scan.l" -#line 337 "scan.h" +#line 479 "scan.h" #undef yyIN_HEADER #endif /* yyHEADER_H */ diff -Nru slony1-2-2.2.8/src/slonik/slonik.c slony1-2-2.2.10/src/slonik/slonik.c --- slony1-2-2.2.8/src/slonik/slonik.c 2019-08-27 01:24:54.000000000 +0000 +++ slony1-2-2.2.10/src/slonik/slonik.c 2020-12-05 02:07:59.000000000 +0000 @@ -2089,15 +2089,15 @@ use_major = 8; use_minor = 4; } - else if ((adminfo->pg_version >= 90000) && (adminfo->pg_version < 120000)) /* 12 */ + else if ((adminfo->pg_version >= 90000) && (adminfo->pg_version < 140000)) /* 13 */ { /** - * 9.0 through 12 are so far just like 8.4 + * 9.0 through 13 are so far just like 8.4 **/ use_major = 8; use_minor = 4; } - else /* above 12 */ + else /* above 13 */ { use_major = 8; use_minor = 4; @@ -2178,7 +2178,7 @@ use_major = 8; use_minor = 4; } - else if ((adminfo->pg_version >= 90000) && (adminfo->pg_version < 120000)) /* 9.0, 9.1, 9.2 */ + else if ((adminfo->pg_version >= 90000) && (adminfo->pg_version < 140000)) /* 9.0, 9.1, 9.2 */ { /** * 9.0 and 9.1 and 9.2 and 9.3,9.4 are so far just like 8.4 diff -Nru slony1-2-2.2.8/src/slonik/y.tab.h slony1-2-2.2.10/src/slonik/y.tab.h --- slony1-2-2.2.8/src/slonik/y.tab.h 2019-08-27 03:14:36.000000000 +0000 +++ slony1-2-2.2.10/src/slonik/y.tab.h 2020-12-05 02:10:40.000000000 +0000 @@ -1,8 +1,9 @@ -/* A Bison parser, made by GNU Bison 3.0.2. */ +/* A Bison parser, made by GNU Bison 3.3.2. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation, + Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,6 +31,9 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ +/* Undocumented macros, especially those whose name start with YY_, + are private implementation details. Do not rely on them. */ + #ifndef YY_YY_Y_TAB_H_INCLUDED # define YY_YY_Y_TAB_H_INCLUDED /* Debug traces. */ @@ -219,10 +223,10 @@ /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE YYSTYPE; + union YYSTYPE { -#line 54 "parser.y" /* yacc.c:1909 */ +#line 54 "parser.y" /* yacc.c:1921 */ int32 ival; char *str; @@ -231,8 +235,10 @@ SlonikStmt *statement; failed_node_entry * failed_node_entry; -#line 235 "y.tab.h" /* yacc.c:1909 */ +#line 239 "y.tab.h" /* yacc.c:1921 */ }; + +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 #endif diff -Nru slony1-2-2.2.8/src/slony_logshipper/parser.c slony1-2-2.2.10/src/slony_logshipper/parser.c --- slony1-2-2.2.8/src/slony_logshipper/parser.c 2019-08-27 03:14:38.000000000 +0000 +++ slony1-2-2.2.10/src/slony_logshipper/parser.c 2020-12-05 02:10:42.000000000 +0000 @@ -1,8 +1,9 @@ -/* A Bison parser, made by GNU Bison 3.0.2. */ +/* A Bison parser, made by GNU Bison 3.3.2. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation, + Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -40,11 +41,14 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ +/* Undocumented macros, especially those whose name start with YY_, + are private implementation details. Do not rely on them. */ + /* Identify Bison output. */ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "3.0.2" +#define YYBISON_VERSION "3.3.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -61,8 +65,8 @@ -/* Copy the first part of user declarations. */ -#line 1 "parser.y" /* yacc.c:339 */ +/* First part of user prologue. */ +#line 1 "parser.y" /* yacc.c:337 */ /* * @@ -96,13 +100,16 @@ -#line 100 "y.tab.c" /* yacc.c:339 */ - +#line 104 "y.tab.c" /* yacc.c:337 */ # ifndef YY_NULLPTR -# if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULLPTR nullptr +# if defined __cplusplus +# if 201103L <= __cplusplus +# define YY_NULLPTR nullptr +# else +# define YY_NULLPTR 0 +# endif # else -# define YY_NULLPTR 0 +# define YY_NULLPTR ((void*)0) # endif # endif @@ -251,10 +258,10 @@ /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE YYSTYPE; + union YYSTYPE { -#line 38 "parser.y" /* yacc.c:355 */ +#line 38 "parser.y" /* yacc.c:352 */ int32 ival; char *str; @@ -262,8 +269,10 @@ AttElemList *att_elem_list; SlonDString *dstring; -#line 266 "y.tab.c" /* yacc.c:355 */ +#line 273 "y.tab.c" /* yacc.c:352 */ }; + +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 #endif @@ -275,9 +284,7 @@ #endif /* !YY_YY_Y_TAB_H_INCLUDED */ -/* Copy the second part of user declarations. */ -#line 281 "y.tab.c" /* yacc.c:358 */ #ifdef short # undef short @@ -298,13 +305,13 @@ #ifdef YYTYPE_UINT16 typedef YYTYPE_UINT16 yytype_uint16; #else -typedef unsigned short int yytype_uint16; +typedef unsigned short yytype_uint16; #endif #ifdef YYTYPE_INT16 typedef YYTYPE_INT16 yytype_int16; #else -typedef short int yytype_int16; +typedef short yytype_int16; #endif #ifndef YYSIZE_T @@ -316,7 +323,7 @@ # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else -# define YYSIZE_T unsigned int +# define YYSIZE_T unsigned # endif #endif @@ -352,15 +359,6 @@ # define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) #endif -#if !defined _Noreturn \ - && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) -# if defined _MSC_VER && 1200 <= _MSC_VER -# define _Noreturn __declspec (noreturn) -# else -# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) -# endif -#endif - /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ # define YYUSE(E) ((void) (E)) @@ -368,7 +366,7 @@ # define YYUSE(E) /* empty */ #endif -#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ /* Suppress an incorrect diagnostic about yylval being uninitialized. */ # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ _Pragma ("GCC diagnostic push") \ @@ -530,16 +528,16 @@ /* YYNSTATES -- Number of states. */ #define YYNSTATES 296 -/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned - by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 #define YYMAXUTOK 314 +/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, with out-of-bounds checking. */ #define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM - as returned by yylex, without out-of-bounds checking. */ + as returned by yylex. */ static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -904,22 +902,22 @@ #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (yylen); \ - yystate = *yyssp; \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (0) +#define YYBACKUP(Token, Value) \ + do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ + while (0) /* Error token number */ #define YYTERROR 1 @@ -959,37 +957,37 @@ } while (0) -/*----------------------------------------. -| Print this symbol's value on YYOUTPUT. | -`----------------------------------------*/ +/*-----------------------------------. +| Print this symbol's value on YYO. | +`-----------------------------------*/ static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep) { - FILE *yyo = yyoutput; - YYUSE (yyo); + FILE *yyoutput = yyo; + YYUSE (yyoutput); if (!yyvaluep) return; # ifdef YYPRINT if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); + YYPRINT (yyo, yytoknum[yytype], *yyvaluep); # endif YYUSE (yytype); } -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +/*---------------------------. +| Print this symbol on YYO. | +`---------------------------*/ static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep) { - YYFPRINTF (yyoutput, "%s %s (", + YYFPRINTF (yyo, "%s %s (", yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); - yy_symbol_value_print (yyoutput, yytype, yyvaluep); - YYFPRINTF (yyoutput, ")"); + yy_symbol_value_print (yyo, yytype, yyvaluep); + YYFPRINTF (yyo, ")"); } /*------------------------------------------------------------------. @@ -1023,7 +1021,7 @@ static void yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) { - unsigned long int yylno = yyrline[yyrule]; + unsigned long yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", @@ -1034,7 +1032,7 @@ YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yystos[yyssp[yyi + 1 - yynrhs]], - &(yyvsp[(yyi + 1) - (yynrhs)]) + &yyvsp[(yyi + 1) - (yynrhs)] ); YYFPRINTF (stderr, "\n"); } @@ -1138,7 +1136,10 @@ case '\\': if (*++yyp != '\\') goto do_not_strip_quotes; - /* Fall through. */ + else + goto append; + + append: default: if (yyres) yyres[yyn] = *yyp; @@ -1156,7 +1157,7 @@ if (! yyres) return yystrlen (yystr); - return yystpcpy (yyres, yystr) - yyres; + return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres); } # endif @@ -1234,10 +1235,10 @@ yyarg[yycount++] = yytname[yyx]; { YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) + yysize = yysize1; + else return 2; - yysize = yysize1; } } } @@ -1249,6 +1250,7 @@ case N: \ yyformat = S; \ break + default: /* Avoid compiler warnings. */ YYCASE_(0, YY_("syntax error")); YYCASE_(1, YY_("syntax error, unexpected %s")); YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); @@ -1260,9 +1262,10 @@ { YYSIZE_T yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) + yysize = yysize1; + else return 2; - yysize = yysize1; } if (*yymsg_alloc < yysize) @@ -1388,23 +1391,31 @@ yychar = YYEMPTY; /* Cause a token to be read. */ goto yysetstate; + /*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | +| yynewstate -- push a new state, which is found in yystate. | `------------------------------------------------------------*/ - yynewstate: +yynewstate: /* In all cases, when you get here, the value and location stacks have just been pushed. So pushing a state here evens the stacks. */ yyssp++; - yysetstate: - *yyssp = yystate; + +/*--------------------------------------------------------------------. +| yynewstate -- set current state (the top of the stack) to yystate. | +`--------------------------------------------------------------------*/ +yysetstate: + *yyssp = (yytype_int16) yystate; if (yyss + yystacksize - 1 <= yyssp) +#if !defined yyoverflow && !defined YYSTACK_RELOCATE + goto yyexhaustedlab; +#else { /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; + YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1); -#ifdef yyoverflow +# if defined yyoverflow { /* Give user a chance to reallocate the stack. Use copies of these so that the &'s don't force the real ones into @@ -1420,14 +1431,10 @@ &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), &yystacksize); - yyss = yyss1; yyvs = yyvs1; } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else +# else /* defined YYSTACK_RELOCATE */ /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) goto yyexhaustedlab; @@ -1443,22 +1450,22 @@ goto yyexhaustedlab; YYSTACK_RELOCATE (yyss_alloc, yyss); YYSTACK_RELOCATE (yyvs_alloc, yyvs); -# undef YYSTACK_RELOCATE +# undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); } # endif -#endif /* no yyoverflow */ yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) YYABORT; } +#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ YYDPRINTF ((stderr, "Entering state %d\n", yystate)); @@ -1467,11 +1474,11 @@ goto yybackup; + /*-----------. | yybackup. | `-----------*/ yybackup: - /* Do appropriate processing given the current state. Read a lookahead token if we need one and don't already have one. */ @@ -1544,7 +1551,7 @@ /*-----------------------------. -| yyreduce -- Do a reduction. | +| yyreduce -- do a reduction. | `-----------------------------*/ yyreduce: /* yyn is the number of a rule to reduce with. */ @@ -1565,70 +1572,70 @@ switch (yyn) { case 18: -#line 164 "parser.y" /* yacc.c:1646 */ +#line 164 "parser.y" /* yacc.c:1652 */ { if (archive_dir != NULL) parse_error("duplicate archive dir specification"); else archive_dir = strdup((yyvsp[-1].str)); } -#line 1576 "y.tab.c" /* yacc.c:1646 */ +#line 1583 "y.tab.c" /* yacc.c:1652 */ break; case 19: -#line 173 "parser.y" /* yacc.c:1646 */ +#line 173 "parser.y" /* yacc.c:1652 */ { if (destination_dir != NULL) parse_error("duplicate destination dir specification"); else destination_dir = strdup((yyvsp[-1].str)); } -#line 1587 "y.tab.c" /* yacc.c:1646 */ +#line 1594 "y.tab.c" /* yacc.c:1652 */ break; case 20: -#line 182 "parser.y" /* yacc.c:1646 */ +#line 182 "parser.y" /* yacc.c:1652 */ { if (destination_conninfo != NULL) parse_error("duplicate destination database specification"); else destination_conninfo = strdup((yyvsp[-1].str)); } -#line 1598 "y.tab.c" /* yacc.c:1646 */ +#line 1605 "y.tab.c" /* yacc.c:1652 */ break; case 21: -#line 191 "parser.y" /* yacc.c:1646 */ +#line 191 "parser.y" /* yacc.c:1652 */ { if (logfile_path != NULL) parse_error("duplicate logfile path specification"); else logfile_path = strdup((yyvsp[-1].str)); } -#line 1609 "y.tab.c" /* yacc.c:1646 */ +#line 1616 "y.tab.c" /* yacc.c:1652 */ break; case 22: -#line 200 "parser.y" /* yacc.c:1646 */ +#line 200 "parser.y" /* yacc.c:1652 */ { max_archives = (yyvsp[-1].ival); } -#line 1617 "y.tab.c" /* yacc.c:1646 */ +#line 1624 "y.tab.c" /* yacc.c:1652 */ break; case 23: -#line 206 "parser.y" /* yacc.c:1646 */ +#line 206 "parser.y" /* yacc.c:1652 */ { if (cluster_name != NULL) parse_error("duplicate cluster name specification"); else cluster_name = strdup((yyvsp[-1].str)); } -#line 1628 "y.tab.c" /* yacc.c:1646 */ +#line 1635 "y.tab.c" /* yacc.c:1652 */ break; case 24: -#line 215 "parser.y" /* yacc.c:1646 */ +#line 215 "parser.y" /* yacc.c:1652 */ { RenameObject *new; @@ -1639,11 +1646,11 @@ config_add_rename(new); } -#line 1643 "y.tab.c" /* yacc.c:1646 */ +#line 1650 "y.tab.c" /* yacc.c:1652 */ break; case 25: -#line 226 "parser.y" /* yacc.c:1646 */ +#line 226 "parser.y" /* yacc.c:1652 */ { RenameObject *new; @@ -1655,11 +1662,11 @@ config_add_rename(new); } -#line 1659 "y.tab.c" /* yacc.c:1646 */ +#line 1666 "y.tab.c" /* yacc.c:1652 */ break; case 26: -#line 238 "parser.y" /* yacc.c:1646 */ +#line 238 "parser.y" /* yacc.c:1652 */ { RenameObject *new; @@ -1671,11 +1678,11 @@ config_add_rename(new); } -#line 1675 "y.tab.c" /* yacc.c:1646 */ +#line 1682 "y.tab.c" /* yacc.c:1652 */ break; case 27: -#line 250 "parser.y" /* yacc.c:1646 */ +#line 250 "parser.y" /* yacc.c:1652 */ { RenameObject *new; @@ -1689,11 +1696,11 @@ config_add_rename(new); } -#line 1693 "y.tab.c" /* yacc.c:1646 */ +#line 1700 "y.tab.c" /* yacc.c:1652 */ break; case 28: -#line 266 "parser.y" /* yacc.c:1646 */ +#line 266 "parser.y" /* yacc.c:1652 */ { ProcessingCommand **pptr; @@ -1705,11 +1712,11 @@ (*pptr)->command = (yyvsp[-1].str); (*pptr)->next = NULL; } -#line 1709 "y.tab.c" /* yacc.c:1646 */ +#line 1716 "y.tab.c" /* yacc.c:1652 */ break; case 29: -#line 280 "parser.y" /* yacc.c:1646 */ +#line 280 "parser.y" /* yacc.c:1652 */ { ProcessingCommand **pptr; @@ -1721,11 +1728,11 @@ (*pptr)->command = (yyvsp[-1].str); (*pptr)->next = NULL; } -#line 1725 "y.tab.c" /* yacc.c:1646 */ +#line 1732 "y.tab.c" /* yacc.c:1652 */ break; case 30: -#line 294 "parser.y" /* yacc.c:1646 */ +#line 294 "parser.y" /* yacc.c:1652 */ { ProcessingCommand **pptr; @@ -1737,30 +1744,30 @@ (*pptr)->command = (yyvsp[-1].str); (*pptr)->next = NULL; } -#line 1741 "y.tab.c" /* yacc.c:1646 */ +#line 1748 "y.tab.c" /* yacc.c:1652 */ break; case 33: -#line 325 "parser.y" /* yacc.c:1646 */ +#line 325 "parser.y" /* yacc.c:1652 */ { if (process_simple_sql( "set session_replication_role to replica;") < 0) YYABORT; } -#line 1751 "y.tab.c" /* yacc.c:1646 */ +#line 1758 "y.tab.c" /* yacc.c:1652 */ break; case 34: -#line 333 "parser.y" /* yacc.c:1646 */ +#line 333 "parser.y" /* yacc.c:1652 */ { if (process_start_transaction("start transaction;") < 0) YYABORT; } -#line 1760 "y.tab.c" /* yacc.c:1646 */ +#line 1767 "y.tab.c" /* yacc.c:1652 */ break; case 35: -#line 340 "parser.y" /* yacc.c:1646 */ +#line 340 "parser.y" /* yacc.c:1652 */ { SlonDString ds; int rc; @@ -1793,11 +1800,11 @@ else dstring_free(&ds); } -#line 1797 "y.tab.c" /* yacc.c:1646 */ +#line 1804 "y.tab.c" /* yacc.c:1652 */ break; case 36: -#line 374 "parser.y" /* yacc.c:1646 */ +#line 374 "parser.y" /* yacc.c:1652 */ { char *ret; size_t toklen=yyget_leng(); @@ -1807,20 +1814,20 @@ (yyval.str) = ret; } -#line 1811 "y.tab.c" /* yacc.c:1646 */ +#line 1818 "y.tab.c" /* yacc.c:1652 */ break; case 54: -#line 407 "parser.y" /* yacc.c:1646 */ +#line 407 "parser.y" /* yacc.c:1652 */ { if (process_end_transaction("commit;") < 0) YYABORT; } -#line 1820 "y.tab.c" /* yacc.c:1646 */ +#line 1827 "y.tab.c" /* yacc.c:1652 */ break; case 55: -#line 414 "parser.y" /* yacc.c:1646 */ +#line 414 "parser.y" /* yacc.c:1652 */ { InsertStmt stmt; AttElem *nelem; @@ -1859,11 +1866,11 @@ if (rc < 0) YYABORT; } -#line 1863 "y.tab.c" /* yacc.c:1646 */ +#line 1870 "y.tab.c" /* yacc.c:1652 */ break; case 56: -#line 455 "parser.y" /* yacc.c:1646 */ +#line 455 "parser.y" /* yacc.c:1652 */ { AttElemList *new; new = (AttElemList *)malloc(sizeof(AttElemList)); @@ -1877,11 +1884,11 @@ (yyval.att_elem_list) = new; } -#line 1881 "y.tab.c" /* yacc.c:1646 */ +#line 1888 "y.tab.c" /* yacc.c:1652 */ break; case 57: -#line 469 "parser.y" /* yacc.c:1646 */ +#line 469 "parser.y" /* yacc.c:1652 */ { AttElem *new; new = (AttElem *)malloc(sizeof(AttElem)); @@ -1895,11 +1902,11 @@ (yyval.att_elem_list) = (yyvsp[-2].att_elem_list); } -#line 1899 "y.tab.c" /* yacc.c:1646 */ +#line 1906 "y.tab.c" /* yacc.c:1652 */ break; case 58: -#line 485 "parser.y" /* yacc.c:1646 */ +#line 485 "parser.y" /* yacc.c:1652 */ { UpdateStmt stmt; AttElem *elem; @@ -1937,11 +1944,11 @@ if (rc < 0) YYABORT; } -#line 1941 "y.tab.c" /* yacc.c:1646 */ +#line 1948 "y.tab.c" /* yacc.c:1652 */ break; case 59: -#line 525 "parser.y" /* yacc.c:1646 */ +#line 525 "parser.y" /* yacc.c:1652 */ { AttElemList *new; new = (AttElemList *)malloc(sizeof(AttElemList)); @@ -1951,22 +1958,22 @@ (yyval.att_elem_list) = new; } -#line 1955 "y.tab.c" /* yacc.c:1646 */ +#line 1962 "y.tab.c" /* yacc.c:1652 */ break; case 60: -#line 535 "parser.y" /* yacc.c:1646 */ +#line 535 "parser.y" /* yacc.c:1652 */ { (yyvsp[-2].att_elem_list)->list_tail->next = (yyvsp[0].att_elem); (yyvsp[-2].att_elem_list)->list_tail = (yyvsp[0].att_elem); (yyval.att_elem_list) = (yyvsp[-2].att_elem_list); } -#line 1966 "y.tab.c" /* yacc.c:1646 */ +#line 1973 "y.tab.c" /* yacc.c:1652 */ break; case 61: -#line 543 "parser.y" /* yacc.c:1646 */ +#line 543 "parser.y" /* yacc.c:1652 */ { DeleteStmt stmt; AttElem *elem; @@ -1998,43 +2005,43 @@ if (rc < 0) YYABORT; } -#line 2002 "y.tab.c" /* yacc.c:1646 */ +#line 2009 "y.tab.c" /* yacc.c:1652 */ break; case 62: -#line 577 "parser.y" /* yacc.c:1646 */ +#line 577 "parser.y" /* yacc.c:1652 */ { (yyval.ival) = 1; } -#line 2010 "y.tab.c" /* yacc.c:1646 */ +#line 2017 "y.tab.c" /* yacc.c:1652 */ break; case 63: -#line 581 "parser.y" /* yacc.c:1646 */ +#line 581 "parser.y" /* yacc.c:1652 */ { (yyval.ival) = 0; } -#line 2018 "y.tab.c" /* yacc.c:1646 */ +#line 2025 "y.tab.c" /* yacc.c:1652 */ break; case 64: -#line 587 "parser.y" /* yacc.c:1646 */ +#line 587 "parser.y" /* yacc.c:1652 */ { (yyval.att_elem_list) = (yyvsp[0].att_elem_list); } -#line 2026 "y.tab.c" /* yacc.c:1646 */ +#line 2033 "y.tab.c" /* yacc.c:1652 */ break; case 65: -#line 591 "parser.y" /* yacc.c:1646 */ +#line 591 "parser.y" /* yacc.c:1652 */ { (yyval.att_elem_list) = NULL; } -#line 2034 "y.tab.c" /* yacc.c:1646 */ +#line 2041 "y.tab.c" /* yacc.c:1652 */ break; case 66: -#line 597 "parser.y" /* yacc.c:1646 */ +#line 597 "parser.y" /* yacc.c:1652 */ { TruncateStmt stmt; @@ -2043,11 +2050,11 @@ process_truncate(&stmt); } -#line 2047 "y.tab.c" /* yacc.c:1646 */ +#line 2054 "y.tab.c" /* yacc.c:1652 */ break; case 67: -#line 607 "parser.y" /* yacc.c:1646 */ +#line 607 "parser.y" /* yacc.c:1652 */ { CopyStmt stmt; AttElem *elem; @@ -2076,11 +2083,11 @@ if (rc < 0) YYABORT; } -#line 2080 "y.tab.c" /* yacc.c:1646 */ +#line 2087 "y.tab.c" /* yacc.c:1652 */ break; case 68: -#line 638 "parser.y" /* yacc.c:1646 */ +#line 638 "parser.y" /* yacc.c:1652 */ { int rc; @@ -2090,11 +2097,11 @@ if (rc < 0) YYABORT; } -#line 2094 "y.tab.c" /* yacc.c:1646 */ +#line 2101 "y.tab.c" /* yacc.c:1652 */ break; case 69: -#line 648 "parser.y" /* yacc.c:1646 */ +#line 648 "parser.y" /* yacc.c:1652 */ { int rc; @@ -2107,11 +2114,11 @@ if (rc < 0) YYABORT; } -#line 2111 "y.tab.c" /* yacc.c:1646 */ +#line 2118 "y.tab.c" /* yacc.c:1652 */ break; case 70: -#line 663 "parser.y" /* yacc.c:1646 */ +#line 663 "parser.y" /* yacc.c:1652 */ { SlonDString *new; @@ -2122,47 +2129,47 @@ (yyval.dstring) = new; } -#line 2126 "y.tab.c" /* yacc.c:1646 */ +#line 2133 "y.tab.c" /* yacc.c:1652 */ break; case 71: -#line 674 "parser.y" /* yacc.c:1646 */ +#line 674 "parser.y" /* yacc.c:1652 */ { dstring_append((yyvsp[-1].dstring), (yyvsp[0].str)); free((yyvsp[0].str)); (yyval.dstring) = (yyvsp[-1].dstring); } -#line 2137 "y.tab.c" /* yacc.c:1646 */ +#line 2144 "y.tab.c" /* yacc.c:1652 */ break; case 72: -#line 683 "parser.y" /* yacc.c:1646 */ +#line 683 "parser.y" /* yacc.c:1652 */ { (yyval.str) = strdup(yychunk); } -#line 2145 "y.tab.c" /* yacc.c:1646 */ +#line 2152 "y.tab.c" /* yacc.c:1652 */ break; case 73: -#line 689 "parser.y" /* yacc.c:1646 */ +#line 689 "parser.y" /* yacc.c:1652 */ { (yyval.str) = strdup(yychunk); } -#line 2153 "y.tab.c" /* yacc.c:1646 */ +#line 2160 "y.tab.c" /* yacc.c:1652 */ break; case 74: -#line 695 "parser.y" /* yacc.c:1646 */ +#line 695 "parser.y" /* yacc.c:1652 */ { if (process_copyend() < 0) YYABORT; } -#line 2162 "y.tab.c" /* yacc.c:1646 */ +#line 2169 "y.tab.c" /* yacc.c:1652 */ break; case 75: -#line 702 "parser.y" /* yacc.c:1646 */ +#line 702 "parser.y" /* yacc.c:1652 */ { AttElemList *new; new = (AttElemList *)malloc(sizeof(AttElemList)); @@ -2176,11 +2183,11 @@ (yyval.att_elem_list) = new; } -#line 2180 "y.tab.c" /* yacc.c:1646 */ +#line 2187 "y.tab.c" /* yacc.c:1652 */ break; case 76: -#line 716 "parser.y" /* yacc.c:1646 */ +#line 716 "parser.y" /* yacc.c:1652 */ { AttElem *new; new = (AttElem *)malloc(sizeof(AttElem)); @@ -2194,11 +2201,11 @@ (yyval.att_elem_list) = (yyvsp[-2].att_elem_list); } -#line 2198 "y.tab.c" /* yacc.c:1646 */ +#line 2205 "y.tab.c" /* yacc.c:1652 */ break; case 77: -#line 732 "parser.y" /* yacc.c:1646 */ +#line 732 "parser.y" /* yacc.c:1652 */ { AttElemList *new; new = (AttElemList *)malloc(sizeof(AttElemList)); @@ -2208,22 +2215,22 @@ (yyval.att_elem_list) = new; } -#line 2212 "y.tab.c" /* yacc.c:1646 */ +#line 2219 "y.tab.c" /* yacc.c:1652 */ break; case 78: -#line 742 "parser.y" /* yacc.c:1646 */ +#line 742 "parser.y" /* yacc.c:1652 */ { (yyvsp[-2].att_elem_list)->list_tail->next = (yyvsp[0].att_elem); (yyvsp[-2].att_elem_list)->list_tail = (yyvsp[0].att_elem); (yyval.att_elem_list) = (yyvsp[-2].att_elem_list); } -#line 2223 "y.tab.c" /* yacc.c:1646 */ +#line 2230 "y.tab.c" /* yacc.c:1652 */ break; case 79: -#line 751 "parser.y" /* yacc.c:1646 */ +#line 751 "parser.y" /* yacc.c:1652 */ { AttElem *new = (AttElem *)malloc(sizeof(AttElem)); @@ -2233,11 +2240,11 @@ (yyval.att_elem) = new; } -#line 2237 "y.tab.c" /* yacc.c:1646 */ +#line 2244 "y.tab.c" /* yacc.c:1652 */ break; case 80: -#line 763 "parser.y" /* yacc.c:1646 */ +#line 763 "parser.y" /* yacc.c:1652 */ { SlonDString ds; char *namespace; @@ -2264,11 +2271,11 @@ free((yyvsp[-1].str)); } } -#line 2268 "y.tab.c" /* yacc.c:1646 */ +#line 2275 "y.tab.c" /* yacc.c:1652 */ break; case 81: -#line 792 "parser.y" /* yacc.c:1646 */ +#line 792 "parser.y" /* yacc.c:1652 */ { SlonDString ds; char *namespace; @@ -2295,11 +2302,11 @@ free((yyvsp[-1].str)); } } -#line 2299 "y.tab.c" /* yacc.c:1646 */ +#line 2306 "y.tab.c" /* yacc.c:1652 */ break; case 82: -#line 821 "parser.y" /* yacc.c:1646 */ +#line 821 "parser.y" /* yacc.c:1652 */ { SlonDString ds; dstring_init(&ds); @@ -2315,11 +2322,11 @@ else dstring_free(&ds); } -#line 2319 "y.tab.c" /* yacc.c:1646 */ +#line 2326 "y.tab.c" /* yacc.c:1652 */ break; case 83: -#line 838 "parser.y" /* yacc.c:1646 */ +#line 838 "parser.y" /* yacc.c:1652 */ { char *ret; size_t toklen = yyget_leng(); @@ -2329,11 +2336,11 @@ (yyval.str) = ret; } -#line 2333 "y.tab.c" /* yacc.c:1646 */ +#line 2340 "y.tab.c" /* yacc.c:1652 */ break; case 84: -#line 850 "parser.y" /* yacc.c:1646 */ +#line 850 "parser.y" /* yacc.c:1652 */ { SlonDString ds; dstring_init(&ds); @@ -2350,11 +2357,11 @@ else dstring_free(&ds); } -#line 2354 "y.tab.c" /* yacc.c:1646 */ +#line 2361 "y.tab.c" /* yacc.c:1652 */ break; case 85: -#line 868 "parser.y" /* yacc.c:1646 */ +#line 868 "parser.y" /* yacc.c:1652 */ { char *ret; size_t toklen= yyget_leng(); @@ -2364,11 +2371,11 @@ (yyval.str) = ret; } -#line 2368 "y.tab.c" /* yacc.c:1646 */ +#line 2375 "y.tab.c" /* yacc.c:1652 */ break; case 86: -#line 880 "parser.y" /* yacc.c:1646 */ +#line 880 "parser.y" /* yacc.c:1652 */ { SlonDString ds; dstring_init(&ds); @@ -2386,11 +2393,11 @@ else dstring_free(&ds); } -#line 2390 "y.tab.c" /* yacc.c:1646 */ +#line 2397 "y.tab.c" /* yacc.c:1652 */ break; case 87: -#line 899 "parser.y" /* yacc.c:1646 */ +#line 899 "parser.y" /* yacc.c:1652 */ { char *ret; size_t toklen = yyget_leng(); @@ -2400,11 +2407,11 @@ (yyval.str) = ret; } -#line 2404 "y.tab.c" /* yacc.c:1646 */ +#line 2411 "y.tab.c" /* yacc.c:1652 */ break; case 88: -#line 911 "parser.y" /* yacc.c:1646 */ +#line 911 "parser.y" /* yacc.c:1652 */ { SlonDString ds; int c; @@ -2450,11 +2457,11 @@ YYACCEPT; } -#line 2454 "y.tab.c" /* yacc.c:1646 */ +#line 2461 "y.tab.c" /* yacc.c:1652 */ break; case 91: -#line 963 "parser.y" /* yacc.c:1646 */ +#line 963 "parser.y" /* yacc.c:1652 */ { char *str; size_t toklen = yyget_leng(); @@ -2470,19 +2477,19 @@ else free(str); } -#line 2474 "y.tab.c" /* yacc.c:1646 */ +#line 2481 "y.tab.c" /* yacc.c:1652 */ break; case 92: -#line 981 "parser.y" /* yacc.c:1646 */ +#line 981 "parser.y" /* yacc.c:1652 */ { (yyval.ival) = strtol(yytext, NULL, 10); } -#line 2482 "y.tab.c" /* yacc.c:1646 */ +#line 2489 "y.tab.c" /* yacc.c:1652 */ break; case 93: -#line 987 "parser.y" /* yacc.c:1646 */ +#line 987 "parser.y" /* yacc.c:1652 */ { char *ret; size_t toklen = yyget_leng(); @@ -2492,11 +2499,11 @@ (yyval.str) = ret; } -#line 2496 "y.tab.c" /* yacc.c:1646 */ +#line 2503 "y.tab.c" /* yacc.c:1652 */ break; case 94: -#line 997 "parser.y" /* yacc.c:1646 */ +#line 997 "parser.y" /* yacc.c:1652 */ { char *ret; size_t toklen = yyget_leng(); @@ -2506,19 +2513,19 @@ (yyval.str) = ret; } -#line 2510 "y.tab.c" /* yacc.c:1646 */ +#line 2517 "y.tab.c" /* yacc.c:1652 */ break; case 128: -#line 1043 "parser.y" /* yacc.c:1646 */ +#line 1043 "parser.y" /* yacc.c:1652 */ { (yyval.str) = (yyvsp[0].str); } -#line 2518 "y.tab.c" /* yacc.c:1646 */ +#line 2525 "y.tab.c" /* yacc.c:1652 */ break; case 129: -#line 1047 "parser.y" /* yacc.c:1646 */ +#line 1047 "parser.y" /* yacc.c:1652 */ { char *ret; @@ -2531,19 +2538,19 @@ (yyval.str) = ret; } -#line 2535 "y.tab.c" /* yacc.c:1646 */ +#line 2542 "y.tab.c" /* yacc.c:1652 */ break; case 130: -#line 1060 "parser.y" /* yacc.c:1646 */ +#line 1060 "parser.y" /* yacc.c:1652 */ { (yyval.str) = NULL; } -#line 2543 "y.tab.c" /* yacc.c:1646 */ +#line 2550 "y.tab.c" /* yacc.c:1652 */ break; case 131: -#line 1066 "parser.y" /* yacc.c:1646 */ +#line 1066 "parser.y" /* yacc.c:1652 */ { SlonDString *dsp = (SlonDString *)malloc(sizeof(SlonDString)); @@ -2553,38 +2560,38 @@ (yyval.dstring) = dsp; } -#line 2557 "y.tab.c" /* yacc.c:1646 */ +#line 2564 "y.tab.c" /* yacc.c:1652 */ break; case 132: -#line 1076 "parser.y" /* yacc.c:1646 */ +#line 1076 "parser.y" /* yacc.c:1652 */ { dstring_append((yyvsp[-1].dstring), (yyvsp[0].str)); free((yyvsp[0].str)); (yyval.dstring) = (yyvsp[-1].dstring); } -#line 2568 "y.tab.c" /* yacc.c:1646 */ +#line 2575 "y.tab.c" /* yacc.c:1652 */ break; case 133: -#line 1085 "parser.y" /* yacc.c:1646 */ +#line 1085 "parser.y" /* yacc.c:1652 */ { (yyval.str) = strdup(yychunk); } -#line 2576 "y.tab.c" /* yacc.c:1646 */ +#line 2583 "y.tab.c" /* yacc.c:1652 */ break; case 134: -#line 1090 "parser.y" /* yacc.c:1646 */ +#line 1090 "parser.y" /* yacc.c:1652 */ { (yyval.str) = strdup(yychunk); } -#line 2584 "y.tab.c" /* yacc.c:1646 */ +#line 2591 "y.tab.c" /* yacc.c:1652 */ break; -#line 2588 "y.tab.c" /* yacc.c:1646 */ +#line 2595 "y.tab.c" /* yacc.c:1652 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2609,14 +2616,13 @@ /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; + { + const int yylhs = yyr1[yyn] - YYNTOKENS; + const int yyi = yypgoto[yylhs] + *yyssp; + yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp + ? yytable[yyi] + : yydefgoto[yylhs]); + } goto yynewstate; @@ -2699,12 +2705,10 @@ | yyerrorlab -- error raised explicitly by YYERROR. | `---------------------------------------------------*/ yyerrorlab: - - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; + /* Pacify compilers when the user code never invokes YYERROR and the + label yyerrorlab therefore never appears in user code. */ + if (0) + YYERROR; /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ @@ -2766,6 +2770,7 @@ yyresult = 0; goto yyreturn; + /*-----------------------------------. | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ @@ -2773,6 +2778,7 @@ yyresult = 1; goto yyreturn; + #if !defined yyoverflow || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | @@ -2783,6 +2789,10 @@ /* Fall through. */ #endif + +/*-----------------------------------------------------. +| yyreturn -- parsing is finished, return the result. | +`-----------------------------------------------------*/ yyreturn: if (yychar != YYEMPTY) { @@ -2812,7 +2822,7 @@ #endif return yyresult; } -#line 1094 "parser.y" /* yacc.c:1906 */ +#line 1094 "parser.y" /* yacc.c:1918 */ diff -Nru slony1-2-2.2.8/src/slony_logshipper/scan.c slony1-2-2.2.10/src/slony_logshipper/scan.c --- slony1-2-2.2.8/src/slony_logshipper/scan.c 2019-08-27 03:14:38.000000000 +0000 +++ slony1-2-2.2.10/src/slony_logshipper/scan.c 2020-12-05 02:10:42.000000000 +0000 @@ -8,8 +8,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 39 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -84,60 +84,48 @@ #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) +/* begin standard C++ headers. */ -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ #define BEGIN (yy_start) = 1 + 2 * - /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) - +#define YY_NEW_FILE yyrestart( yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ @@ -167,17 +155,17 @@ typedef size_t yy_size_t; #endif -extern yy_size_t yyleng; +extern int yyleng; extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires * access to the local variable yy_act. Since yyless() is a macro, it would break - * existing scanners that call yyless() from OUTSIDE yylex. + * existing scanners that call yyless() from OUTSIDE yylex. * One obvious solution it to make yy_act a global. I tried that, and saw * a 5% performance hit in a non-yylineno scanner, because yy_act is * normally declared as a register variable-- so it is not worth it. @@ -210,7 +198,6 @@ YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, (yytext_ptr) ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -225,12 +212,12 @@ /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -253,7 +240,7 @@ int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -281,7 +268,7 @@ /* Stack of input buffers. */ static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ +static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general @@ -292,7 +279,6 @@ #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ : NULL) - /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. */ @@ -300,11 +286,11 @@ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ -yy_size_t yyleng; +static int yy_n_chars; /* number of characters read into yy_ch_buf */ +int yyleng; /* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; +static char *yy_c_buf_p = NULL; static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ @@ -313,85 +299,81 @@ */ static int yy_did_buffer_switch_on_eof; -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); - -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); - -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) - -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); - -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); +void yyrestart ( FILE *input_file ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); +void yy_delete_buffer ( YY_BUFFER_STATE b ); +void yy_flush_buffer ( YY_BUFFER_STATE b ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state ( void ); + +static void yyensure_buffer_stack ( void ); +static void yy_load_buffer_state ( void ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) + +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); + +void *yyalloc ( yy_size_t ); +void *yyrealloc ( void *, yy_size_t ); +void yyfree ( void * ); #define yy_new_buffer yy_create_buffer - #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) /* Begin user sect3 */ -#define yywrap() 1 +#define yywrap() (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP +typedef flex_uint8_t YY_CHAR; -typedef unsigned char YY_CHAR; - -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; +FILE *yyin = NULL, *yyout = NULL; typedef int yy_state_type; extern int yylineno; - int yylineno = 1; extern char *yytext; +#ifdef yytext_ptr +#undef yytext_ptr +#endif #define yytext_ptr yytext -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yy_fatal_error (yyconst char msg[] ); +static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); +static int yy_get_next_buffer ( void ); +static void yynoreturn yy_fatal_error ( const char* msg ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ - yyleng = (size_t) (yy_cp - yy_bp); \ + yyleng = (int) (yy_cp - yy_bp); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; - #define YY_NUM_RULES 68 #define YY_END_OF_BUFFER 69 /* This struct is not used in this scanner, @@ -401,7 +383,7 @@ flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[391] = +static const flex_int16_t yy_accept[391] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 69, 67, 55, 55, 67, 5, @@ -447,7 +429,7 @@ 54, 54, 54, 54, 49, 54, 54, 51, 38, 0 } ; -static yyconst flex_int32_t yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 2, 4, 1, 1, 1, 1, 1, 1, 1, @@ -479,7 +461,7 @@ 24, 24, 24, 24, 24 } ; -static yyconst flex_int32_t yy_meta[68] = +static const YY_CHAR yy_meta[68] = { 0, 1, 2, 3, 2, 4, 1, 5, 1, 1, 5, 1, 1, 6, 1, 7, 7, 7, 7, 7, 7, @@ -490,7 +472,7 @@ 7, 7, 7, 7, 7, 7, 7 } ; -static yyconst flex_int16_t yy_base[409] = +static const flex_int16_t yy_base[409] = { 0, 0, 0, 794, 793, 67, 108, 80, 81, 84, 87, 90, 91, 94, 95, 803, 938, 98, 101, 797, 797, @@ -539,7 +521,7 @@ 886, 892, 899, 906, 913, 920, 923, 930 } ; -static yyconst flex_int16_t yy_def[409] = +static const flex_int16_t yy_def[409] = { 0, 390, 1, 391, 391, 392, 392, 393, 393, 391, 391, 394, 394, 395, 395, 390, 390, 390, 390, 396, 397, @@ -588,7 +570,7 @@ 390, 390, 390, 390, 390, 390, 390, 390 } ; -static yyconst flex_int16_t yy_nxt[1006] = +static const flex_int16_t yy_nxt[1006] = { 0, 16, 17, 18, 17, 19, 20, 16, 21, 22, 23, 16, 16, 16, 24, 25, 26, 27, 28, 29, 30, @@ -703,7 +685,7 @@ 390, 390, 390, 390, 390 } ; -static yyconst flex_int16_t yy_chk[1006] = +static const flex_int16_t yy_chk[1006] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -819,7 +801,7 @@ } ; /* Table of booleans, true if rule could match eol. */ -static yyconst flex_int32_t yy_rule_can_match_eol[69] = +static const flex_int32_t yy_rule_can_match_eol[69] = { 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -893,6 +875,7 @@ static void popBuffer( void ); /* Pop previous lexer buffer */ extern char * current_file; +#line 879 "scan.c" #line 57 "scan.l" #include "config.h" #include "../slonik/types.h" @@ -900,10 +883,9 @@ #include "slony_logshipper.h" #include "y.tab.h" +#line 887 "scan.c" - - -#line 907 "scan.c" +#line 889 "scan.c" #define INITIAL 0 #define incl 1 @@ -925,36 +907,36 @@ #define YY_EXTRA_TYPE void * #endif -static int yy_init_globals (void ); +static int yy_init_globals ( void ); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy (void ); +int yylex_destroy ( void ); -int yyget_debug (void ); +int yyget_debug ( void ); -void yyset_debug (int debug_flag ); +void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra (void ); +YY_EXTRA_TYPE yyget_extra ( void ); -void yyset_extra (YY_EXTRA_TYPE user_defined ); +void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in (void ); +FILE *yyget_in ( void ); -void yyset_in (FILE * in_str ); +void yyset_in ( FILE * _in_str ); -FILE *yyget_out (void ); +FILE *yyget_out ( void ); -void yyset_out (FILE * out_str ); +void yyset_out ( FILE * _out_str ); -yy_size_t yyget_leng (void ); + int yyget_leng ( void ); -char *yyget_text (void ); +char *yyget_text ( void ); -int yyget_lineno (void ); +int yyget_lineno ( void ); -void yyset_lineno (int line_number ); +void yyset_lineno ( int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -962,28 +944,31 @@ #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (void ); +extern "C" int yywrap ( void ); #else -extern int yywrap (void ); +extern int yywrap ( void ); #endif #endif - static void yyunput (int c,char *buf_ptr ); +#ifndef YY_NO_UNPUT + + static void yyunput ( int c, char *buf_ptr ); +#endif + #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy ( char *, const char *, int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen ( const char * ); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (void ); +static int yyinput ( void ); #else -static int input (void ); +static int input ( void ); #endif #endif @@ -1003,7 +988,7 @@ /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -1027,7 +1012,7 @@ else \ { \ errno=0; \ - while ( (result = fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -1082,7 +1067,7 @@ /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK break; +#define YY_BREAK /*LINTED*/break; #endif #define YY_RULE_SETUP \ @@ -1092,9 +1077,9 @@ */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; if ( !(yy_init) ) { @@ -1116,19 +1101,19 @@ if ( ! YY_CURRENT_BUFFER ) { yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_load_buffer_state( ); + yy_load_buffer_state( ); } { #line 88 "scan.l" -#line 1130 "scan.c" +#line 1115 "scan.c" - while ( 1 ) /* loops until end-of-file is reached */ + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -1144,7 +1129,7 @@ yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1154,9 +1139,9 @@ { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 391 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } while ( yy_base[yy_current_state] != 938 ); @@ -1174,10 +1159,10 @@ if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) { - yy_size_t yyl; + int yyl; for ( yyl = 0; yyl < yyleng; ++yyl ) if ( yytext[yyl] == '\n' ) - + yylineno++; ; } @@ -1778,7 +1763,7 @@ if( value ) { pushBuffer( strdup( current_file )); - yy_scan_string(value ); + yy_scan_string( value ); } } YY_BREAK @@ -1800,7 +1785,7 @@ exit( 1 ); } - yy_switch_to_buffer(yy_create_buffer(yyin,YY_BUF_SIZE )); + yy_switch_to_buffer( yy_create_buffer( yyin, YY_BUF_SIZE )); BEGIN(INITIAL); } @@ -1839,7 +1824,7 @@ #line 458 "scan.l" ECHO; YY_BREAK -#line 1843 "scan.c" +#line 1828 "scan.c" case YY_END_OF_BUFFER: { @@ -1915,7 +1900,7 @@ { (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap( ) ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -1980,9 +1965,9 @@ */ static int yy_get_next_buffer (void) { - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = (yytext_ptr); + int number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -2011,7 +1996,7 @@ /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -2038,7 +2023,7 @@ if ( b->yy_is_our_buffer ) { - yy_size_t new_size = b->yy_buf_size * 2; + int new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -2047,11 +2032,12 @@ b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) ); } else /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; + b->yy_ch_buf = NULL; if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( @@ -2079,7 +2065,7 @@ if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); + yyrestart( yyin ); } else @@ -2093,12 +2079,15 @@ else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } (yy_n_chars) += number_to_move; @@ -2114,14 +2103,14 @@ static yy_state_type yy_get_previous_state (void) { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; yy_current_state = (yy_start); for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -2131,9 +2120,9 @@ { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 391 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; } return yy_current_state; @@ -2146,10 +2135,10 @@ */ static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) { - register int yy_is_jam; - register char *yy_cp = (yy_c_buf_p); + int yy_is_jam; + char *yy_cp = (yy_c_buf_p); - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -2159,17 +2148,19 @@ { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 391 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; yy_is_jam = (yy_current_state == 390); return yy_is_jam ? 0 : yy_current_state; } - static void yyunput (int c, register char * yy_bp ) +#ifndef YY_NO_UNPUT + + static void yyunput (int c, char * yy_bp ) { - register char *yy_cp; + char *yy_cp; yy_cp = (yy_c_buf_p); @@ -2179,10 +2170,10 @@ if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register yy_size_t number_to_move = (yy_n_chars) + 2; - register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + int number_to_move = (yy_n_chars) + 2; + char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; - register char *source = + char *source = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) @@ -2191,7 +2182,7 @@ yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; + (yy_n_chars) = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size; if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); @@ -2208,6 +2199,8 @@ (yy_c_buf_p) = yy_cp; } +#endif + #ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput (void) @@ -2232,7 +2225,7 @@ else { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (int) ((yy_c_buf_p) - (yytext_ptr)); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -2249,14 +2242,14 @@ */ /* Reset buffer status. */ - yyrestart(yyin ); + yyrestart( yyin ); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap( ) ) - return EOF; + if ( yywrap( ) ) + return 0; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -2279,7 +2272,7 @@ (yy_hold_char) = *++(yy_c_buf_p); if ( c == '\n' ) - + yylineno++; ; @@ -2298,11 +2291,11 @@ if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file ); + yy_load_buffer_state( ); } /** Switch to a different input buffer. @@ -2330,7 +2323,7 @@ } YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag @@ -2358,7 +2351,7 @@ { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -2367,13 +2360,13 @@ /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer(b,file ); + yy_init_buffer( b, file ); return b; } @@ -2392,9 +2385,9 @@ YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); + yyfree( (void *) b->yy_ch_buf ); - yyfree((void *) b ); + yyfree( (void *) b ); } /* Initializes or reinitializes a buffer. @@ -2406,7 +2399,7 @@ { int oerrno = errno; - yy_flush_buffer(b ); + yy_flush_buffer( b ); b->yy_input_file = file; b->yy_fill_buffer = 1; @@ -2449,7 +2442,7 @@ b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); + yy_load_buffer_state( ); } /** Pushes the new state onto the stack. The new state becomes @@ -2480,7 +2473,7 @@ YY_CURRENT_BUFFER_LVALUE = new_buffer; /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } @@ -2499,7 +2492,7 @@ --(yy_buffer_stack_top); if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } } @@ -2517,15 +2510,15 @@ * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - num_to_alloc = 1; + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -2534,7 +2527,7 @@ if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; + yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = (yy_buffer_stack_max) + grow_size; (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc @@ -2554,7 +2547,7 @@ * @param base the character buffer * @param size the size in bytes of the character buffer * - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { @@ -2564,23 +2557,23 @@ base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ - return 0; + return NULL; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; - b->yy_input_file = 0; + b->yy_input_file = NULL; b->yy_n_chars = b->yy_buf_size; b->yy_is_interactive = 0; b->yy_at_bol = 1; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer(b ); + yy_switch_to_buffer( b ); return b; } @@ -2593,10 +2586,10 @@ * @note If you want to scan bytes that may contain NUL values, then use * yy_scan_bytes() instead. */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) +YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return yy_scan_bytes(yystr,strlen(yystr) ); + return yy_scan_bytes( yystr, (int) strlen(yystr) ); } /** Setup the input buffer state to scan the given bytes. The next call to yylex() will @@ -2606,16 +2599,16 @@ * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; yy_size_t n; - yy_size_t i; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) yyalloc(n ); + n = (yy_size_t) (_yybytes_len + 2); + buf = (char *) yyalloc( n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -2624,7 +2617,7 @@ buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer(buf,n ); + b = yy_scan_buffer( buf, n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -2640,9 +2633,9 @@ #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (const char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -2670,7 +2663,7 @@ */ int yyget_lineno (void) { - + return yylineno; } @@ -2693,7 +2686,7 @@ /** Get the length of the current token. * */ -yy_size_t yyget_leng (void) +int yyget_leng (void) { return yyleng; } @@ -2708,29 +2701,29 @@ } /** Set the current line number. - * @param line_number + * @param _line_number line number * */ -void yyset_lineno (int line_number ) +void yyset_lineno (int _line_number ) { - yylineno = line_number; + yylineno = _line_number; } /** Set the input stream. This does not discard the current * input buffer. - * @param in_str A readable stream. + * @param _in_str A readable stream. * * @see yy_switch_to_buffer */ -void yyset_in (FILE * in_str ) +void yyset_in (FILE * _in_str ) { - yyin = in_str ; + yyin = _in_str ; } -void yyset_out (FILE * out_str ) +void yyset_out (FILE * _out_str ) { - yyout = out_str ; + yyout = _out_str ; } int yyget_debug (void) @@ -2738,9 +2731,9 @@ return yy_flex_debug; } -void yyset_debug (int bdebug ) +void yyset_debug (int _bdebug ) { - yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } static int yy_init_globals (void) @@ -2752,10 +2745,10 @@ /* We do not touch yylineno unless the option is enabled. */ yylineno = 1; - (yy_buffer_stack) = 0; + (yy_buffer_stack) = NULL; (yy_buffer_stack_top) = 0; (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char *) 0; + (yy_c_buf_p) = NULL; (yy_init) = 0; (yy_start) = 0; @@ -2764,8 +2757,8 @@ yyin = stdin; yyout = stdout; #else - yyin = (FILE *) 0; - yyout = (FILE *) 0; + yyin = NULL; + yyout = NULL; #endif /* For future reference: Set errno on error, since we are called by @@ -2780,7 +2773,7 @@ /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); + yy_delete_buffer( YY_CURRENT_BUFFER ); YY_CURRENT_BUFFER_LVALUE = NULL; yypop_buffer_state(); } @@ -2801,18 +2794,19 @@ */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +static void yy_flex_strncpy (char* s1, const char * s2, int n ) { - register int i; + + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) +static int yy_flex_strlen (const char * s ) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -2822,11 +2816,12 @@ void *yyalloc (yy_size_t size ) { - return (void *) malloc( size ); + return malloc(size); } void *yyrealloc (void * ptr, yy_size_t size ) { + /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -2834,18 +2829,17 @@ * any pointer type to void*, and deal with argument conversions * as though doing an assignment. */ - return (void *) realloc( (char *) ptr, size ); + return realloc(ptr, size); } void yyfree (void * ptr ) { - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" -#line 457 "scan.l" - +#line 458 "scan.l" void @@ -2857,7 +2851,7 @@ if (YY_CURRENT_BUFFER) yy_delete_buffer(YY_CURRENT_BUFFER); - yy_switch_to_buffer(yy_create_buffer(in,YY_BUF_SIZE)); + yy_switch_to_buffer(yy_create_buffer(in, YY_BUF_SIZE)); yylineno = 1; @@ -2905,8 +2899,8 @@ if( yyin != NULL ) fclose( yyin ); - yy_delete_buffer(YY_CURRENT_BUFFER ); - yy_switch_to_buffer(yy_buffer->buffer ); + yy_delete_buffer( YY_CURRENT_BUFFER ); + yy_switch_to_buffer( yy_buffer->buffer ); current_file = yy_buffer->fileName; yylineno = yy_buffer->lineno; diff -Nru slony1-2-2.2.8/src/slony_logshipper/scan.h slony1-2-2.2.10/src/slony_logshipper/scan.h --- slony1-2-2.2.8/src/slony_logshipper/scan.h 2019-08-27 03:14:38.000000000 +0000 +++ slony1-2-2.2.10/src/slony_logshipper/scan.h 2020-12-05 02:10:42.000000000 +0000 @@ -12,8 +12,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 39 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -88,29 +88,23 @@ #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ +/* begin standard C++ headers. */ -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* Size of default input buffer. */ @@ -136,7 +130,7 @@ typedef size_t yy_size_t; #endif -extern yy_size_t yyleng; +extern int yyleng; extern FILE *yyin, *yyout; @@ -152,12 +146,12 @@ /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -180,7 +174,7 @@ int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -191,30 +185,33 @@ }; #endif /* !YY_STRUCT_YY_BUFFER_STATE */ -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); - -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); - -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); +void yyrestart ( FILE *input_file ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); +void yy_delete_buffer ( YY_BUFFER_STATE b ); +void yy_flush_buffer ( YY_BUFFER_STATE b ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state ( void ); + +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); + +void *yyalloc ( yy_size_t ); +void *yyrealloc ( void *, yy_size_t ); +void yyfree ( void * ); /* Begin user sect3 */ -#define yywrap() 1 +#define yywrap() (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP extern int yylineno; extern char *yytext; +#ifdef yytext_ptr +#undef yytext_ptr +#endif #define yytext_ptr yytext #ifdef YY_HEADER_EXPORT_START_CONDITIONS @@ -243,31 +240,31 @@ /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy (void ); +int yylex_destroy ( void ); -int yyget_debug (void ); +int yyget_debug ( void ); -void yyset_debug (int debug_flag ); +void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra (void ); +YY_EXTRA_TYPE yyget_extra ( void ); -void yyset_extra (YY_EXTRA_TYPE user_defined ); +void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in (void ); +FILE *yyget_in ( void ); -void yyset_in (FILE * in_str ); +void yyset_in ( FILE * _in_str ); -FILE *yyget_out (void ); +FILE *yyget_out ( void ); -void yyset_out (FILE * out_str ); +void yyset_out ( FILE * _out_str ); -yy_size_t yyget_leng (void ); + int yyget_leng ( void ); -char *yyget_text (void ); +char *yyget_text ( void ); -int yyget_lineno (void ); +int yyget_lineno ( void ); -void yyset_lineno (int line_number ); +void yyset_lineno ( int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -275,18 +272,18 @@ #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (void ); +extern "C" int yywrap ( void ); #else -extern int yywrap (void ); +extern int yywrap ( void ); #endif #endif #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy ( char *, const char *, int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen ( const char * ); #endif #ifndef YY_NO_INPUT @@ -333,9 +330,154 @@ #undef YY_DECL #endif -#line 457 "scan.l" +#ifndef yy_create_buffer_ALREADY_DEFINED +#undef yy_create_buffer +#endif +#ifndef yy_delete_buffer_ALREADY_DEFINED +#undef yy_delete_buffer +#endif +#ifndef yy_scan_buffer_ALREADY_DEFINED +#undef yy_scan_buffer +#endif +#ifndef yy_scan_string_ALREADY_DEFINED +#undef yy_scan_string +#endif +#ifndef yy_scan_bytes_ALREADY_DEFINED +#undef yy_scan_bytes +#endif +#ifndef yy_init_buffer_ALREADY_DEFINED +#undef yy_init_buffer +#endif +#ifndef yy_flush_buffer_ALREADY_DEFINED +#undef yy_flush_buffer +#endif +#ifndef yy_load_buffer_state_ALREADY_DEFINED +#undef yy_load_buffer_state +#endif +#ifndef yy_switch_to_buffer_ALREADY_DEFINED +#undef yy_switch_to_buffer +#endif +#ifndef yypush_buffer_state_ALREADY_DEFINED +#undef yypush_buffer_state +#endif +#ifndef yypop_buffer_state_ALREADY_DEFINED +#undef yypop_buffer_state +#endif +#ifndef yyensure_buffer_stack_ALREADY_DEFINED +#undef yyensure_buffer_stack +#endif +#ifndef yylex_ALREADY_DEFINED +#undef yylex +#endif +#ifndef yyrestart_ALREADY_DEFINED +#undef yyrestart +#endif +#ifndef yylex_init_ALREADY_DEFINED +#undef yylex_init +#endif +#ifndef yylex_init_extra_ALREADY_DEFINED +#undef yylex_init_extra +#endif +#ifndef yylex_destroy_ALREADY_DEFINED +#undef yylex_destroy +#endif +#ifndef yyget_debug_ALREADY_DEFINED +#undef yyget_debug +#endif +#ifndef yyset_debug_ALREADY_DEFINED +#undef yyset_debug +#endif +#ifndef yyget_extra_ALREADY_DEFINED +#undef yyget_extra +#endif +#ifndef yyset_extra_ALREADY_DEFINED +#undef yyset_extra +#endif +#ifndef yyget_in_ALREADY_DEFINED +#undef yyget_in +#endif +#ifndef yyset_in_ALREADY_DEFINED +#undef yyset_in +#endif +#ifndef yyget_out_ALREADY_DEFINED +#undef yyget_out +#endif +#ifndef yyset_out_ALREADY_DEFINED +#undef yyset_out +#endif +#ifndef yyget_leng_ALREADY_DEFINED +#undef yyget_leng +#endif +#ifndef yyget_text_ALREADY_DEFINED +#undef yyget_text +#endif +#ifndef yyget_lineno_ALREADY_DEFINED +#undef yyget_lineno +#endif +#ifndef yyset_lineno_ALREADY_DEFINED +#undef yyset_lineno +#endif +#ifndef yyget_column_ALREADY_DEFINED +#undef yyget_column +#endif +#ifndef yyset_column_ALREADY_DEFINED +#undef yyset_column +#endif +#ifndef yywrap_ALREADY_DEFINED +#undef yywrap +#endif +#ifndef yyget_lval_ALREADY_DEFINED +#undef yyget_lval +#endif +#ifndef yyset_lval_ALREADY_DEFINED +#undef yyset_lval +#endif +#ifndef yyget_lloc_ALREADY_DEFINED +#undef yyget_lloc +#endif +#ifndef yyset_lloc_ALREADY_DEFINED +#undef yyset_lloc +#endif +#ifndef yyalloc_ALREADY_DEFINED +#undef yyalloc +#endif +#ifndef yyrealloc_ALREADY_DEFINED +#undef yyrealloc +#endif +#ifndef yyfree_ALREADY_DEFINED +#undef yyfree +#endif +#ifndef yytext_ALREADY_DEFINED +#undef yytext +#endif +#ifndef yyleng_ALREADY_DEFINED +#undef yyleng +#endif +#ifndef yyin_ALREADY_DEFINED +#undef yyin +#endif +#ifndef yyout_ALREADY_DEFINED +#undef yyout +#endif +#ifndef yy_flex_debug_ALREADY_DEFINED +#undef yy_flex_debug +#endif +#ifndef yylineno_ALREADY_DEFINED +#undef yylineno +#endif +#ifndef yytables_fload_ALREADY_DEFINED +#undef yytables_fload +#endif +#ifndef yytables_destroy_ALREADY_DEFINED +#undef yytables_destroy +#endif +#ifndef yyTABLES_NAME_ALREADY_DEFINED +#undef yyTABLES_NAME +#endif + +#line 458 "scan.l" -#line 340 "scan.h" +#line 482 "scan.h" #undef yyIN_HEADER #endif /* yyHEADER_H */ diff -Nru slony1-2-2.2.8/src/slony_logshipper/y.tab.h slony1-2-2.2.10/src/slony_logshipper/y.tab.h --- slony1-2-2.2.8/src/slony_logshipper/y.tab.h 2019-08-27 03:14:38.000000000 +0000 +++ slony1-2-2.2.10/src/slony_logshipper/y.tab.h 2020-12-05 02:10:42.000000000 +0000 @@ -1,8 +1,9 @@ -/* A Bison parser, made by GNU Bison 3.0.2. */ +/* A Bison parser, made by GNU Bison 3.3.2. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation, + Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,6 +31,9 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ +/* Undocumented macros, especially those whose name start with YY_, + are private implementation details. Do not rely on them. */ + #ifndef YY_YY_Y_TAB_H_INCLUDED # define YY_YY_Y_TAB_H_INCLUDED /* Debug traces. */ @@ -165,10 +169,10 @@ /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE YYSTYPE; + union YYSTYPE { -#line 38 "parser.y" /* yacc.c:1909 */ +#line 38 "parser.y" /* yacc.c:1921 */ int32 ival; char *str; @@ -176,8 +180,10 @@ AttElemList *att_elem_list; SlonDString *dstring; -#line 180 "y.tab.h" /* yacc.c:1909 */ +#line 184 "y.tab.h" /* yacc.c:1921 */ }; + +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 #endif diff -Nru slony1-2-2.2.8/tools/altperl/slonik_build_env.pl slony1-2-2.2.10/tools/altperl/slonik_build_env.pl --- slony1-2-2.2.8/tools/altperl/slonik_build_env.pl 2019-08-27 01:24:54.000000000 +0000 +++ slony1-2-2.2.10/tools/altperl/slonik_build_env.pl 2020-12-05 02:07:59.000000000 +0000 @@ -63,14 +63,40 @@ # Read in all the user 'normal' tables in @schema (public by default). # put all schemas between single quotes for the query my @protected_schema=map("'".$_."'",@schema); -my $tableQuery = $dbh->prepare( " + + +my $server_version_query = $dbh->prepare("show server_version_num") + or die("unable to determine server version"); +$server_version_query->execute() or die "unable to determine server version"; +my $version_row = $server_version_query->fetchrow_arrayref(); +my $server_version = @$version_row[0]; +$server_version_query->finish(); + + +my $tableQuery; +if ($server_version >= 110000) { + $tableQuery = $dbh->prepare(" +SELECT n.nspname || '.' || c.relname,c.relkind, + EXISTS (SELECT 1 FROM pg_constraint WHERE contype='p' AND conrelid=c.oid) AS relhaspkey +FROM pg_namespace n ,pg_class c +WHERE c.reltype > 0 +AND c.relnamespace = n.oid +AND (c.relkind = 'r' OR c.relkind = 'S') +AND n.nspname IN (" . join(',',@protected_schema) . ") +AND n.oid = c.relnamespace; +"); +} +else { + + $tableQuery = $dbh->prepare( " SELECT pg_namespace.nspname || '.' || pg_class.relname,pg_class.relkind,pg_class.relhaspkey FROM pg_namespace,pg_class WHERE pg_class.reltype > 0 AND pg_class.relnamespace = pg_catalog.pg_namespace.oid AND (pg_class.relkind = 'r' OR pg_class.relkind = 'S') AND pg_namespace.nspname IN (" . join(',',@protected_schema) . ") AND pg_namespace.oid = pg_class.relnamespace" -); + ); +} die "prepare(tableQuery): $DBI::errstr" if ( !defined($tableQuery) || $DBI::err ); die "execute(tableQuery): $DBI::errstr" if ( !$tableQuery->execute() );