Skip to content

Commit 328d235

Browse files
alvherrealvherre
committed
Separate the key word list that lived in keywords.c into a new header file
kwlist.h, to avoid having to link the backend object file into other programs like pg_dump. We can now simply symlink a single source file from the backend (kwlookup.c, containing the shared routine ScanKeywordLookup) and compile it locally, which is a lot cleaner.
1 parent 00ce737 commit 328d235

File tree

11 files changed

+621
-531
lines changed

11 files changed

+621
-531
lines changed

‎src/backend/parser/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Makefile for parser
44
#
5-
# $PostgreSQL: pgsql/src/backend/parser/Makefile,v 1.48 2008/10/04 21:56:54 tgl Exp $
5+
# $PostgreSQL: pgsql/src/backend/parser/Makefile,v 1.49 2009/03/07 00:13:57 alvherre Exp $
66
#
77
#-------------------------------------------------------------------------
88

@@ -14,7 +14,7 @@ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
1414

1515
OBJS= analyze.o gram.o keywords.o parser.o parse_agg.o parse_cte.o parse_clause.o \
1616
parse_expr.o parse_func.o parse_node.o parse_oper.o parse_relation.o \
17-
parse_type.o parse_coerce.o parse_target.o parse_utilcmd.o scansup.o
17+
parse_type.o parse_coerce.o parse_target.o parse_utilcmd.o scansup.o kwlookup.o
1818

1919
FLEXFLAGS = -CF
2020

‎src/backend/parser/gram.y

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.659 2009/02/24 10:06:33 petere Exp $
14+
* $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.660 2009/03/07 00:13:57 alvherre Exp $
1515
*
1616
* HISTORY
1717
* AUTHOR DATE MAJOR EVENT
@@ -423,7 +423,7 @@ static TypeName *TableFuncTypeName(List *columns);
423423

424424
/*
425425
* If you make any token changes, update the keyword table in
426-
* parser/keywords.c and add new keywords to the appropriate one of
426+
* src/include/parser/kwlist.h and add new keywords to the appropriate one of
427427
* the reserved-or-not-so-reserved keyword lists, below; search
428428
* this file for "Name classification hierarchy".
429429
*/
@@ -516,7 +516,7 @@ static TypeName *TableFuncTypeName(List *columns);
516516

517517
ZONE
518518

519-
/* The grammar thinks these are keywords, but they are not in the keywords.c
519+
/* The grammar thinks these are keywords, but they are not in the kwlist.h
520520
* list and so can never be entered directly. The filter in parser.c
521521
* creates these tokens when required.
522522
*/

0 commit comments

Comments
 (0)