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

Commitc7f5c7c

Browse files
author
Michael Meskes
committed
Replaced manually synced preproc.y by the one created by the new script.
Adapted regression test files accordingly.
1 parent3be2448 commitc7f5c7c

File tree

60 files changed

+8837
-4616
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+8837
-4616
lines changed

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

Lines changed: 8638 additions & 4417 deletions
Large diffs are not rendered by default.

‎src/interfaces/ecpg/test/expected/compat_informix-rnull.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ int main(void)
3434
{
3535

3636
#line 15 "rnull.pgc"
37-
charc[]="abc" ;
37+
charc []="abc" ;
3838

3939
#line 15 "rnull.pgc"
4040

@@ -111,7 +111,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
111111
if (sqlca.sqlcode<0)sqlprint ( );}
112112
#line 33 "rnull.pgc"
113113

114-
{ECPGtrans(__LINE__,NULL,"commit");
114+
{ECPGtrans(__LINE__,NULL,"commit");
115115
#line 34 "rnull.pgc"
116116

117117
if (sqlca.sqlcode<0)sqlprint ( );}
@@ -138,7 +138,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
138138
if (sqlca.sqlcode<0)sqlprint ( );}
139139
#line 38 "rnull.pgc"
140140

141-
{ECPGtrans(__LINE__,NULL,"commit");
141+
{ECPGtrans(__LINE__,NULL,"commit");
142142
#line 39 "rnull.pgc"
143143

144144
if (sqlca.sqlcode<0)sqlprint ( );}
@@ -182,7 +182,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
182182
if (sqlca.sqlcode<0)sqlprint ( );}
183183
#line 54 "rnull.pgc"
184184

185-
{ECPGtrans(__LINE__,NULL,"commit");
185+
{ECPGtrans(__LINE__,NULL,"commit");
186186
#line 55 "rnull.pgc"
187187

188188
if (sqlca.sqlcode<0)sqlprint ( );}
@@ -275,7 +275,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
275275
if (sqlca.sqlcode<0)sqlprint ( );}
276276
#line 91 "rnull.pgc"
277277

278-
{ECPGtrans(__LINE__,NULL,"commit");
278+
{ECPGtrans(__LINE__,NULL,"commit");
279279
#line 92 "rnull.pgc"
280280

281281
if (sqlca.sqlcode<0)sqlprint ( );}

‎src/interfaces/ecpg/test/expected/compat_informix-rnull.stderr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[NO_PID]: sqlca: code: 0, state: 00000
99
[NO_PID]: ecpg_execute on line 31: OK: CREATE TABLE
1010
[NO_PID]: sqlca: code: 0, state: 00000
11-
[NO_PID]: ECPGtrans on line 34: action "commit"; connection "regress1"
11+
[NO_PID]: ECPGtrans on line 34: action "commit"; connection "regress1"
1212
[NO_PID]: sqlca: code: 0, state: 00000
1313
[NO_PID]: ecpg_execute on line 36: query: insert into test ( id , c , s , i , b , f , l , dbl ) values ( 1 , $1 , $2 , $3 , $4 , $5 , $6 , $7 ) ; with 7 parameter(s) on connection regress1
1414
[NO_PID]: sqlca: code: 0, state: 00000
@@ -30,7 +30,7 @@
3030
[NO_PID]: sqlca: code: 0, state: 00000
3131
[NO_PID]: ecpg_execute on line 36: OK: INSERT 0 1
3232
[NO_PID]: sqlca: code: 0, state: 00000
33-
[NO_PID]: ECPGtrans on line 39: action "commit"; connection "regress1"
33+
[NO_PID]: ECPGtrans on line 39: action "commit"; connection "regress1"
3434
[NO_PID]: sqlca: code: 0, state: 00000
3535
[NO_PID]: ecpg_execute on line 52: query: insert into test ( id , c , s , i , b , f , l , dbl , dec , dat , tmp ) values ( 2 , $1 , $2 , $3 , $4 , $5 , $6 , $7 , $8 , $9 , $10 ) ; with 10 parameter(s) on connection regress1
3636
[NO_PID]: sqlca: code: 0, state: 00000
@@ -58,7 +58,7 @@
5858
[NO_PID]: sqlca: code: 0, state: 00000
5959
[NO_PID]: ecpg_execute on line 52: OK: INSERT 0 1
6060
[NO_PID]: sqlca: code: 0, state: 00000
61-
[NO_PID]: ECPGtrans on line 55: action "commit"; connection "regress1"
61+
[NO_PID]: ECPGtrans on line 55: action "commit"; connection "regress1"
6262
[NO_PID]: sqlca: code: 0, state: 00000
6363
[NO_PID]: ecpg_execute on line 59: query: select c , s , i , b , f , l , dbl , dec , dat , tmp from test where id = 1 ; with 0 parameter(s) on connection regress1
6464
[NO_PID]: sqlca: code: 0, state: 00000
@@ -118,7 +118,7 @@
118118
[NO_PID]: sqlca: code: 0, state: 00000
119119
[NO_PID]: ecpg_execute on line 91: OK: DROP TABLE
120120
[NO_PID]: sqlca: code: 0, state: 00000
121-
[NO_PID]: ECPGtrans on line 92: action "commit"; connection "regress1"
121+
[NO_PID]: ECPGtrans on line 92: action "commit"; connection "regress1"
122122
[NO_PID]: sqlca: code: 0, state: 00000
123123
[NO_PID]: ecpg_finish: connection regress1 closed
124124
[NO_PID]: sqlca: code: 0, state: 00000

‎src/interfaces/ecpg/test/expected/compat_informix-test_informix.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
7474
if (sqlca.sqlcode<0)dosqlprint ( );}
7575
#line 27 "test_informix.pgc"
7676

