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

Commit3d7df87

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 ifthey do accept the bug report I filed, they probably won'tfix it very quickly. In the meantime, our back branches will allfail to compile gram.y. v15 and HEAD currently escape the problemthanks to the refactoring done in98e93a1, but that's purelyaccidental. Moreover, since that patch removed a widely-visibleinclusion of <netdb.h>, back-patching it seems too likely to breakthird-party code.Instead, change the token's code name to REF_P, following our usualconvention for naming parser tokens that are likely to have symbolconflicts. The effects of that should be localized to the grammarand immediately surrounding files, so it seems like a safer answer.Per project policy that we want to keep recently-out-of-supportbranches buildable on modern systems, back-patch all the way to 9.2.Discussion:https://postgr.es/m/1803927.1665938411@sss.pgh.pa.us
1 parentd33ac1e commit3d7df87

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

‎src/backend/parser/gram.y

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

674674
QUOTE
675675

676-
RANGE READ REAL REASSIGN RECHECK RECURSIVEREF REFERENCES REFERENCING
676+
RANGE READ REAL REASSIGN RECHECK RECURSIVEREF_P REFERENCES REFERENCING
677677
REFRESH REINDEX RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA
678678
RESET RESTART RESTRICT RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK ROLLUP
679679
ROUTINE ROUTINES ROW ROWS RULE
@@ -14008,7 +14008,7 @@ xmlexists_argument:
1400814008
;
1400914009

1401014010
xml_passing_mech:
14011-
BYREF
14011+
BYREF_P
1401214012
|BYVALUE_P
1401314013
;
1401414014

@@ -15213,7 +15213,7 @@ unreserved_keyword:
1521315213
| REASSIGN
1521415214
| RECHECK
1521515215
| RECURSIVE
15216-
|REF
15216+
|REF_P
1521715217
| REFERENCING
1521815218
| REFRESH
1521915219
| REINDEX

‎src/include/parser/kwlist.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ PG_KEYWORD("real", REAL, COL_NAME_KEYWORD)
323323
PG_KEYWORD("reassign",REASSIGN,UNRESERVED_KEYWORD)
324324
PG_KEYWORD("recheck",RECHECK,UNRESERVED_KEYWORD)
325325
PG_KEYWORD("recursive",RECURSIVE,UNRESERVED_KEYWORD)
326-
PG_KEYWORD("ref",REF,UNRESERVED_KEYWORD)
326+
PG_KEYWORD("ref",REF_P,UNRESERVED_KEYWORD)
327327
PG_KEYWORD("references",REFERENCES,RESERVED_KEYWORD)
328328
PG_KEYWORD("referencing",REFERENCING,UNRESERVED_KEYWORD)
329329
PG_KEYWORD("refresh",REFRESH,UNRESERVED_KEYWORD)

0 commit comments

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