From da042bf40881aa5702c75c8deed6d96772a2a13d Mon Sep 17 00:00:00 2001 From: Michael Meskes Date: Thu, 20 Mar 2008 16:04:52 +0000 Subject: [PATCH] Changed statement escaping to not escape continuation line markers. Bumped precompiler patchlevel. --- src/interfaces/ecpg/ChangeLog | 10 ++++++++++ src/interfaces/ecpg/preproc/Makefile | 2 +- src/interfaces/ecpg/preproc/output.c | 13 ++++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog index b73664a4ae..c7f569693f 100644 --- a/src/interfaces/ecpg/ChangeLog +++ b/src/interfaces/ecpg/ChangeLog @@ -2322,3 +2322,13 @@ Sun, 17 Feb 2008 18:45:39 +0100 - Removed duplicate include of ecpgtype.h. - Changed INFORMIX mode symbol definition yet again because the old way didn't work on NetBSD. + +Sun, 02 Mar 2008 11:50:48 +0100 + + - Fixed bug that caused arrays of varchar to be output with incomplete + name. + +Thu, 20 Mar 2008 16:54:27 +0100 + + - Changed statement escaping to not escape continuation line markers. + - Bumped ecpg version number to 4.4.1. diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile index 8ae5a71443..9994daf48d 100644 --- a/src/interfaces/ecpg/preproc/Makefile +++ b/src/interfaces/ecpg/preproc/Makefile @@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.global MAJOR_VERSION= 4 MINOR_VERSION= 4 -PATCHLEVEL=0 +PATCHLEVEL=1 override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \ -I$(srcdir) -DMAJOR_VERSION=$(MAJOR_VERSION) \ diff --git a/src/interfaces/ecpg/preproc/output.c b/src/interfaces/ecpg/preproc/output.c index d503c99602..c1d74426eb 100644 --- a/src/interfaces/ecpg/preproc/output.c +++ b/src/interfaces/ecpg/preproc/output.c @@ -193,7 +193,18 @@ output_escaped_str(char *str, bool quoted) else if (str[i] == '\n') fputs("\\\n", yyout); else if (str[i] == '\\') - fputs("\\\\", yyout); + { + int j = i; + + /* check whether this is a continuation line + * if it is, do not output anything because newlines are escaped anyway */ + + /* accept blanks after the '\' as some other compilers do too */ + do { j++; } while (str[j] == ' ' || str[j] == '\t'); + + if ((str[j] != '\n') && (str[j] != '\r' || str[j + 1] != '\n')) /* not followed by a newline */ + fputs("\\\\", yyout); + } else if (str[i] == '\r' && str[i + 1] == '\n') { fputs("\\\r\n", yyout); -- 2.39.5