summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut2008-11-26 08:45:12 +0000
committerPeter Eisentraut2008-11-26 08:45:12 +0000
commitedec2fe30f4ca420636917c0746bcb8a98f0acba (patch)
tree0804137c104e672c2599a5761ad379a2b20a8d9e
parent639f9cef215e4a181c9bc46f26143cf559f0a5fe (diff)
Add %expect 0 to all parser input files to prevent conflicts slipping by.
-rw-r--r--contrib/cube/cubeparse.y1
-rw-r--r--contrib/seg/segparse.y1
-rw-r--r--src/backend/bootstrap/bootparse.y1
-rw-r--r--src/backend/parser/gram.y1
-rw-r--r--src/interfaces/ecpg/preproc/ecpg.header1
-rw-r--r--src/pl/plpgsql/src/gram.y1
6 files changed, 6 insertions, 0 deletions
diff --git a/contrib/cube/cubeparse.y b/contrib/cube/cubeparse.y
index 6b96da5127..e67df856f2 100644
--- a/contrib/cube/cubeparse.y
+++ b/contrib/cube/cubeparse.y
@@ -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
index 47e3d398aa..ca351c661b 100644
--- 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
index 38971e0d98..472f1d831c 100644
--- a/src/backend/bootstrap/bootparse.y
+++ b/src/backend/bootstrap/bootparse.y
@@ -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
index 244df3b313..85f4616878 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -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
index 78aca9afdc..c80a3136cf 100644
--- a/src/interfaces/ecpg/preproc/ecpg.header
+++ b/src/interfaces/ecpg/preproc/ecpg.header
@@ -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
index e0b8f35d2d..d798153781 100644
--- a/src/pl/plpgsql/src/gram.y
+++ b/src/pl/plpgsql/src/gram.y
@@ -70,6 +70,7 @@ static List *read_raise_options(void);
%}
+%expect 0
%name-prefix="plpgsql_yy"
%union {