Movatterモバイル変換

Skip to content

postgrespro/postgresPublic

forked frompostgres/postgres

NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit9fb855f

petere

committed

Include bison header files into implementation files

Before Bison 3.4, the generated parser implementation files run afoulof -Wmissing-variable-declarations (in spite of commitab61c40)because declarations for yylval and possibly yylloc are missing. Thegenerated header files contain an extern declaration, but theimplementation files don't include the header files. Since Bison 3.4,the generated implementation files automatically include the generatedheader files, so then it works.To make this work with older Bison versions as well, include thegenerated header file from the .y file.(With older Bison versions, the generated implementation file containseffectively a copy of the header file pasted in, so including theheader file is redundant. But we know this works anyway because thecore grammar uses this arrangement already.)Discussion:https://www.postgresql.org/message-id/flat/e0a62134-83da-4ba4-8cdb-ceb0111c95ce@eisentraut.org

1 parent63bef4d commit9fb855fCopy full SHA for 9fb855f

File tree

8 files changed

+13

-3

lines changed

contrib
- cube
  - cubeparse.y
- seg
  - segparse.y
src
- backend
  - bootstrap
    - bootparse.y
  - replication
    - repl_gram.y
    - syncrep_gram.y
- interfaces/ecpg/preproc
  - ecpg.header
- pl/plpgsql/src
  - pl_gram.y
- test/isolation
  - specparse.y

8 files changed

+13

-3

lines changed

`‎contrib/cube/cubeparse.y`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,15 @@`
`11`	`11`	`#include"utils/float.h"`
`12`	`12`	`#include"varatt.h"`
`13`	`13`
	`14`	`+/* All grammar constructs return strings*/`
	`15`	`+#defineYYSTYPEchar *`
	`16`	`+`
	`17`	`+#include"cubeparse.h"`
	`18`	`+`
`14`	`19`	`/* silence -Wmissing-variable-declarations*/`
`15`	`20`	`externint cube_yychar;`
`16`	`21`	`externint cube_yynerrs;`
`17`	`22`
`18`		`-/* All grammar constructs return strings*/`
`19`		`-#defineYYSTYPEchar *`
`20`		`-`
`21`	`23`	`/*`
`22`	`24`	`* Bison doesn't allocate anything that needs to live across parser calls,`
`23`	`25`	`* so we can easily have it use palloc instead of malloc. This prevents`

`‎contrib/seg/segparse.y`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`#include"utils/float.h"`
`13`	`13`
`14`	`14`	`#include"segdata.h"`
	`15`	`+#include"segparse.h"`
`15`	`16`
`16`	`17`	`/* silence -Wmissing-variable-declarations*/`
`17`	`18`	`externint seg_yychar;`

`‎src/backend/bootstrap/bootparse.y`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`#include"nodes/makefuncs.h"`
`33`	`33`	`#include"utils/memutils.h"`
`34`	`34`
	`35`	`+#include"bootparse.h"`
`35`	`36`
`36`	`37`	`/* silence -Wmissing-variable-declarations*/`
`37`	`38`	`externint boot_yychar;`

`‎src/backend/replication/repl_gram.y`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`#include"replication/walsender.h"`
`23`	`23`	`#include"replication/walsender_private.h"`
`24`	`24`
	`25`	`+#include"repl_gram.h"`
`25`	`26`
`26`	`27`	`/* silence -Wmissing-variable-declarations*/`
`27`	`28`	`externint replication_yychar;`

`‎src/backend/replication/syncrep_gram.y`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`#include"nodes/pg_list.h"`
`18`	`18`	`#include"replication/syncrep.h"`
`19`	`19`
	`20`	`+#include"syncrep_gram.h"`
	`21`	`+`
`20`	`22`	`/* Result of parsing is returned in one of these two variables*/`
`21`	`23`	`SyncRepConfigData *syncrep_parse_result;`
`22`	`24`	`char *syncrep_parse_error_msg;`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`#include "postgres_fe.h"`
`6`	`6`
`7`	`7`	`#include "preproc_extern.h"`
	`8`	`+#include "preproc.h"`
`8`	`9`	`#include "ecpg_config.h"`
`9`	`10`	`#include <unistd.h>`
`10`	`11`

`‎src/pl/plpgsql/src/pl_gram.y`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`
`27`	`27`	`#include"plpgsql.h"`
`28`	`28`
	`29`	`+#include"pl_gram.h"`
`29`	`30`
`30`	`31`	`/* silence -Wmissing-variable-declarations*/`
`31`	`32`	`externint plpgsql_yychar;`

`‎src/test/isolation/specparse.y`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`#include"postgres_fe.h"`
`14`	`14`
`15`	`15`	`#include"isolationtester.h"`
	`16`	`+#include"specparse.h"`
`16`	`17`
`17`	`18`	`/* silence -Wmissing-variable-declarations*/`
`18`	`19`	`externint spec_yychar;`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp