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

Commit92fb649

Browse files
committed
Use "%option prefix" to set API names in ecpg's lexer.
Clean up some technical debt left behind by commit72b1e3a: instead ofquickly hacking the name of base_yylex() with a #define, set it properlywith "%option prefix". This causes the names of pgc.l's other exportedsymbols to change as well, so run around and modify the outside referencesto them as needed. Similarly, make pgc.l's external references tobase_yylval use that variable's true name instead of a macro.The reason for doing this now is that the quick-hack solution will failwith future versions of flex, as reported by Дилян Палаузов.Hence, back-patch into 9.6 where the previous commit appeared, sinceit's likely people will build 9.6 with newer flex versions duringits lifetime.Discussion:https://postgr.es/m/d845c1af-e18d-6651-178f-9f08cdf37e10@aegee.org
1 parent0eaaaf0 commit92fb649

File tree

10 files changed

+138
-144
lines changed

10 files changed

+138
-144
lines changed

‎src/interfaces/ecpg/preproc/descriptor.c

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ ECPGnumeric_lvalue(char *name)
5858
caseECPGt_unsigned_long:
5959
caseECPGt_unsigned_long_long:
6060
caseECPGt_const:
61-
fputs(name,yyout);
61+
fputs(name,base_yyout);
6262
break;
6363
default:
6464
mmerror(PARSE_ERROR,ET_ERROR,"variable \"%s\" must have a numeric type",name);
@@ -152,7 +152,7 @@ output_get_descr_header(char *desc_name)
152152
{
153153
structassignment*results;
154154

155-
fprintf(yyout,"{ ECPGget_desc_header(__LINE__, %s, &(",desc_name);
155+
fprintf(base_yyout,"{ ECPGget_desc_header(__LINE__, %s, &(",desc_name);
156156
for (results=assignments;results!=NULL;results=results->next)
157157
{
158158
if (results->value==ECPGd_count)
@@ -162,7 +162,7 @@ output_get_descr_header(char *desc_name)
162162
}
163163

164164
drop_assignments();
165-
fprintf(yyout,"));\n");
165+
fprintf(base_yyout,"));\n");
166166
whenever_action(3);
167167
}
168168

@@ -171,7 +171,7 @@ output_get_descr(char *desc_name, char *index)
171171
{
172172
structassignment*results;
173173

174-
fprintf(yyout,"{ ECPGget_desc(__LINE__, %s, %s,",desc_name,index);
174+
fprintf(base_yyout,"{ ECPGget_desc(__LINE__, %s, %s,",desc_name,index);
175175
for (results=assignments;results!=NULL;results=results->next)
176176
{
177177
conststructvariable*v=find_variable(results->variable);
@@ -188,12 +188,13 @@ output_get_descr(char *desc_name, char *index)
188188
default:
189189
break;
190190
}
191-
fprintf(yyout,"%s,",get_dtype(results->value));
192-
ECPGdump_a_type(yyout,v->name,v->type,v->brace_level,NULL,NULL,-1,NULL,NULL,str_zero,NULL,NULL);
191+
fprintf(base_yyout,"%s,",get_dtype(results->value));
192+
ECPGdump_a_type(base_yyout,v->name,v->type,v->brace_level,
193+
NULL,NULL,-1,NULL,NULL,str_zero,NULL,NULL);
193194
free(str_zero);
194195
}
195196
drop_assignments();
196-
fputs("ECPGd_EODT);\n",yyout);
197+
fputs("ECPGd_EODT);\n",base_yyout);
197198

198199
whenever_action(2 |1);
199200
}
@@ -203,7 +204,7 @@ output_set_descr_header(char *desc_name)
203204
{
204205
structassignment*results;
205206

206-
fprintf(yyout,"{ ECPGset_desc_header(__LINE__, %s, (int)(",desc_name);
207+
fprintf(base_yyout,"{ ECPGset_desc_header(__LINE__, %s, (int)(",desc_name);
207208
for (results=assignments;results!=NULL;results=results->next)
208209
{
209210
if (results->value==ECPGd_count)
@@ -213,7 +214,7 @@ output_set_descr_header(char *desc_name)
213214
}
214215

215216
drop_assignments();
216-
fprintf(yyout,"));\n");
217+
fprintf(base_yyout,"));\n");
217218
whenever_action(3);
218219
}
219220

