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

petere · petere · commit a53536d031da · 2008-11-26T08:45:12.000Z
diff --git a/contrib/cube/cubeparse.y b/contrib/cube/cubeparse.y
@@ -2,7 +2,7 @@
 /* NdBox = [(lowerleft),(upperright)] */
 /* [(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 YYSTYPE char *
@@ -38,6 +38,7 @@ static NDBOX * write_point_as_box(char *s, int dim);
 %}
 
 /* BISON Declarations */
+%expect 0
 %name-prefix="cube_yy"
 
 %token CUBEFLOAT O_PAREN C_PAREN O_BRACKET C_BRACKET COMMA
diff --git a/contrib/seg/segparse.y b/contrib/seg/segparse.y
@@ -40,6 +40,7 @@
 %}
 
 /* BISON Declarations */
+%expect 0
 %name-prefix="seg_yy"
 
 %union {
diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
@@ -9,7 +9,7 @@
  *
  *
  * 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"
 
 %union
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * 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
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -132,6 +132,7 @@ static TypeName *TableFuncTypeName(List *columns);
 
 %}
 
+%expect 0
 %name-prefix="base_yy"
 %locations
 
diff --git a/src/interfaces/ecpg/preproc/ecpg.header b/src/interfaces/ecpg/preproc/ecpg.header
@@ -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 */
 %{
@@ -372,6 +372,7 @@ add_typedef(char *name, char * dimension, char * length, enum ECPGttype type_enu
 }
 %}
 
+%expect 0
 %name-prefix="base_yy"
 %locations
 
diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y
@@ -9,7 +9,7 @@
  *
  *
  * 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"
 
 %union {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/backend/bootstrap/bootparse.y,v 1.94 2008/09/02 20:37:54 tgl Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/backend/bootstrap/bootparse.y,v 1.95 2008/11/26 08:45:11 petere Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -91,6 +91,7 @@ int num_columns_read = 0;`
`91`	`91`
`92`	`92`	`%}`
`93`	`93`
	`94`	`+%expect 0`
`94`	`95`	`%name-prefix="boot_yy"`
`95`	`96`
`96`	`97`	`%union`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.640 2008/11/24 08:46:03 petere Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.641 2008/11/26 08:45:11 petere Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -132,6 +132,7 @@ static TypeName TableFuncTypeName(List columns);`
`132`	`132`
`133`	`133`	`%}`
`134`	`134`
	`135`	`+%expect 0`
`135`	`136`	`%name-prefix="base_yy"`
`136`	`137`	`%locations`
`137`	`138`