Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf139617

Browse files
committed
From: Michael Meskes <meskes@topsystem.de>
Subject: [PATCHES] ecpg: correct whenever statement
1 parent73d309f commitf139617

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

‎src/interfaces/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.7 1998/02/17 01:47:19 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.8 1998/02/27 02:31:02 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -16,7 +16,7 @@ include $(SRCDIR)/Makefile.global
1616

1717
.DEFAULTall:
1818
$(MAKE) -C libpq$@
19-
$(MAKE) -C ecpg$@
19+
#$(MAKE) -C ecpg $@
2020
ifeq ($(HAVE_Cplusplus), true)
2121
$(MAKE) -C libpq++ $@
2222
else

‎src/interfaces/ecpg/ChangeLog‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,9 @@ Thu Feb 24 12:26:12 CET 1998
5656

5757
- allow 'go to' in whenever statement as well as 'goto'
5858
- new argument 'stop' for whenever statement
59+
60+
Wed Feb 25 15:46:50 CET 1998
61+
62+
- corrected whenever continue handling
63+
- removed whenever break
64+

‎src/interfaces/ecpg/TODO‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The cursor is opened when the declare statement is issued.
4747

4848
ecpg does not understand enum datatypes.
4949

50-
The is no exec sql prepare statement.
50+
There is no exec sql prepare statement.
5151

5252
The complete structure definition has to be listed inside the declare
5353
section for ecpg to be able to understand it.

‎src/interfaces/ecpg/preproc/pgc.l‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ label({letter}|{digit})*
1919
string'[^']*'
2020

2121
begin[bB][eE][gG][iI][nN]
22-
break [bB][rR][eE][aA][kK]
2322
commit [cC][oO][mM][mM][iI][tT]
2423
connect [cC][oO][nN][nN][eE][cC][tT]
2524
continue [cC][oO][nN][tT][iI][nN][uU][eE]

‎src/interfaces/ecpg/preproc/preproc.y‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ dump_variables(struct arguments * list)
228228
%token<tagname>SQL_BEGINSQL_ENDSQL_DECLARESQL_SECTIONSQL_INCLUDE
229229
%token<tagname>SQL_CONNECTSQL_OPENSQL_EXECUTESQL_IMMEDIATE
230230
%token<tagname>SQL_COMMITSQL_ROLLBACKSQL_RELEASESQL_WORKSQL_WHENEVER
231-
%token<tagname>SQL_SQLERRORSQL_NOT_FOUNDSQL_BREAKSQL_CONTINUE
231+
%token<tagname>SQL_SQLERRORSQL_NOT_FOUNDSQL_CONTINUE
232232
%token<tagname>SQL_DOSQL_GOTOSQL_SQLPRINTSQL_STOP
233233

234234
%token<tagname>S_SYMBOLS_LENGTHS_ANYTHINGS_LABEL
@@ -526,13 +526,8 @@ sqlwhenever : SQL_START SQL_WHENEVER SQL_SQLERROR {
526526
fprintf(yyout,"; */\n");
527527
}
528528

529-
action :SQL_BREAK {
530-
$<action>$.code = W_BREAK;
531-
$<action>$.str =NULL;
532-
fprintf(yyout,"break");
533-
}
534-
|SQL_CONTINUE {
535-
$<action>$.code = W_CONTINUE;
529+
action :SQL_CONTINUE {
530+
$<action>$.code = W_NOTHING;
536531
$<action>$.str =NULL;
537532
fprintf(yyout,"continue");
538533
}
@@ -615,7 +610,7 @@ sqlstatement_word : ':' symbol
615610
into_list :':'symbol {
616611
add_variable(&argsresult, find_variable($2));
617612
}
618-
|into_list','':'symbol{
613+
|into_list','':'symbol{
619614
add_variable(&argsresult, find_variable($4));
620615
};
621616

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp