summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2022-10-16 19:27:04 +0000
committerTom Lane2022-10-16 19:27:04 +0000
commitee4c44014400a79a69e094f60d39b1fdcd599998 (patch)
treead531709ca6bfbd06eae9742dfa45ae028d45367
parentf6ce9cee620702d8df551cd25761169f45503dc9 (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/[email protected]
-rw-r--r--src/backend/parser/gram.y10
-rw-r--r--src/include/parser/kwlist.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 8981525426b..40f96988bd4 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -569,7 +569,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
QUOTE
- RANGE READ REAL REASSIGN RECHECK RECURSIVE REF REFERENCES REFRESH REINDEX
+ RANGE READ REAL REASSIGN RECHECK RECURSIVE REF_P REFERENCES REFRESH REINDEX
RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA
RESET RESTART RESTRICT RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK
ROW ROWS RULE
@@ -11789,15 +11789,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;
}
@@ -12898,7 +12898,7 @@ unreserved_keyword:
| REASSIGN
| RECHECK
| RECURSIVE
- | REF
+ | REF_P
| REFRESH
| REINDEX
| RELATIVE_P
diff --git a/src/include/parser/kwlist.h b/src/include/parser/kwlist.h
index 68a13b7a7ba..cdb60a78d98 100644
--- a/src/include/parser/kwlist.h
+++ b/src/include/parser/kwlist.h
@@ -301,7 +301,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("refresh", REFRESH, UNRESERVED_KEYWORD)
PG_KEYWORD("reindex", REINDEX, UNRESERVED_KEYWORD)