Skip to content

Commit a3ec44a

Browse files
author
Michael Meskes
committed
Commit old versions into main branch again.
Michael
1 parent 9786223 commit a3ec44a

File tree

3 files changed

+119
-207
lines changed

3 files changed

+119
-207
lines changed

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.51 2002/06/30 09:34:13 meskes Exp $
11+
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.52 2002/07/01 06:56:10 meskes Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -44,7 +44,6 @@ static ScanKeyword ScanKeywords[] = {
4444
{"as", AS},
4545
{"asc", ASC},
4646
{"assertion", ASSERTION},
47-
{"assignment", ASSIGNMENT},
4847
{"at", AT},
4948
{"authorization", AUTHORIZATION},
5049
{"backward", BACKWARD},
@@ -99,7 +98,6 @@ static ScanKeyword ScanKeywords[] = {
9998
{"deferred", DEFERRED},
10099
{"definer", DEFINER},
101100
{"delete", DELETE_P},
102-
{"delimiter", DELIMITER},
103101
{"delimiters", DELIMITERS},
104102
{"desc", DESC},
105103
{"distinct", DISTINCT},
@@ -173,8 +171,6 @@ static ScanKeyword ScanKeywords[] = {
173171
{"listen", LISTEN},
174172
{"load", LOAD},
175173
{"local", LOCAL},
176-
{"localtime", LOCALTIME},
177-
{"localtimestamp", LOCALTIMESTAMP},
178174
{"location", LOCATION},
179175
{"lock", LOCK_P},
180176
{"match", MATCH},
@@ -215,13 +211,11 @@ static ScanKeyword ScanKeywords[] = {
215211
{"out", OUT_P},
216212
{"outer", OUTER_P},
217213
{"overlaps", OVERLAPS},
218-
{"overlay", OVERLAY},
219214
{"owner", OWNER},
220215
{"partial", PARTIAL},
221216
{"password", PASSWORD},
222217
{"path", PATH_P},
223218
{"pendant", PENDANT},
224-
{"placing", PLACING},
225219
{"position", POSITION},
226220
{"precision", PRECISION},
227221
{"primary", PRIMARY},
@@ -257,8 +251,6 @@ static ScanKeyword ScanKeywords[] = {
257251
{"setof", SETOF},
258252
{"share", SHARE},
259253
{"show", SHOW},
260-
{"similar", SIMILAR},
261-
{"simple", SIMPLE},
262254
{"smallint", SMALLINT},
263255
{"some", SOME},
264256
{"stable", STABLE},
@@ -300,7 +292,6 @@ static ScanKeyword ScanKeywords[] = {
300292
{"using", USING},
301293
{"vacuum", VACUUM},
302294
{"valid", VALID},
303-
{"validator", VALIDATOR},
304295
{"values", VALUES},
305296
{"varchar", VARCHAR},
306297
{"varying", VARYING},
@@ -313,7 +304,6 @@ static ScanKeyword ScanKeywords[] = {
313304
{"with", WITH},
314305
{"without", WITHOUT},
315306
{"work", WORK},
316-
{"write", WRITE},
317307
{"year", YEAR_P},
318308
{"zone", ZONE},
319309
};

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*
1414
* IDENTIFICATION
15-
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.95 2002/06/30 09:34:13 meskes Exp $
15+
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.96 2002/07/01 06:56:10 meskes Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -89,14 +89,14 @@ static struct _if_value
8989
* We use exclusive states for quoted strings, extended comments,
9090
* and to eliminate parsing troubles for numeric strings.
9191
* Exclusive states:
92-
* <xb> bit string literal
92+
* <xbit> bit string literal
9393
* <xc> extended C-style comments - thomas 1997-07-12
9494
* <xd> delimited identifiers (double-quoted identifiers) - thomas 1997-10-27
9595
* <xh> hexadecimal numeric string - thomas 1997-11-16
9696
* <xq> quoted strings - thomas 1997-07-30
9797
*/
9898

99-
%x xb
99+
%x xbit
100100
%x xc
101101
%x xd
102102
%x xdc
@@ -108,10 +108,10 @@ static struct _if_value
108108

109109
/* Bit string
110110
*/
111-
xbstart [bB]{quote}
112-
xbstop {quote}
113-
xbinside [^']*
114-
xbcat {quote}{whitespace_with_newline}{quote}
111+
xbitstart [bB]{quote}
112+
xbitstop {quote}
113+
xbitinside [^']*
114+
xbitcat {quote}{whitespace_with_newline}{quote}
115115

116116
/* Hexadecimal number
117117
*/
@@ -318,13 +318,13 @@ cppline {space}*#(.*\\{space})*.*
318318

319319
<xc><<EOF>> { mmerror(PARSE_ERROR, ET_ERROR, "Unterminated /* comment"); }
320320

321-
<SQL>{xbstart} {
321+
<SQL>{xbitstart} {
322322
token_start = yytext;
323-
BEGIN(xb);
323+
BEGIN(xbit);
324324
startlit();
325325
addlitchar('b');
326326
}
327-
<xb>{xbstop} {
327+
<xbit>{xbitstop} {
328328
BEGIN(SQL);
329329
if (literalbuf[strspn(literalbuf, "01") + 1] != '\0')
330330
mmerror(PARSE_ERROR, ET_ERROR, "invalid bit string input.");
@@ -333,10 +333,10 @@ cppline {space}*#(.*\\{space})*.*
333333
}
334334

335335
<xh>{xhinside} |
336-
<xb>{xbinside} { addlit(yytext, yyleng); }
336+
<xbit>{xbitinside} { addlit(yytext, yyleng); }
337337
<xh>{xhcat} |
338-
<xb>{xbcat} { /* ignore */ }
339-
<xb><<EOF>> { mmerror(PARSE_ERROR, ET_ERROR, "Unterminated bit string"); }
338+
<xbit>{xbitcat} { /* ignore */ }
339+
<xbit><<EOF>> { mmerror(PARSE_ERROR, ET_ERROR, "Unterminated bit string"); }
340340

341341
<SQL>{xhstart} {
342342
token_start = yytext;
@@ -378,7 +378,7 @@ cppline {space}*#(.*\\{space})*.*
378378
<xq>{xqdouble} { addlitchar('\''); }
379379
<xq>{xqinside} { addlit(yytext, yyleng); }
380380
<xq>{xqescape} { addlit(yytext, yyleng); }
381-
<xq>{xqoctesc} { addlit(yytext, yyleng); } /* addlitchar does not work here since character must remain octal */
381+
<xq>{xqoctesc} { addlit(yytext, yyleng); }
382382
<xq>{xqcat} { /* ignore */ }
383383

384384
<xq><<EOF>> { mmerror(PARSE_ERROR, ET_ERROR, "Unterminated quoted string"); }

0 commit comments

Comments
 (0)