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

diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index e15eb4c490ce6ac164eed93d3dbbc592c563e88e..b6a2c9da241e9f9bd11de6aa98cc1579c60fe72e 100644 (file)
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -581,7 +581,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
@@ -11847,15 +11847,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;
                }
@@ -12984,7 +12984,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 61fae22f0a0e1b396660dd52ca33df2d2df86931..41bd9e1864ab960f71ad6cbd0986875f5d384448 100644 (file)
--- a/src/include/parser/kwlist.h
+++ b/src/include/parser/kwlist.h
@@ -303,7 +303,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)