diff options
| author | Tom Lane | 2022-10-16 19:27:04 +0000 |
|---|---|---|
| committer | Tom Lane | 2022-10-16 19:27:04 +0000 |
| commit | 6618c276b7a0a8a9373789efc3e35c886f3d3490 (patch) | |
| tree | f60c8381db217130edcb9495ac55e3fccff95b55 | |
| parent | 659ffe6a7c00d4ee5df9e1d8abe9c8b623f2e23c (diff) | |
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 98e93a1fc, 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
| -rw-r--r-- | src/backend/parser/gram.y | 10 | ||||
| -rw-r--r-- | src/include/parser/kwlist.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index a741fbd05ca..2a4ce294eb2 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -668,7 +668,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query); QUOTE - RANGE READ REAL REASSIGN RECHECK RECURSIVE REF REFERENCES REFERENCING + RANGE READ REAL REASSIGN RECHECK RECURSIVE REF_P REFERENCES REFERENCING REFRESH REINDEX RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA RESET RESTART RESTRICT RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK ROLLUP ROUTINE ROUTINES ROW ROWS RULE @@ -13995,15 +13995,15 @@ xmlexists_argument: { $$ = $2; } - | PASSING c_expr BY REF + | PASSING c_expr BY REF_P { $$ = $2; } - | PASSING BY REF c_expr + | PASSING BY REF_P c_expr { $$ = $4; } - | PASSING BY REF c_expr BY REF + | PASSING BY REF_P c_expr BY REF_P { $$ = $4; } @@ -15210,7 +15210,7 @@ unreserved_keyword: | REASSIGN | RECHECK | RECURSIVE - | REF + | REF_P | REFERENCING | REFRESH | REINDEX diff --git a/src/include/parser/kwlist.h b/src/include/parser/kwlist.h index 23db40147b8..163659e1a30 100644 --- a/src/include/parser/kwlist.h +++ b/src/include/parser/kwlist.h @@ -324,7 +324,7 @@ PG_KEYWORD("real", REAL, COL_NAME_KEYWORD) PG_KEYWORD("reassign", REASSIGN, UNRESERVED_KEYWORD) PG_KEYWORD("recheck", RECHECK, UNRESERVED_KEYWORD) PG_KEYWORD("recursive", RECURSIVE, UNRESERVED_KEYWORD) -PG_KEYWORD("ref", REF, UNRESERVED_KEYWORD) +PG_KEYWORD("ref", REF_P, UNRESERVED_KEYWORD) PG_KEYWORD("references", REFERENCES, RESERVED_KEYWORD) PG_KEYWORD("referencing", REFERENCING, UNRESERVED_KEYWORD) PG_KEYWORD("refresh", REFRESH, UNRESERVED_KEYWORD) |