Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita53536d

Browse files
committed
Add %expect 0 to all parser input files to prevent conflicts slipping by.
1 parent1b26b07 commita53536d

File tree

6 files changed

+11
-5
lines changed

6 files changed

+11
-5
lines changed

‎contrib/cube/cubeparse.y

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* NdBox = [(lowerleft),(upperright)]*/
33
/* [(xLL(1)...xLL(N)),(xUR(1)...xUR(n))]*/
44

5-
/* $PostgreSQL: pgsql/contrib/cube/cubeparse.y,v 1.18 2008/09/02 20:37:54 tgl Exp $*/
5+
/* $PostgreSQL: pgsql/contrib/cube/cubeparse.y,v 1.19 2008/11/26 08:45:11 petere Exp $*/
66

77
#defineYYPARSE_PARAM result/* need this to pass a pointer (void *) to yyparse*/
88
#defineYYSTYPEchar *
@@ -38,6 +38,7 @@ static NDBOX * write_point_as_box(char *s, int dim);
3838
%}
3939

4040
/* BISON Declarations*/
41+
%expect0
4142
%name-prefix="cube_yy"
4243

4344
%tokenCUBEFLOATO_PARENC_PARENO_BRACKETC_BRACKETCOMMA

‎contrib/seg/segparse.y

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
%}
4141

4242
/* BISON Declarations*/
43+
%expect0
4344
%name-prefix="seg_yy"
4445

4546
%union {

‎src/backend/bootstrap/bootparse.y

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* 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 $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -91,6 +91,7 @@ int num_columns_read = 0;
9191

9292
%}
9393

94+
%expect0
9495
%name-prefix="boot_yy"
9596

9697
%union

‎src/backend/parser/gram.y

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* 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 $
1515
*
1616
* HISTORY
1717
* AUTHORDATEMAJOR EVENT
@@ -132,6 +132,7 @@ static TypeName *TableFuncTypeName(List *columns);
132132

133133
%}
134134

135+
%expect0
135136
%name-prefix="base_yy"
136137
%locations
137138

‎src/interfaces/ecpg/preproc/ecpg.header

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.header,v 1.2 2008/11/14 16:25:34 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.header,v 1.3 2008/11/26 08:45:12 petere Exp $ */
22

33
/* Copyright comment */
44
%{
@@ -372,6 +372,7 @@ add_typedef(char *name, char * dimension, char * length, enum ECPGttype type_enu
372372
}
373373
%}
374374

375+
%expect 0
375376
%name-prefix="base_yy"
376377
%locations
377378

‎src/pl/plpgsql/src/gram.y

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.116 2008/11/05 00:07:53 tgl Exp $
12+
* $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.117 2008/11/26 08:45:12 petere Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -70,6 +70,7 @@ static List*read_raise_options(void);
7070

7171
%}
7272

73+
%expect0
7374
%name-prefix="plpgsql_yy"
7475

7576
%union {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp