Skip to content

Commit f35ced3

Browse files
author
Michael Meskes
committed
- Fixed reduce/reduce conflict in parser.
 - Synced preproc.y with gram.y. - Synced pgc.l with scan.l. - Synced keywords.c.
1 parent f76bc9c commit f35ced3

File tree

5 files changed

+310
-169
lines changed

5 files changed

+310
-169
lines changed

‎src/interfaces/ecpg/ChangeLog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,6 +1247,13 @@ Sun Apr 28 19:16:40 CEST 2002
12471247

12481248
- Synced preproc.y with gram.y.
12491249
- Fixed typo in comment printed by ecpg.
1250+
1251+
Sun May 19 19:21:34 CEST 2002
1252+
1253+
- Fixed reduce/reduce conflict in parser.
1254+
- Synced preproc.y with gram.y.
1255+
- Synced pgc.l with scan.l.
1256+
- Synced keywords.c.
12501257
- Set ecpg version to 2.10.0.
12511258
- Set library version to 3.4.0.
12521259

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* lexical token lookup for reserved words in postgres embedded SQL
55
*
66
* IDENTIFICATION
7-
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/ecpg_keywords.c,v 1.25 2001/09/19 14:09:32 meskes Exp $
7+
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/ecpg_keywords.c,v 1.26 2002/05/19 20:00:53 meskes Exp $
88
*
99
*-------------------------------------------------------------------------
1010
*/
@@ -34,6 +34,7 @@ static ScanKeyword ScanKeywords[] = {
3434
{"connection", SQL_CONNECTION},
3535
{"continue", SQL_CONTINUE},
3636
{"count", SQL_COUNT},
37+
{"current", SQL_CURRENT},
3738
{"data", SQL_DATA},
3839
{"datetime_interval_code", SQL_DATETIME_INTERVAL_CODE},
3940
{"datetime_interval_precision", SQL_DATETIME_INTERVAL_PRECISION},
@@ -48,7 +49,6 @@ static ScanKeyword ScanKeywords[] = {
4849
{"goto", SQL_GOTO},
4950
{"identified", SQL_IDENTIFIED},
5051
{"indicator", SQL_INDICATOR},
51-
{"int", SQL_INT},
5252
{"key_member", SQL_KEY_MEMBER},
5353
{"length", SQL_LENGTH},
5454
{"long", SQL_LONG},

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

Lines changed: 18 additions & 1 deletion
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.47 2002/04/22 18:54:43 meskes Exp $
11+
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.48 2002/05/19 20:00:53 meskes Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -50,11 +50,14 @@ static ScanKeyword ScanKeywords[] = {
5050
{"before", BEFORE},
5151
{"begin", BEGIN_TRANS},
5252
{"between", BETWEEN},
53+
{"bigint", BIGINT},
5354
{"binary", BINARY},
5455
{"bit", BIT},
56+
{"boolean", BOOLEAN},
5557
{"both", BOTH},
5658
{"by", BY},
5759
{"cache", CACHE},
60+
{"called", CALLED},
5861
{"cascade", CASCADE},
5962
{"case", CASE},
6063
{"cast", CAST},
@@ -93,6 +96,7 @@ static ScanKeyword ScanKeywords[] = {
9396
{"default", DEFAULT},
9497
{"deferrable", DEFERRABLE},
9598
{"deferred", DEFERRED},
99+
{"definer", DEFINER},
96100
{"delete", DELETE},
97101
{"delimiters", DELIMITERS},
98102
{"desc", DESC},
@@ -112,6 +116,7 @@ static ScanKeyword ScanKeywords[] = {
112116
{"execute", EXECUTE},
113117
{"exists", EXISTS},
114118
{"explain", EXPLAIN},
119+
{"external", EXTERNAL},
115120
{"extract", EXTRACT},
116121
{"false", FALSE_P},
117122
{"fetch", FETCH},
@@ -132,19 +137,25 @@ static ScanKeyword ScanKeywords[] = {
132137
{"hour", HOUR_P},
133138
{"ilike", ILIKE},
134139
{"immediate", IMMEDIATE},
140+
{"immutable", IMMUTABLE},
141+
{"implicit", IMPLICIT},
135142
{"in", IN},
136143
{"increment", INCREMENT},
137144
{"index", INDEX},
138145
{"inherits", INHERITS},
139146
{"initially", INITIALLY},
140147
{"inner", INNER_P},
141148
{"inout", INOUT},
149+
{"input", INPUT},
142150
{"insensitive", INSENSITIVE},
143151
{"insert", INSERT},
144152
{"instead", INSTEAD},
153+
{"int", INT},
154+
{"integer", INTEGER},
145155
{"intersect", INTERSECT},
146156
{"interval", INTERVAL},
147157
{"into", INTO},
158+
{"invoker", INVOKER},
148159
{"is", IS},
149160
{"isnull", ISNULL},
150161
{"isolation", ISOLATION},
@@ -213,6 +224,7 @@ static ScanKeyword ScanKeywords[] = {
213224
{"procedural", PROCEDURAL},
214225
{"procedure", PROCEDURE},
215226
{"read", READ},
227+
{"real", REAL},
216228
{"references", REFERENCES},
217229
{"reindex", REINDEX},
218230
{"relative", RELATIVE},
@@ -229,6 +241,7 @@ static ScanKeyword ScanKeywords[] = {
229241
{"schema", SCHEMA},
230242
{"scroll", SCROLL},
231243
{"second", SECOND_P},
244+
{"security", SECURITY},
232245
{"select", SELECT},
233246
{"sequence", SEQUENCE},
234247
{"serializable", SERIALIZABLE},
@@ -238,13 +251,16 @@ static ScanKeyword ScanKeywords[] = {
238251
{"setof", SETOF},
239252
{"share", SHARE},
240253
{"show", SHOW},
254+
{"smallint", SMALLINT},
241255
{"some", SOME},
256+
{"stable", STABLE},
242257
{"start", START},
243258
{"statement", STATEMENT},
244259
{"statistics", STATISTICS},
245260
{"stdin", STDIN},
246261
{"stdout", STDOUT},
247262
{"storage", STORAGE},
263+
{"strict", STRICT},
248264
{"substring", SUBSTRING},
249265
{"sysid", SYSID},
250266
{"table", TABLE},
@@ -282,6 +298,7 @@ static ScanKeyword ScanKeywords[] = {
282298
{"verbose", VERBOSE},
283299
{"version", VERSION},
284300
{"view", VIEW},
301+
{"volatile", VOLATILE},
285302
{"when", WHEN},
286303
{"where", WHERE},
287304
{"with", WITH},

0 commit comments

Comments
 (0)