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

Commit18e6071

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 parent6fa431d commit18e6071

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
@@ -698,7 +698,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
698698

699699
QUOTE
700700

701-
RANGE READ REAL REASSIGN RECHECK RECURSIVEREF REFERENCES REFERENCING
701+
RANGE READ REAL REASSIGN RECHECK RECURSIVEREF_P REFERENCES REFERENCING
702702
REFRESH REINDEX RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA
703703
RESET RESTART RESTRICT RETURN RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK ROLLUP
704704
ROUTINE ROUTINES ROW ROWS RULE
@@ -14381,7 +14381,7 @@ xmlexists_argument:
1438114381
;
1438214382

1438314383
xml_passing_mech:
14384-
BYREF
14384+
BYREF_P
1438514385
|BYVALUE_P
1438614386
;
1438714387

@@ -15673,7 +15673,7 @@ unreserved_keyword:
1567315673
| REASSIGN
1567415674
| RECHECK
1567515675
| RECURSIVE
15676-
|REF
15676+
|REF_P
1567715677
| REFERENCING
1567815678
| REFRESH
1567915679
| REINDEX
@@ -16255,7 +16255,7 @@ bare_label_keyword:
1625516255
| REASSIGN
1625616256
| RECHECK
1625716257
| RECURSIVE
16258-
|REF
16258+
|REF_P
1625916259
| REFERENCES
1626016260
| REFERENCING
1626116261
| REFRESH

‎src/include/parser/kwlist.h

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

0 commit comments

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