From: Michael Meskes <meskes@topsystem.de>

Subject: [PATCHES] ecpg: correct whenever statement

diff --git a/src/interfaces/Makefile b/src/interfaces/Makefile
index 5dac21202cf6d1e4cdb715cb7fc2662251c53056..e2a70dc6b1e257a4cba1213a8067e4f6893fac8b 100644 (file)
--- a/src/interfaces/Makefile
+++ b/src/interfaces/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.7 1998/02/17 01:47:19 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.8 1998/02/27 02:31:02 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -16,7 +16,7 @@ include $(SRCDIR)/Makefile.global
 
 .DEFAULT all:
        $(MAKE) -C libpq $@
-       $(MAKE) -C ecpg $@
+#      $(MAKE) -C ecpg $@
 ifeq ($(HAVE_Cplusplus), true)
        $(MAKE) -C libpq++ $@
 else

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index bb39d213947b2975fbca9b069f092d15a724bdc0..8501e99dc284cebfc9679c056b8b3dec35884525 100644 (file)
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -56,3 +56,9 @@ Thu Feb 24 12:26:12 CET 1998
 
        - allow 'go to' in whenever statement as well as 'goto'
        - new argument 'stop' for whenever statement
+
+Wed Feb 25 15:46:50 CET 1998
+
+       - corrected whenever continue handling
+       - removed whenever break
+

diff --git a/src/interfaces/ecpg/TODO b/src/interfaces/ecpg/TODO
index dab3e0b4deb5d26fa768e7df3e3d2a547a296872..a10dbd7521f66989282e5581530aa033c3e7cf8a 100644 (file)
--- a/src/interfaces/ecpg/TODO
+++ b/src/interfaces/ecpg/TODO
@@ -47,7 +47,7 @@ The cursor is opened when the declare statement is issued.
 
 ecpg does not understand enum datatypes.
 
-The is no exec sql prepare statement.
+There is no exec sql prepare statement.
 
 The complete structure definition has to be listed inside the declare
 section for ecpg to be able to understand it.

diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index 5523d0fce71faed967b50ab7757d091dcb98c050..8bb9b73f0ded5cbf752caf8ee00567415a722aec 100644 (file)
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -19,7 +19,6 @@ label ({letter}|{digit})*
 string '[^']*'
 
 begin  [bB][eE][gG][iI][nN]
-break   [bB][rR][eE][aA][kK]
 commit  [cC][oO][mM][mM][iI][tT]
 connect [cC][oO][nN][nN][eE][cC][tT]
 continue [cC][oO][nN][tT][iI][nN][uU][eE]

diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index 2a77c441a6e259f7b2324b1cc4a1eab4ff1e629e..30b9cb9ade304b131a0ab17777d914f0c55f6447 100644 (file)
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -228,7 +228,7 @@ dump_variables(struct arguments * list)
 %token <tagname> SQL_BEGIN SQL_END SQL_DECLARE SQL_SECTION SQL_INCLUDE 
 %token <tagname> SQL_CONNECT SQL_OPEN SQL_EXECUTE SQL_IMMEDIATE
 %token <tagname> SQL_COMMIT SQL_ROLLBACK SQL_RELEASE SQL_WORK SQL_WHENEVER
-%token <tagname> SQL_SQLERROR SQL_NOT_FOUND SQL_BREAK SQL_CONTINUE
+%token <tagname> SQL_SQLERROR SQL_NOT_FOUND SQL_CONTINUE
 %token <tagname> SQL_DO SQL_GOTO SQL_SQLPRINT SQL_STOP
 
 %token <tagname> S_SYMBOL S_LENGTH S_ANYTHING S_LABEL
@@ -526,13 +526,8 @@ sqlwhenever : SQL_START SQL_WHENEVER SQL_SQLERROR {
        fprintf(yyout, "; */\n");
 }
 
-action : SQL_BREAK {
-       $<action>$.code = W_BREAK;
-       $<action>$.str = NULL;
-       fprintf(yyout, "break");
-}
-       | SQL_CONTINUE {
-       $<action>$.code = W_CONTINUE;
+action : SQL_CONTINUE {
+       $<action>$.code = W_NOTHING;
        $<action>$.str = NULL;
        fprintf(yyout, "continue");
 }
@@ -615,7 +610,7 @@ sqlstatement_word : ':' symbol
 into_list : ':' symbol {
     add_variable(&argsresult, find_variable($2)); 
 }
-         | into_list ',' ':' symbol{
+         | into_list ',' ':' symbol {
     add_variable(&argsresult, find_variable($4)); 
 };