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

Commit57dfb6c

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 parent3c5a33a commit57dfb6c

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

582582
QUOTE
583583

584-
RANGE READ REAL REASSIGN RECHECK RECURSIVEREF REFERENCES REFRESH REINDEX
584+
RANGE READ REAL REASSIGN RECHECK RECURSIVEREF_P REFERENCES REFRESH REINDEX
585585
RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA
586586
RESET RESTART RESTRICT RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK
587587
ROW ROWS RULE
@@ -11847,15 +11847,15 @@ xmlexists_argument:
1184711847
{
1184811848
$$ = $2;
1184911849
}
11850-
| PASSING c_expr BYREF
11850+
| PASSING c_expr BYREF_P
1185111851
{
1185211852
$$ = $2;
1185311853
}
11854-
| PASSING BYREF c_expr
11854+
| PASSING BYREF_P c_expr
1185511855
{
1185611856
$$ = $4;
1185711857
}
11858-
| PASSING BYREF c_expr BYREF
11858+
| PASSING BYREF_P c_expr BYREF_P
1185911859
{
1186011860
$$ = $4;
1186111861
}
@@ -12984,7 +12984,7 @@ unreserved_keyword:
1298412984
| REASSIGN
1298512985
| RECHECK
1298612986
| RECURSIVE
12987-
|REF
12987+
|REF_P
1298812988
| REFRESH
1298912989
| REINDEX
1299012990
| RELATIVE_P

‎src/include/parser/kwlist.h

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

0 commit comments

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