Revert "Fix bogus %name-prefix option syntax in all our Bison files."

This reverts commit ece7aa8b0f57d92577055a88579555df895eb929.

It turns out that the %name-prefix syntax without "=" does not work
at all in pre-2.4 Bison.  We are not prepared to make such a large
jump in minimum required Bison version just to suppress a warning
message in a version hardly any developers are using yet.
When 3.0 gets more popular, we'll figure out a way to deal with this.
In the meantime, BISONFLAGS=-Wno-deprecated is recommendable for
anyone using 3.0 who doesn't want to see the warning.

diff --git a/contrib/cube/cubeparse.y b/contrib/cube/cubeparse.y
index 20aa81eadb66fdaeb94bd4349a426f71d922cc91..d7205b824cb5c0f21c913b5746552898d8590327 100644 (file)
--- a/contrib/cube/cubeparse.y
+++ b/contrib/cube/cubeparse.y
@@ -39,7 +39,7 @@ static NDBOX * write_point_as_box(char *s, int dim);
 /* BISON Declarations */
 %parse-param {NDBOX **result}
 %expect 0
-%name-prefix "cube_yy"
+%name-prefix="cube_yy"
 
 %token CUBEFLOAT O_PAREN C_PAREN O_BRACKET C_BRACKET COMMA
 %start box

diff --git a/contrib/seg/segparse.y b/contrib/seg/segparse.y
index 2311c1e63c0a428bd2655b9bdfedcff942ddb7d5..3fad9910bd54d382368a352d466ea2c203aa99c8 100644 (file)
--- a/contrib/seg/segparse.y
+++ b/contrib/seg/segparse.y
@@ -42,7 +42,7 @@ static char strbuf[25] = {
 /* BISON Declarations */
 %parse-param {SEG *result}
 %expect 0
-%name-prefix "seg_yy"
+%name-prefix="seg_yy"
 
 %union {
    struct BND {

diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
index 9b5ac65609bac26058a181a89f204b640fc1b879..deb2abfd9ce09e6a61886096cbfc30d6b013bc2d 100644 (file)
--- a/src/backend/bootstrap/bootparse.y
+++ b/src/backend/bootstrap/bootparse.y
@@ -93,7 +93,7 @@ static int num_columns_read = 0;
 %}
 
 %expect 0
-%name-prefix "boot_yy"
+%name-prefix="boot_yy"
 
 %union
 {

diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 61262b5a181e43e1f5b21af3497ca01c25d941af..3fcb3cbd7c073359d15e66d61e21dce687af072d 100644 (file)
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -166,7 +166,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 
 %pure-parser
 %expect 0
-%name-prefix "base_yy"
+%name-prefix="base_yy"
 %locations
 
 %parse-param {core_yyscan_t yyscanner}

diff --git a/src/backend/replication/repl_gram.y b/src/backend/replication/repl_gram.y
index 4a07deaab55fefa17b4f2cfe5be197e888fbe588..8c8378045e6ff2eb23af3e3f770186c184270a07 100644 (file)
--- a/src/backend/replication/repl_gram.y
+++ b/src/backend/replication/repl_gram.y
@@ -51,7 +51,7 @@ Node *replication_parse_result;
 %}
 
 %expect 0
-%name-prefix "replication_yy"
+%name-prefix="replication_yy"
 
 %union {
        char                    *str;

diff --git a/src/interfaces/ecpg/preproc/ecpg.header b/src/interfaces/ecpg/preproc/ecpg.header
index 4db55eb8d7e24cf3fb8774fd375e283e83413427..75538e3bd9601fdb28124001b925bb4cbef5b025 100644 (file)
--- a/src/interfaces/ecpg/preproc/ecpg.header
+++ b/src/interfaces/ecpg/preproc/ecpg.header
@@ -557,7 +557,7 @@ add_typedef(char *name, char *dimension, char *length, enum ECPGttype type_enum,
 %}
 
 %expect 0
-%name-prefix "base_yy"
+%name-prefix="base_yy"
 %locations
 
 %union {

diff --git a/src/pl/plpgsql/src/pl_gram.y b/src/pl/plpgsql/src/pl_gram.y
index 1fd20b046a0a6f8cf192d4a7a6c486d39b522728..086987a58a41e802b4322bcb02efd5b312d6d9a6 100644 (file)
--- a/src/pl/plpgsql/src/pl_gram.y
+++ b/src/pl/plpgsql/src/pl_gram.y
@@ -110,7 +110,7 @@ static  List            *read_raise_options(void);
 %}
 
 %expect 0
-%name-prefix "plpgsql_yy"
+%name-prefix="plpgsql_yy"
 %locations
 
 %union {

diff --git a/src/test/isolation/specparse.y b/src/test/isolation/specparse.y
index f31d47e756da0446f6d3e606e84a0badfaa5d696..a2dd873e21cce0029f15c69423063a5f8121a1fe 100644 (file)
--- a/src/test/isolation/specparse.y
+++ b/src/test/isolation/specparse.y
@@ -20,7 +20,7 @@ TestSpec      parseresult;            /* result of parsing is left here */
 %}
 
 %expect 0
-%name-prefix "spec_yy"
+%name-prefix="spec_yy"
 
 %union
 {