Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 24c4c26

Browse files
committed
Rename parser token REF to REF_P to avoid a symbol conflict.
In the latest version of Apple's macOS SDK, <sys/socket.h> fails to compile if "REF" is #define'd as something. Apple may or may not agree that this is a bug, and even if they do accept the bug report I filed, they probably won't fix it very quickly. In the meantime, our back branches will all fail to compile gram.y. v15 and HEAD currently escape the problem thanks to the refactoring done in 98e93a1, but that's purely accidental. Moreover, since that patch removed a widely-visible inclusion of <netdb.h>, back-patching it seems too likely to break third-party code. Instead, change the token's code name to REF_P, following our usual convention for naming parser tokens that are likely to have symbol conflicts. The effects of that should be localized to the grammar and immediately surrounding files, so it seems like a safer answer. Per project policy that we want to keep recently-out-of-support branches buildable on modern systems, back-patch all the way to 9.2. Discussion: https://postgr.es/m/1803927.1665938411@sss.pgh.pa.us
1 parent bd4b292 commit 24c4c26

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/backend/parser/gram.y

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
730730

731731
QUOTE
732732

733-
RANGE READ REAL REASSIGN RECHECK RECURSIVE REF REFERENCES REFERENCING
733+
RANGE READ REAL REASSIGN RECHECK RECURSIVE REF_P REFERENCES REFERENCING
734734
REFRESH REINDEX RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA
735735
RESET RESTART RESTRICT RETURN RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK ROLLUP
736736
ROUTINE ROUTINES ROW ROWS RULE
@@ -15553,7 +15553,7 @@ xmlexists_argument:
1555315553
;
1555415554

1555515555
xml_passing_mech:
15556-
BY REF
15556+
BY REF_P
1555715557
| BY VALUE_P
1555815558
;
1555915559

@@ -16854,7 +16854,7 @@ unreserved_keyword:
1685416854
| REASSIGN
1685516855
| RECHECK
1685616856
| RECURSIVE
16857-
| REF
16857+
| REF_P
1685816858
| REFERENCING
1685916859
| REFRESH
1686016860
| REINDEX
@@ -17439,7 +17439,7 @@ bare_label_keyword:
1743917439
| REASSIGN
1744017440
| RECHECK
1744117441
| RECURSIVE
17442-
| REF
17442+
| REF_P
1744317443
| REFERENCES
1744417444
| REFERENCING
1744517445
| REFRESH

src/include/parser/kwlist.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ PG_KEYWORD("real", REAL, COL_NAME_KEYWORD, BARE_LABEL)
339339
PG_KEYWORD("reassign", REASSIGN, UNRESERVED_KEYWORD, BARE_LABEL)
340340
PG_KEYWORD("recheck", RECHECK, UNRESERVED_KEYWORD, BARE_LABEL)
341341
PG_KEYWORD("recursive", RECURSIVE, UNRESERVED_KEYWORD, BARE_LABEL)
342-
PG_KEYWORD("ref", REF, UNRESERVED_KEYWORD, BARE_LABEL)
342+
PG_KEYWORD("ref", REF_P, UNRESERVED_KEYWORD, BARE_LABEL)
343343
PG_KEYWORD("references", REFERENCES, RESERVED_KEYWORD, BARE_LABEL)
344344
PG_KEYWORD("referencing", REFERENCING, UNRESERVED_KEYWORD, BARE_LABEL)
345345
PG_KEYWORD("refresh", REFRESH, UNRESERVED_KEYWORD, BARE_LABEL)

0 commit comments

Comments
 (0)