1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

From: Michael Meskes <meskes@topsystem.de>

Browse Source 
Subject: [PATCHES] ecpg: correct whenever statement
This commit is contained in:
Marc G. Fournier 1998-02-27 02:31:20 +00:00
parent 73d309f54b
commit f139617b55
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/Makefile
View File

@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # 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: .DEFAULT all:
$(MAKE) -C libpq $@ $(MAKE) -C libpq $@
$(MAKE) -C ecpg $@ # $(MAKE) -C ecpg $@
ifeq ($(HAVE_Cplusplus), true) ifeq ($(HAVE_Cplusplus), true)
$(MAKE) -C libpq++ $@ $(MAKE) -C libpq++ $@
else else

6
src/interfaces/ecpg/ChangeLog
View File

@ -56,3 +56,9 @@ Thu Feb 24 12:26:12 CET 1998
- allow 'go to' in whenever statement as well as 'goto' - allow 'go to' in whenever statement as well as 'goto'
- new argument 'stop' for whenever statement - new argument 'stop' for whenever statement
Wed Feb 25 15:46:50 CET 1998
- corrected whenever continue handling
- removed whenever break

2
src/interfaces/ecpg/TODO
View File

@ -47,7 +47,7 @@ The cursor is opened when the declare statement is issued.
ecpg does not understand enum datatypes. 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 The complete structure definition has to be listed inside the declare
section for ecpg to be able to understand it. section for ecpg to be able to understand it.

1
src/interfaces/ecpg/preproc/pgc.l
View File

@ -19,7 +19,6 @@ label ({letter}|{digit})*
string '[^']*' string '[^']*'
begin [bB][eE][gG][iI][nN] begin [bB][eE][gG][iI][nN]
break [bB][rR][eE][aA][kK]
commit [cC][oO][mM][mM][iI][tT] commit [cC][oO][mM][mM][iI][tT]
connect [cC][oO][nN][nN][eE][cC][tT] connect [cC][oO][nN][nN][eE][cC][tT]
continue [cC][oO][nN][tT][iI][nN][uU][eE] continue [cC][oO][nN][tT][iI][nN][uU][eE]

13
src/interfaces/ecpg/preproc/preproc.y
View File

@ -228,7 +228,7 @@ dump_variables(struct arguments * list)
%token <tagname> SQL_BEGIN SQL_END SQL_DECLARE SQL_SECTION SQL_INCLUDE %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_CONNECT SQL_OPEN SQL_EXECUTE SQL_IMMEDIATE
%token <tagname> SQL_COMMIT SQL_ROLLBACK SQL_RELEASE SQL_WORK SQL_WHENEVER %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> SQL_DO SQL_GOTO SQL_SQLPRINT SQL_STOP
%token <tagname> S_SYMBOL S_LENGTH S_ANYTHING S_LABEL %token <tagname> S_SYMBOL S_LENGTH S_ANYTHING S_LABEL
@ -526,13 +526,8 @@ sqlwhenever : SQL_START SQL_WHENEVER SQL_SQLERROR {
fprintf(yyout, "; */\n"); fprintf(yyout, "; */\n");
} }
action : SQL_BREAK { action : SQL_CONTINUE {
$<action>$.code = W_BREAK; $<action>$.code = W_NOTHING;
$<action>$.str = NULL;
fprintf(yyout, "break");
}
| SQL_CONTINUE {
$<action>$.code = W_CONTINUE;
$<action>$.str = NULL; $<action>$.str = NULL;
fprintf(yyout, "continue"); fprintf(yyout, "continue");
} }
@ -615,7 +610,7 @@ sqlstatement_word : ':' symbol
into_list : ':' symbol { into_list : ':' symbol {
add_variable(&argsresult, find_variable($2)); add_variable(&argsresult, find_variable($2));
} }
| into_list ',' ':' symbol{ | into_list ',' ':' symbol {
add_variable(&argsresult, find_variable($4)); add_variable(&argsresult, find_variable($4));
}; };