diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2008-11-26 08:45:12 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2008-11-26 08:45:12 +0000 |
| commit | a53536d031da5daab9acd8a4cd2c4ce27fcd9983 (patch) | |
| tree | 42562632859962b4a30fd1c468f5f5012f913180 /src/backend | |
| parent | 1b26b0737924ff2f1197c651f8f8086293e81df9 (diff) | |
| download | postgresql-a53536d031da5daab9acd8a4cd2c4ce27fcd9983.tar.gz postgresql-a53536d031da5daab9acd8a4cd2c4ce27fcd9983.zip | |
Add %expect 0 to all parser input files to prevent conflicts slipping by.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/bootstrap/bootparse.y | 3 | ||||
| -rw-r--r-- | src/backend/parser/gram.y | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y index 9997566002e..fd331585491 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 7567d90c3fd..767312626d3 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 |