77-
{ECPGtrans(__LINE__,NULL,"commit");
77+
{ECPGtrans(__LINE__,NULL,"commit");
7878
#line 28 "test_informix.pgc"
7979

8080
if (sqlca.sqlcode<0)dosqlprint ( );}
@@ -89,7 +89,7 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
8989
#line 31 "test_informix.pgc"
9090

9191
printf("INSERT: %ld=%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
92-
if (sqlca.sqlcode!=0) {ECPGtrans(__LINE__,NULL,"rollback");
92+
if (sqlca.sqlcode!=0) {ECPGtrans(__LINE__,NULL,"rollback");
9393
#line 33 "test_informix.pgc"
9494

9595
if (sqlca.sqlcode<0)dosqlprint ( );}
@@ -104,7 +104,7 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
104104
if (sqlca.sqlcode<0)dosqlprint ( );}
105105
#line 35 "test_informix.pgc"
106106

107-
{ECPGtrans(__LINE__,NULL,"commit");
107+
{ECPGtrans(__LINE__,NULL,"commit");
108108
#line 36 "test_informix.pgc"
109109

110110
if (sqlca.sqlcode<0)dosqlprint ( );}
@@ -118,7 +118,7 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
118118
if (sqlca.sqlcode<0)dosqlprint ( );}
119119
#line 39 "test_informix.pgc"
120120

121-
{ECPGtrans(__LINE__,NULL,"rollback");
121+
{ECPGtrans(__LINE__,NULL,"rollback");
122122
#line 40 "test_informix.pgc"
123123

124124
if (sqlca.sqlcode<0)dosqlprint ( );}
@@ -133,7 +133,7 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
133133
#line 43 "test_informix.pgc"
134134

135135
printf("SELECT: %ld=%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
136-
if (sqlca.sqlcode!=0) {ECPGtrans(__LINE__,NULL,"rollback");
136+
if (sqlca.sqlcode!=0) {ECPGtrans(__LINE__,NULL,"rollback");
137137
#line 45 "test_informix.pgc"
138138

139139
if (sqlca.sqlcode<0)dosqlprint ( );}
@@ -203,7 +203,7 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
203203

204204
printf("Does not exist: %ld\n",sqlca.sqlcode);
205205

206-
{ECPGtrans(__LINE__,NULL,"commit");
206+
{ECPGtrans(__LINE__,NULL,"commit");
207207
#line 81 "test_informix.pgc"
208208

209209
if (sqlca.sqlcode<0)dosqlprint ( );}
@@ -215,7 +215,7 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
215215
if (sqlca.sqlcode<0)dosqlprint ( );}
216216
#line 82 "test_informix.pgc"
217217

218-
{ECPGtrans(__LINE__,NULL,"commit");
218+
{ECPGtrans(__LINE__,NULL,"commit");
219219
#line 83 "test_informix.pgc"
220220

221221
if (sqlca.sqlcode<0)dosqlprint ( );}

‎src/interfaces/ecpg/test/expected/compat_informix-test_informix.stderr‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
[NO_PID]: sqlca: code: 0, state: 00000
1717
[NO_PID]: ecpg_execute on line 27: OK: INSERT 0 1
1818
[NO_PID]: sqlca: code: 0, state: 00000
19-
[NO_PID]: ECPGtrans on line 28: action "commit"; connection "regress1"
19+
[NO_PID]: ECPGtrans on line 28: action "commit"; connection "regress1"
2020
[NO_PID]: sqlca: code: 0, state: 00000
2121
[NO_PID]: ecpg_execute on line 31: query: insert into test ( i , j ) values ( 7 , 12 ) ; with 0 parameter(s) on connection regress1
2222
[NO_PID]: sqlca: code: 0, state: 00000
@@ -26,7 +26,7 @@
2626
[NO_PID]: sqlca: code: 0, state: 00000
2727
[NO_PID]: raising sqlstate 23505 (sqlcode -239) on line 31: duplicate key value violates unique constraint "test_pkey" on line 31
2828
[NO_PID]: sqlca: code: -239, state: 23505
29-
[NO_PID]: ECPGtrans on line 33: action "rollback"; connection "regress1"
29+
[NO_PID]: ECPGtrans on line 33: action "rollback"; connection "regress1"
3030
[NO_PID]: sqlca: code: 0, state: 00000
3131
[NO_PID]: ecpg_execute on line 35: query: insert into test ( i , j ) values ( $1 , 1 ) ; with 1 parameter(s) on connection regress1
3232
[NO_PID]: sqlca: code: 0, state: 00000
@@ -36,7 +36,7 @@
3636
[NO_PID]: sqlca: code: 0, state: 00000
3737
[NO_PID]: ecpg_execute on line 35: OK: INSERT 0 1
3838
[NO_PID]: sqlca: code: 0, state: 00000
39-
[NO_PID]: ECPGtrans on line 36: action "commit"; connection "regress1"
39+
[NO_PID]: ECPGtrans on line 36: action "commit"; connection "regress1"
4040
[NO_PID]: sqlca: code: 0, state: 00000
4141
[NO_PID]: ecpg_execute on line 39: query: select i from test where j = ( select j from test ) ; with 0 parameter(s) on connection regress1
4242
[NO_PID]: sqlca: code: 0, state: 00000
@@ -46,7 +46,7 @@
4646
[NO_PID]: sqlca: code: 0, state: 00000
4747
[NO_PID]: raising sqlstate 21000 (sqlcode -284) on line 39: more than one row returned by a subquery used as an expression on line 39
4848
[NO_PID]: sqlca: code: -284, state: 21000
49-
[NO_PID]: ECPGtrans on line 40: action "rollback"; connection "regress1"
49+
[NO_PID]: ECPGtrans on line 40: action "rollback"; connection "regress1"
5050
[NO_PID]: sqlca: code: 0, state: 00000
5151
[NO_PID]: ecpg_execute on line 43: query: select i from test where j = ( select j from test order by i limit 1 ) ; with 0 parameter(s) on connection regress1
5252
[NO_PID]: sqlca: code: 0, state: 00000
@@ -114,15 +114,15 @@
114114
[NO_PID]: sqlca: code: 0, state: 00000
115115
[NO_PID]: raising sqlcode 100 on line 78: no data found on line 78
116116
[NO_PID]: sqlca: code: 100, state: 02000
117-
[NO_PID]: ECPGtrans on line 81: action "commit"; connection "regress1"
117+
[NO_PID]: ECPGtrans on line 81: action "commit"; connection "regress1"
118118
[NO_PID]: sqlca: code: 0, state: 00000
119119
[NO_PID]: ecpg_execute on line 82: query: drop table test ; with 0 parameter(s) on connection regress1
120120
[NO_PID]: sqlca: code: 0, state: 00000
121121
[NO_PID]: ecpg_execute on line 82: using PQexec
122122
[NO_PID]: sqlca: code: 0, state: 00000
123123
[NO_PID]: ecpg_execute on line 82: OK: DROP TABLE
124124
[NO_PID]: sqlca: code: 0, state: 00000
125-
[NO_PID]: ECPGtrans on line 83: action "commit"; connection "regress1"
125+
[NO_PID]: ECPGtrans on line 83: action "commit"; connection "regress1"
126126
[NO_PID]: sqlca: code: 0, state: 00000
127127
[NO_PID]: ecpg_finish: connection regress1 closed
128128
[NO_PID]: sqlca: code: 0, state: 00000

‎src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ static void sql_check(char *fn, char *caller, int ignore)
114114
printf("%s\n",errorstring);
115115

116116
/* attempt a ROLLBACK */
117-
{ECPGtrans(__LINE__,NULL,"rollback");}
117+
{ECPGtrans(__LINE__,NULL,"rollback");}
118118
#line 27 "test_informix2.pgc"
119119

120120

@@ -157,7 +157,7 @@ int main(void)
157157
timestampmaxd ;
158158

159159
#line 53 "test_informix2.pgc"
160-
chardbname [30 ] ;
160+
chardbname[30 ] ;
161161
/* exec sql end declare section */
162162
#line 54 "test_informix2.pgc"
163163

@@ -245,7 +245,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
245245

246246
sql_check("main","update",0);
247247

248-
{ECPGtrans(__LINE__,NULL,"commit");
248+
{ECPGtrans(__LINE__,NULL,"commit");
249249
#line 100 "test_informix2.pgc"
250250

251251
if (sqlca.sqlcode<0)sqlprint();}
@@ -260,7 +260,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
260260

261261
sql_check("main","drop",0);
262262

263-
{ECPGtrans(__LINE__,NULL,"commit");
263+
{ECPGtrans(__LINE__,NULL,"commit");
264264
#line 105 "test_informix2.pgc"
265265

266266
if (sqlca.sqlcode<0)sqlprint();}

‎src/interfaces/ecpg/test/expected/compat_informix-test_informix2.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@
5050
[NO_PID]: sqlca: code: 0, state: 00000
5151
[NO_PID]: ecpg_execute on line 95: OK: INSERT 0 1
5252
[NO_PID]: sqlca: code: 0, state: 00000
53-
[NO_PID]: ECPGtrans on line 100: action "commit"; connection "regress1"
53+
[NO_PID]: ECPGtrans on line 100: action "commit"; connection "regress1"
5454
[NO_PID]: sqlca: code: 0, state: 00000
5555
[NO_PID]: ecpg_execute on line 102: query: drop table history ; with 0 parameter(s) on connection regress1
5656
[NO_PID]: sqlca: code: 0, state: 00000
5757
[NO_PID]: ecpg_execute on line 102: using PQexec
5858
[NO_PID]: sqlca: code: 0, state: 00000
5959
[NO_PID]: ecpg_execute on line 102: OK: DROP TABLE
6060
[NO_PID]: sqlca: code: 0, state: 00000
61-
[NO_PID]: ECPGtrans on line 105: action "commit"; connection "regress1"
61+
[NO_PID]: ECPGtrans on line 105: action "commit"; connection "regress1"
6262
[NO_PID]: sqlca: code: 0, state: 00000
6363
[NO_PID]: ecpg_finish: connection regress1 closed
6464
[NO_PID]: sqlca: code: 0, state: 00000

‎src/interfaces/ecpg/test/expected/connect-test1.c.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ main(void)
2626

2727

2828
#line 16 "test1.pgc"
29-
char db [ 200 ] ;
29+
char db[ 200 ] ;
3030

3131
#line 17 "test1.pgc"
32-
char pw [ 200 ] ;
32+
char pw[ 200 ] ;
3333
/* exec sql end declare section */
3434
#line 18 "test1.pgc"
3535

@@ -39,7 +39,7 @@ main(void)
3939
{ ECPGconnect(__LINE__, 0, "connectdb" , NULL, NULL , "main", 0); }
4040
#line 22 "test1.pgc"
4141

42-
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "alter user connectuser encrypted password 'connectpw'", ECPGt_EOIT, ECPGt_EORT);}
42+
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "alter user connectuserencrypted password 'connectpw'", ECPGt_EOIT, ECPGt_EORT);}
4343
#line 23 "test1.pgc"
4444

4545
{ ECPGdisconnect(__LINE__, "CURRENT");}

‎src/interfaces/ecpg/test/expected/connect-test1.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[NO_PID]: sqlca: code: 0, state: 00000
33
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT>
44
[NO_PID]: sqlca: code: 0, state: 00000
5-
[NO_PID]: ecpg_execute on line 23: query: alter user connectuser encrypted password 'connectpw'; with 0 parameter(s) on connection main
5+
[NO_PID]: ecpg_execute on line 23: query: alter user connectuserencrypted password 'connectpw'; with 0 parameter(s) on connection main
66
[NO_PID]: sqlca: code: 0, state: 00000
77
[NO_PID]: ecpg_execute on line 23: using PQexec
88
[NO_PID]: sqlca: code: 0, state: 00000

‎src/interfaces/ecpg/test/expected/connect-test2.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ main(void)
3636

3737

3838
#line 17 "test2.pgc"
39-
charid [200 ] ;
39+
charid[200 ] ;
4040

4141
#line 18 "test2.pgc"
42-
charres [200 ] ;
42+
charres[200 ] ;
4343
/* exec sql end declare section */
4444
#line 19 "test2.pgc"
4545

@@ -55,17 +55,17 @@ main(void)
5555

5656

5757
/* this selects from "second" which was opened last */
58-
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"select current_database () ",ECPGt_EOIT,
58+
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"select current_database () ",ECPGt_EOIT,
5959
ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char),
6060
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EORT);}
6161
#line 28 "test2.pgc"
6262

63-
{ECPGdo(__LINE__,0,1,"first",0,ECPGst_normal,"select current_database () ",ECPGt_EOIT,
63+
{ECPGdo(__LINE__,0,1,"first",0,ECPGst_normal,"select current_database () ",ECPGt_EOIT,
6464
ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char),
6565
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EORT);}
6666
#line 29 "test2.pgc"
6767

68-
{ECPGdo(__LINE__,0,1,"second",0,ECPGst_normal,"select current_database () ",ECPGt_EOIT,
68+
{ECPGdo(__LINE__,0,1,"second",0,ECPGst_normal,"select current_database () ",ECPGt_EOIT,
6969
ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char),
7070
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EORT);}
7171
#line 30 "test2.pgc"
@@ -74,7 +74,7 @@ main(void)
7474
{ECPGsetconn(__LINE__,"first");}
7575
#line 32 "test2.pgc"
7676

77-
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"select current_database () ",ECPGt_EOIT,
77+
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"select current_database () ",ECPGt_EOIT,
7878
ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char),
7979
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EORT);}
8080
#line 33 "test2.pgc"
@@ -84,7 +84,7 @@ main(void)
8484
{ECPGdisconnect(__LINE__,"CURRENT");}
8585
#line 36 "test2.pgc"
8686

87-
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"select current_database () ",ECPGt_EOIT,
87+
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"select current_database () ",ECPGt_EOIT,
8888
ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char),
8989
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EORT);}
9090
#line 37 "test2.pgc"

0 commit comments

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