diff options
| author | Peter Eisentraut | 2008-11-26 08:45:12 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2008-11-26 08:45:12 +0000 |
| commit | a53536d031da5daab9acd8a4cd2c4ce27fcd9983 (patch) | |
| tree | 42562632859962b4a30fd1c468f5f5012f913180 /src | |
| parent | 1b26b0737924ff2f1197c651f8f8086293e81df9 (diff) | |
Add %expect 0 to all parser input files to prevent conflicts slipping by.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/bootstrap/bootparse.y | 3 | ||||
| -rw-r--r-- | src/backend/parser/gram.y | 3 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/ecpg.header | 3 | ||||
| -rw-r--r-- | src/pl/plpgsql/src/gram.y | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y index 9997566002..fd33158549 100644 --- 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 index 7567d90c3f..767312626d 100644 --- 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 index a626e4cd42..ccd1aec898 100644 --- 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 index 4d031fc2c6..24434decb2 100644 --- 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 { |