@@ -264,7 +265,7 @@ output_set_descr(char *desc_name, char *index)
264265
{
265266
structassignment*results;
266267

267-
fprintf(yyout,"{ ECPGset_desc(__LINE__, %s, %s,",desc_name,index);
268+
fprintf(base_yyout,"{ ECPGset_desc(__LINE__, %s, %s,",desc_name,index);
268269
for (results=assignments;results!=NULL;results=results->next)
269270
{
270271
conststructvariable*v=find_variable(results->variable);
@@ -297,8 +298,9 @@ output_set_descr(char *desc_name, char *index)
297298
{
298299
char*str_zero=mm_strdup("0");
299300

300-
fprintf(yyout,"%s,",get_dtype(results->value));
301-
ECPGdump_a_type(yyout,v->name,v->type,v->brace_level,NULL,NULL,-1,NULL,NULL,str_zero,NULL,NULL);
301+
fprintf(base_yyout,"%s,",get_dtype(results->value));
302+
ECPGdump_a_type(base_yyout,v->name,v->type,v->brace_level,
303+
NULL,NULL,-1,NULL,NULL,str_zero,NULL,NULL);
302304
free(str_zero);
303305
}
304306
break;
@@ -308,7 +310,7 @@ output_set_descr(char *desc_name, char *index)
308310
}
309311
}
310312
drop_assignments();
311-
fputs("ECPGd_EODT);\n",yyout);
313+
fputs("ECPGd_EODT);\n",base_yyout);
312314

313315
whenever_action(2 |1);
314316
}

‎src/interfaces/ecpg/preproc/ecpg.addons

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ECPG: stmtClosePortalStmt block
88
if (connection)
99
mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in CLOSE DATABASE statement");
1010

11-
fprintf(yyout, "{ ECPGdisconnect(__LINE__, \"CURRENT\");");
11+
fprintf(base_yyout, "{ ECPGdisconnect(__LINE__, \"CURRENT\");");
1212
whenever_action(2);
1313
free($1);
1414
break;
@@ -42,14 +42,14 @@ ECPG: stmtPrepareStmt block
4242
}
4343
ECPG: stmtTransactionStmt block
4444
{
45-
fprintf(yyout, "{ ECPGtrans(__LINE__, %s, \"%s\");", connection ? connection : "NULL", $1);
45+
fprintf(base_yyout, "{ ECPGtrans(__LINE__, %s, \"%s\");", connection ? connection : "NULL", $1);
4646
whenever_action(2);
4747
free($1);
4848
}
4949
ECPG: stmtViewStmt rule
5050
| ECPGAllocateDescr
5151
{
52-
fprintf(yyout,"ECPGallocate_desc(__LINE__, %s);",$1);
52+
fprintf(base_yyout,"ECPGallocate_desc(__LINE__, %s);",$1);
5353
whenever_action(0);
5454
free($1);
5555
}
@@ -58,7 +58,7 @@ ECPG: stmtViewStmt rule
5858
if (connection)
5959
mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in CONNECT statement");
6060

