From 534cce2fc834c71a64fda72d4a8ec4e5f669683e Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 28 May 2014 19:29:53 -0400 Subject: [PATCH] Revert "Fix bogus %name-prefix option syntax in all our Bison files." This reverts commit a670f5ed1ad0a472c4981b821bfcfc2c9dd0c2fd. 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 a049c2081d..53894d9d75 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 c6f85c174b..9aaa9e9ab2 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 948c582df5..72ebe7046b 100644 --- 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 4a62131336..758cf6fdf8 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -134,7 +134,7 @@ static TypeName *TableFuncTypeName(List *columns); %pure-parser %expect 0 -%name-prefix "base_yy" +%name-prefix="base_yy" %locations %parse-param {core_yyscan_t yyscanner} diff --git a/src/interfaces/ecpg/preproc/ecpg.header b/src/interfaces/ecpg/preproc/ecpg.header index 4683d60ac3..3398f004cf 100644 --- a/src/interfaces/ecpg/preproc/ecpg.header +++ b/src/interfaces/ecpg/preproc/ecpg.header @@ -464,7 +464,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 968f6d8fff..60abdc2589 100644 --- a/src/pl/plpgsql/src/gram.y +++ b/src/pl/plpgsql/src/gram.y @@ -108,7 +108,7 @@ static List *read_raise_options(void); %} %expect 0 -%name-prefix "plpgsql_yy" +%name-prefix="plpgsql_yy" %locations %union { -- 2.50.0