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

Commitee4c440

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 parentf6ce9ce commitee4c440

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

‎src/backend/parser/gram.y

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

570570
QUOTE
571571

572-
RANGE READ REAL REASSIGN RECHECK RECURSIVEREF REFERENCES REFRESH REINDEX
572+
RANGE READ REAL REASSIGN RECHECK RECURSIVEREF_P REFERENCES REFRESH REINDEX
573573
RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA
574574
RESET RESTART RESTRICT RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK
575575
ROW ROWS RULE
@@ -11789,15 +11789,15 @@ xmlexists_argument:
1178911789
{
1179011790
$$ = $2;
1179111791
}
11792-
| PASSING c_expr BYREF
11792+
| PASSING c_expr BYREF_P
1179311793
{
1179411794
$$ = $2;
1179511795
}
11796-
| PASSING BYREF c_expr
11796+
| PASSING BYREF_P c_expr
1179711797
{
1179811798
$$ = $4;
1179911799
}
11800-
| PASSING BYREF c_expr BYREF
11800+
| PASSING BYREF_P c_expr BYREF_P
1180111801
{
1180211802
$$ = $4;
1180311803
}
@@ -12898,7 +12898,7 @@ unreserved_keyword:
1289812898
| REASSIGN
1289912899
| RECHECK
1290012900
| RECURSIVE
12901-
|REF
12901+
|REF_P
1290212902
| REFRESH
1290312903
| REINDEX
1290412904
| RELATIVE_P

‎src/include/parser/kwlist.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ PG_KEYWORD("real", REAL, COL_NAME_KEYWORD)
301301
PG_KEYWORD("reassign",REASSIGN,UNRESERVED_KEYWORD)
302302
PG_KEYWORD("recheck",RECHECK,UNRESERVED_KEYWORD)
303303
PG_KEYWORD("recursive",RECURSIVE,UNRESERVED_KEYWORD)
304-
PG_KEYWORD("ref",REF,UNRESERVED_KEYWORD)
304+
PG_KEYWORD("ref",REF_P,UNRESERVED_KEYWORD)
305305
PG_KEYWORD("references",REFERENCES,RESERVED_KEYWORD)
306306
PG_KEYWORD("refresh",REFRESH,UNRESERVED_KEYWORD)
307307
PG_KEYWORD("reindex",REINDEX,UNRESERVED_KEYWORD)

0 commit comments

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