61-
fprintf(yyout, "{ ECPGconnect(__LINE__, %d, %s, %d); ", compat, $1, autocommit);
61+
fprintf(base_yyout, "{ ECPGconnect(__LINE__, %d, %s, %d); ", compat, $1, autocommit);
6262
reset_variables();
6363
whenever_action(2);
6464
free($1);
@@ -69,7 +69,7 @@ ECPG: stmtViewStmt rule
6969
}
7070
| ECPGDeallocateDescr
7171
{
72-
fprintf(yyout,"ECPGdeallocate_desc(__LINE__, %s);",$1);
72+
fprintf(base_yyout,"ECPGdeallocate_desc(__LINE__, %s);",$1);
7373
whenever_action(0);
7474
free($1);
7575
}
@@ -79,10 +79,10 @@ ECPG: stmtViewStmt rule
7979
}
8080
| ECPGDescribe
8181
{
82-
fprintf(yyout, "{ ECPGdescribe(__LINE__, %d, %s,", compat, $1);
82+
fprintf(base_yyout, "{ ECPGdescribe(__LINE__, %d, %s,", compat, $1);
8383
dump_variables(argsresult, 1);
84-
fputs("ECPGt_EORT);",yyout);
85-
fprintf(yyout, "}");
84+
fputs("ECPGt_EORT);",base_yyout);
85+
fprintf(base_yyout, "}");
8686
output_line_number();
8787

8888
free($1);
@@ -92,7 +92,7 @@ ECPG: stmtViewStmt rule
9292
if (connection)
9393
mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in DISCONNECT statement");
9494

95-
fprintf(yyout, "{ ECPGdisconnect(__LINE__, %s);",
95+
fprintf(base_yyout, "{ ECPGdisconnect(__LINE__, %s);",
9696
$1 ? $1 : "\"CURRENT\"");
9797
whenever_action(2);
9898
free($1);
@@ -103,11 +103,11 @@ ECPG: stmtViewStmt rule
103103
const char *con = connection ? connection : "NULL";
104104

105105
if (strcmp($1, "all") == 0)
106-
fprintf(yyout, "{ ECPGdeallocate_all(__LINE__, %d, %s);", compat, con);
106+
fprintf(base_yyout, "{ ECPGdeallocate_all(__LINE__, %d, %s);", compat, con);
107107
else if ($1[0] == ':')
108-
fprintf(yyout, "{ ECPGdeallocate(__LINE__, %d, %s, %s);", compat, con, $1+1);
108+
fprintf(base_yyout, "{ ECPGdeallocate(__LINE__, %d, %s, %s);", compat, con, $1+1);
109109
else
110-
fprintf(yyout, "{ ECPGdeallocate(__LINE__, %d, %s, \"%s\");", compat, con, $1);
110+
fprintf(base_yyout, "{ ECPGdeallocate(__LINE__, %d, %s, \"%s\");", compat, con, $1);
111111

112112
whenever_action(2);
113113
free($1);
@@ -138,7 +138,7 @@ ECPG: stmtViewStmt rule
138138
}
139139
| ECPGSetAutocommit
140140
{
141-
fprintf(yyout, "{ ECPGsetcommit(__LINE__, \"%s\", %s);", $1, connection ? connection : "NULL");
141+
fprintf(base_yyout, "{ ECPGsetcommit(__LINE__, \"%s\", %s);", $1, connection ? connection : "NULL");
142142
whenever_action(2);
143143
free($1);
144144
}
@@ -147,7 +147,7 @@ ECPG: stmtViewStmt rule
147147
if (connection)
148148
mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in SET CONNECTION statement");
149149

150-
fprintf(yyout, "{ ECPGsetconn(__LINE__, %s);", $1);
150+
fprintf(base_yyout, "{ ECPGsetconn(__LINE__, %s);", $1);
151151
whenever_action(2);
152152
free($1);
153153
}
@@ -169,7 +169,7 @@ ECPG: stmtViewStmt rule
169169
if (connection)
170170
mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in TYPE statement");
171171

172-
fprintf(yyout, "%s", $1);
172+
fprintf(base_yyout, "%s", $1);
173173
free($1);
174174
output_line_number();
175175
}

‎src/interfaces/ecpg/preproc/ecpg.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@ main(int argc, char *const argv[])
165165
case'o':
166166
output_filename=mm_strdup(optarg);
167167
if (strcmp(output_filename,"-")==0)
168-
yyout=stdout;
168+
base_yyout=stdout;
169169
else
170-
yyout=fopen(output_filename,PG_BINARY_W);
170+
base_yyout=fopen(output_filename,PG_BINARY_W);
171171

172-
if (yyout==NULL)
172+
if (base_yyout==NULL)
173173
{
174174
fprintf(stderr,_("%s: could not open file \"%s\": %s\n"),
175175
progname,output_filename,strerror(errno));
@@ -232,7 +232,7 @@ main(int argc, char *const argv[])
232232
break;
233233
case'd':
234234
#ifdefYYDEBUG
235-
yydebug=1;
235+
base_yydebug=1;
236236
#else
237237
fprintf(stderr,_("%s: parser debug support (-d) not available\n"),
238238
progname);
@@ -280,7 +280,7 @@ main(int argc, char *const argv[])
280280
{
281281
input_filename=mm_alloc(strlen("stdin")+1);
282282
strcpy(input_filename,"stdin");
283-
yyin=stdin;
283+
base_yyin=stdin;
284284
}
285285
else
286286
{
@@ -304,13 +304,13 @@ main(int argc, char *const argv[])
304304
ptr2ext[4]='\0';
305305
}
306306

307-
yyin=fopen(input_filename,PG_BINARY_R);
307+
base_yyin=fopen(input_filename,PG_BINARY_R);
308308
}
309309

310310
if (out_option==0)/* calculate the output name */
311311
{
312312
if (strcmp(input_filename,"stdin")==0)
313-
yyout=stdout;
313+
base_yyout=stdout;
314314
else
315315
{
316316
output_filename=mm_strdup(input_filename);
@@ -320,8 +320,8 @@ main(int argc, char *const argv[])
320320
ptr2ext[1]= (header_mode== true) ?'h' :'c';
321321
ptr2ext[2]='\0';
322322

323-
yyout=fopen(output_filename,PG_BINARY_W);
324-
if (yyout==NULL)
323+
base_yyout=fopen(output_filename,PG_BINARY_W);
324+
if (base_yyout==NULL)
325325
{
326326
fprintf(stderr,_("%s: could not open file \"%s\": %s\n"),
327327
progname,output_filename,strerror(errno));
@@ -332,7 +332,7 @@ main(int argc, char *const argv[])
332332
}
333333
}
334334

335-
if (yyin==NULL)
335+
if (base_yyin==NULL)
336336
fprintf(stderr,_("%s: could not open file \"%s\": %s\n"),
337337
progname,argv[fnr],strerror(errno));
338338
else
@@ -427,23 +427,23 @@ main(int argc, char *const argv[])
427427
/* we need several includes */
428428
/* but not if we are in header mode */
429429
if (regression_mode)
430-
fprintf(yyout,"/* Processed by ecpg (regression mode) */\n");
430+
fprintf(base_yyout,"/* Processed by ecpg (regression mode) */\n");
431431
else
432-
fprintf(yyout,"/* Processed by ecpg (%s) */\n",PG_VERSION);
432+
fprintf(base_yyout,"/* Processed by ecpg (%s) */\n",PG_VERSION);
433433

434434
if (header_mode== false)
435435
{
436-
fprintf(yyout,"/* These include files are added by the preprocessor */\n#include <ecpglib.h>\n#include <ecpgerrno.h>\n#include <sqlca.h>\n");
436+
fprintf(base_yyout,"/* These include files are added by the preprocessor */\n#include <ecpglib.h>\n#include <ecpgerrno.h>\n#include <sqlca.h>\n");
437437

438438
/* add some compatibility headers */
439439
if (INFORMIX_MODE)
440-
fprintf(yyout,"/* Needed for informix compatibility */\n#include <ecpg_informix.h>\n");
440+
fprintf(base_yyout,"/* Needed for informix compatibility */\n#include <ecpg_informix.h>\n");
441441

442-
fprintf(yyout,"/* End of automatic include section */\n");
442+
fprintf(base_yyout,"/* End of automatic include section */\n");
443443
}
444444

445445
if (regression_mode)
446-
fprintf(yyout,"#define ECPGdebug(X,Y) ECPGdebug((X)+100,(Y))\n");
446+
fprintf(base_yyout,"#define ECPGdebug(X,Y) ECPGdebug((X)+100,(Y))\n");
447447

448448
output_line_number();
449449

@@ -458,10 +458,10 @@ main(int argc, char *const argv[])
458458
if (!(ptr->opened))
459459
mmerror(PARSE_ERROR,ET_WARNING,"cursor \"%s\" has been declared but not opened",ptr->name);
460460

461-
if (yyin!=NULL&&yyin!=stdin)
462-
fclose(yyin);
463-
if (out_option==0&&yyout!=stdout)
464-
fclose(yyout);
461+
if (base_yyin!=NULL&&base_yyin!=stdin)
462+
fclose(base_yyin);
463+
if (out_option==0&&base_yyout!=stdout)
464+
fclose(base_yyout);
465465

466466
/*
467467
* If there was an error, delete the output file.

‎src/interfaces/ecpg/preproc/ecpg.header

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ vmmerror(int error_code, enum errortype type, const char *error, va_list ap)
7272
/* localize the error message string */
7373
error = _(error);
7474

75-
fprintf(stderr, "%s:%d: ", input_filename,yylineno);
75+
fprintf(stderr, "%s:%d: ", input_filename,base_yylineno);
7676

7777
switch(type)
7878
{
@@ -117,10 +117,10 @@ mmfatal(int error_code, const char *error, ...)
117117
vmmerror(error_code, ET_ERROR, error, ap);
118118
va_end(ap);
119119

120-
if (yyin)
121-
fclose(yyin);
122-
if (yyout)
123-
fclose(yyout);
120+
if (base_yyin)
121+
fclose(base_yyin);
122+
if (base_yyout)
123+
fclose(base_yyout);
124124

125125
if (strcmp(output_filename, "-") != 0 && unlink(output_filename) != 0)
126126
fprintf(stderr, _("could not remove output file \"%s\"\n"), output_filename);
@@ -195,7 +195,7 @@ make3_str(char *str1, char *str2, char *str3)
195195
static char *
196196
make_name(void)
197197
{
198-
return mm_strdup(yytext);
198+
return mm_strdup(base_yytext);
199199
}
200200

201201
static char *

0 commit comments

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