Commit 71ed8b3c authored by Tom Lane's avatar Tom Lane

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

This reverts commit 45b7abe5.

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.
parent 21d48d66
...@@ -39,7 +39,7 @@ static NDBOX * write_point_as_box(char *s, int dim); ...@@ -39,7 +39,7 @@ static NDBOX * write_point_as_box(char *s, int dim);
/* BISON Declarations */ /* BISON Declarations */
%parse-param {NDBOX **result} %parse-param {NDBOX **result}
%expect 0 %expect 0
%name-prefix "cube_yy" %name-prefix="cube_yy"
%token CUBEFLOAT O_PAREN C_PAREN O_BRACKET C_BRACKET COMMA %token CUBEFLOAT O_PAREN C_PAREN O_BRACKET C_BRACKET COMMA
%start box %start box
......
...@@ -42,7 +42,7 @@ static char strbuf[25] = { ...@@ -42,7 +42,7 @@ static char strbuf[25] = {
/* BISON Declarations */ /* BISON Declarations */
%parse-param {SEG *result} %parse-param {SEG *result}
%expect 0 %expect 0
%name-prefix "seg_yy" %name-prefix="seg_yy"
%union { %union {
struct BND { struct BND {
......
...@@ -93,7 +93,7 @@ static int num_columns_read = 0; ...@@ -93,7 +93,7 @@ static int num_columns_read = 0;
%} %}
%expect 0 %expect 0
%name-prefix "boot_yy" %name-prefix="boot_yy"
%union %union
{ {
......
...@@ -169,7 +169,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query); ...@@ -169,7 +169,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
%pure-parser %pure-parser
%expect 0 %expect 0
%name-prefix "base_yy" %name-prefix="base_yy"
%locations %locations
%parse-param {core_yyscan_t yyscanner} %parse-param {core_yyscan_t yyscanner}
......
...@@ -40,7 +40,7 @@ Node *replication_parse_result; ...@@ -40,7 +40,7 @@ Node *replication_parse_result;
%} %}
%expect 0 %expect 0
%name-prefix "replication_yy" %name-prefix="replication_yy"
%union { %union {
char *str; char *str;
......
...@@ -572,7 +572,7 @@ add_typedef(char *name, char *dimension, char *length, enum ECPGttype type_enum, ...@@ -572,7 +572,7 @@ add_typedef(char *name, char *dimension, char *length, enum ECPGttype type_enum,
%} %}
%expect 0 %expect 0
%name-prefix "base_yy" %name-prefix="base_yy"
%locations %locations
%union { %union {
......
...@@ -110,7 +110,7 @@ static List *read_raise_options(void); ...@@ -110,7 +110,7 @@ static List *read_raise_options(void);
%} %}
%expect 0 %expect 0
%name-prefix "plpgsql_yy" %name-prefix="plpgsql_yy"
%locations %locations
%union { %union {
......
...@@ -20,7 +20,7 @@ TestSpec parseresult; /* result of parsing is left here */ ...@@ -20,7 +20,7 @@ TestSpec parseresult; /* result of parsing is left here */
%} %}
%expect 0 %expect 0
%name-prefix "spec_yy" %name-prefix="spec_yy"
%union %union
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment