mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add %expect 0 to all parser input files to prevent conflicts slipping by.

Browse Source
This commit is contained in:
Peter Eisentraut 2008-11-26 08:45:12 +00:00
parent 1b26b07379
commit a53536d031
6 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/cube/cubeparse.y
View File

@ -2,7 +2,7 @@
/* NdBox = [(lowerleft),(upperright)] */ /* NdBox = [(lowerleft),(upperright)] */
/* [(xLL(1)...xLL(N)),(xUR(1)...xUR(n))] */ /* [(xLL(1)...xLL(N)),(xUR(1)...xUR(n))] */
/* $PostgreSQL: pgsql/contrib/cube/cubeparse.y,v 1.18 2008/09/02 20:37:54 tgl Exp $ */ /* $PostgreSQL: pgsql/contrib/cube/cubeparse.y,v 1.19 2008/11/26 08:45:11 petere Exp $ */
#define YYPARSE_PARAM result /* need this to pass a pointer (void *) to yyparse */ #define YYPARSE_PARAM result /* need this to pass a pointer (void *) to yyparse */
#define YYSTYPE char * #define YYSTYPE char *
@ -38,6 +38,7 @@ static NDBOX * write_point_as_box(char *s, int dim);
%} %}
/* BISON Declarations */ /* BISON Declarations */
%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

1
contrib/seg/segparse.y
View File

@ -40,6 +40,7 @@
%} %}
/* BISON Declarations */ /* BISON Declarations */
%expect 0
%name-prefix="seg_yy" %name-prefix="seg_yy"
%union { %union {

3
src/backend/bootstrap/bootparse.y
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/bootstrap/bootparse.y,v 1.94 2008/09/02 20:37:54 tgl Exp $ * $PostgreSQL: pgsql/src/backend/bootstrap/bootparse.y,v 1.95 2008/11/26 08:45:11 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -91,6 +91,7 @@ int num_columns_read = 0;
%} %}
%expect 0
%name-prefix="boot_yy" %name-prefix="boot_yy"
%union %union

3
src/backend/parser/gram.y
View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.640 2008/11/24 08:46:03 petere Exp $ * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.641 2008/11/26 08:45:11 petere Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
@ -132,6 +132,7 @@ static TypeName *TableFuncTypeName(List *columns);
%} %}
%expect 0
%name-prefix="base_yy" %name-prefix="base_yy"
%locations %locations

3
src/interfaces/ecpg/preproc/ecpg.header
View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.header,v 1.2 2008/11/14 16:25:34 meskes Exp $ */ /* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.header,v 1.3 2008/11/26 08:45:12 petere Exp $ */
/* Copyright comment */ /* Copyright comment */
%{ %{
@ -372,6 +372,7 @@ add_typedef(char *name, char * dimension, char * length, enum ECPGttype type_enu
} }
%} %}
%expect 0
%name-prefix="base_yy" %name-prefix="base_yy"
%locations %locations

3
src/pl/plpgsql/src/gram.y
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.116 2008/11/05 00:07:53 tgl Exp $ * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.117 2008/11/26 08:45:12 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -70,6 +70,7 @@ static List *read_raise_options(void);
%} %}
%expect 0
%name-prefix="plpgsql_yy" %name-prefix="plpgsql_yy"
%union { %union {