From 1b20c639ea89506dfc1ff8cfb5643ec4268da883 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 28 May 2014 19:30:15 -0400 Subject: [PATCH] Revert "Fix bogus %name-prefix option syntax in all our Bison files." This reverts commit ddf317fe0d1ce4d1189d276a776ab18f985d1ab6. 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. --- contrib/cube/cubeparse.y | 2 +- contrib/seg/segparse.y | 2 +- src/backend/bootstrap/bootparse.y | 2 +- src/backend/parser/gram.y | 2 +- src/interfaces/ecpg/preproc/ecpg.header | 2 +- src/pl/plpgsql/src/gram.y | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/cube/cubeparse.y b/contrib/cube/cubeparse.y index a049c2081de..53894d9d750 100644 --- 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 c6f85c174b8..9aaa9e9ab20 100644 --- a/contrib/seg/segparse.y +++ b/contrib/seg/segparse.y @@ -42,7 +42,7 @@ /* 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 b48256de5ad..953b7a49822 100644 --- a/src/backend/bootstrap/bootparse.y +++ b/src/backend/bootstrap/bootparse.y @@ -93,7 +93,7 @@ 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 6ede673e7dd..c05a19ba5a1 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -140,7 +140,7 @@ static TypeName *TableFuncTypeName(List *columns); %} %expect 0 -%name-prefix "base_yy" +%name-prefix="base_yy" %locations %union diff --git a/src/interfaces/ecpg/preproc/ecpg.header b/src/interfaces/ecpg/preproc/ecpg.header index 3de917b675b..709482641f6 100644 --- a/src/interfaces/ecpg/preproc/ecpg.header +++ b/src/interfaces/ecpg/preproc/ecpg.header @@ -376,7 +376,7 @@ add_typedef(char *name, char * dimension, char * length, enum ECPGttype type_enu %} %expect 0 -%name-prefix "base_yy" +%name-prefix="base_yy" %locations %union { diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y index aec01c2e69a..4215def73e9 100644 --- a/src/pl/plpgsql/src/gram.y +++ b/src/pl/plpgsql/src/gram.y @@ -74,7 +74,7 @@ static List *read_raise_options(void); %} %expect 0 -%name-prefix "plpgsql_yy" +%name-prefix="plpgsql_yy" %union { int32 ival;