Clean up optional rules in grammar

petere · petere · commit 1b2b19f7584b · 2020-11-12T08:06:08.000+01:00
Various rules for optional keywords contained unnecessary rules and type declarations. Remove those, thus making the output a tiny bit smaller. Reviewed-by: Heikki Linnakangas <hlinnaka@iki.fi> Discussion: https://www.postgresql.org/message-id/flat/e9eed669-e32d-6919-fed4-acc0daea857b%40enterprisedb.com
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -389,7 +389,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 				OptTableElementList TableElementList OptInherit definition
 				OptTypedTableElementList TypedTableElementList
 				reloptions opt_reloptions
-				OptWith distinct_clause opt_all_clause opt_definition func_args func_args_list
+				OptWith distinct_clause opt_definition func_args func_args_list
 				func_args_with_defaults func_args_with_defaults_list
 				aggr_args aggr_args_list
 				func_as createfunc_opt_list alterfunc_opt_list
@@ -446,7 +446,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 %type <list>	locked_rels_list
 %type <boolean>	all_or_distinct
 
-%type <node>	join_outer join_qual
+%type <node>	join_qual
 %type <jtype>	join_type
 
 %type <list>	extract_list overlay_list position_list
@@ -461,7 +461,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 
 %type <boolean> copy_from opt_program
 
-%type <ival>	opt_column event cursor_options opt_hold opt_set_data
+%type <ival>	event cursor_options opt_hold opt_set_data
 %type <objtype>	object_type_any_name object_type_name object_type_name_on_any_name
 				drop_type_name
 
@@ -992,9 +992,9 @@ CreateRoleStmt:
 		;
 
 
-opt_with:	WITH									{}
-			| WITH_LA								{}
-			| /*EMPTY*/								{}
+opt_with:	WITH
+			| WITH_LA
+			| /*EMPTY*/
 		;
 
 /*
@@ -3127,8 +3127,8 @@ copy_delimiter:
 		;
 
 opt_using:
-			USING									{}
-			| /*EMPTY*/								{}
+			USING
+			| /*EMPTY*/
 		;
 
 /* new COPY option syntax */
@@ -4319,8 +4319,8 @@ SeqOptElem: AS SimpleTypename
 				}
 		;
 
-opt_by:		BY				{}
-			| /* empty */	{}
+opt_by:		BY
+			| /* empty */
 	  ;
 
 NumericOnly:
@@ -4406,8 +4406,8 @@ opt_validator:
 		;
 
 opt_procedural:
-			PROCEDURAL								{}
-			| /*EMPTY*/								{}
+			PROCEDURAL
+			| /*EMPTY*/
 		;
 
 /*****************************************************************************
@@ -5366,8 +5366,8 @@ TriggerForSpec:
 		;
 
 TriggerForOptEach:
-			EACH									{}
-			| /*EMPTY*/								{}
+			EACH
+			| /*EMPTY*/
 		;
 
 TriggerForType:
@@ -6707,12 +6707,12 @@ fetch_args:	cursor_name
 				}
 		;
 
-from_in:	FROM									{}
-			| IN_P									{}
+from_in:	FROM
+			| IN_P
 		;
 
-opt_from_in:	from_in								{}
-			| /* EMPTY */							{}
+opt_from_in:	from_in
+			| /* EMPTY */
 		;
 
 
@@ -8836,8 +8836,8 @@ RenameStmt: ALTER AGGREGATE aggregate_with_argtypes RENAME TO name
 				}
 		;
 
-opt_column: COLUMN									{ $$ = COLUMN; }
-			| /*EMPTY*/								{ $$ = 0; }
+opt_column: COLUMN
+			| /*EMPTY*/
 		;
 
 opt_set_data: SET DATA_P							{ $$ = 1; }
@@ -9859,9 +9859,9 @@ TransactionStmt:
 				}
 		;
 
-opt_transaction:	WORK							{}
-			| TRANSACTION							{}
-			| /*EMPTY*/								{}
+opt_transaction:	WORK
+			| TRANSACTION
+			| /*EMPTY*/
 		;
 
 transaction_mode_item:
@@ -10066,8 +10066,8 @@ createdb_opt_name:
  *	Though the equals sign doesn't match other WITH options, pg_dump uses
  *	equals for backward compatibility, and it doesn't seem worth removing it.
  */
-opt_equal:	'='										{}
-			| /*EMPTY*/								{}
+opt_equal:	'='
+			| /*EMPTY*/
 		;
 
 
@@ -10285,8 +10285,8 @@ AlterDomainStmt:
 				}
 			;
 
-opt_as:		AS										{}
-			| /* EMPTY */							{}
+opt_as:		AS
+			| /* EMPTY */
 		;
 
 
@@ -10372,8 +10372,8 @@ AlterTSConfigurationStmt:
 		;
 
 /* Use this if TIME or ORDINALITY after WITH should be taken as an identifier */
-any_with:	WITH									{}
-			| WITH_LA								{}
+any_with:	WITH
+			| WITH_LA
 		;
 
 
@@ -10520,8 +10520,8 @@ vac_analyze_option_list:
 		;
 
 analyze_keyword:
-			ANALYZE									{}
-			| ANALYSE /* British */					{}
+			ANALYZE
+			| ANALYSE /* British */
 		;
 
 vac_analyze_option_elem:
@@ -11462,8 +11462,8 @@ OptTempTableName:
 				}
 		;
 
-opt_table:	TABLE									{}
-			| /*EMPTY*/								{}
+opt_table:	TABLE
+			| /*EMPTY*/
 		;
 
 all_or_distinct:
@@ -11481,8 +11481,8 @@ distinct_clause:
 		;
 
 opt_all_clause:
-			ALL										{ $$ = NIL;}
-			| /*EMPTY*/								{ $$ = NIL; }
+			ALL
+			| /*EMPTY*/
 		;
 
 opt_sort_clause:
@@ -12086,15 +12086,15 @@ func_alias_clause:
 				}
 		;
 
-join_type:	FULL join_outer							{ $$ = JOIN_FULL; }
-			| LEFT join_outer						{ $$ = JOIN_LEFT; }
-			| RIGHT join_outer						{ $$ = JOIN_RIGHT; }
+join_type:	FULL opt_outer							{ $$ = JOIN_FULL; }
+			| LEFT opt_outer						{ $$ = JOIN_LEFT; }
+			| RIGHT opt_outer						{ $$ = JOIN_RIGHT; }
 			| INNER_P								{ $$ = JOIN_INNER; }
 		;
 
 /* OUTER is just noise... */
-join_outer: OUTER_P									{ $$ = NULL; }
-			| /*EMPTY*/								{ $$ = NULL; }
+opt_outer: OUTER_P
+			| /*EMPTY*/
 		;
 
 /* JOIN qualification clauses

Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ static Node makeRecursiveViewSelect(char relname, List aliases, Node query);`
`389`	`389`	`OptTableElementList TableElementList OptInherit definition`
`390`	`390`	`OptTypedTableElementList TypedTableElementList`
`391`	`391`	`reloptions opt_reloptions`
`392`		`- OptWith distinct_clause opt_all_clause opt_definition func_args func_args_list`
	`392`	`+ OptWith distinct_clause opt_definition func_args func_args_list`
`393`	`393`	`func_args_with_defaults func_args_with_defaults_list`
`394`	`394`	`aggr_args aggr_args_list`
`395`	`395`	`func_as createfunc_opt_list alterfunc_opt_list`
`@@ -446,7 +446,7 @@ static Node makeRecursiveViewSelect(char relname, List aliases, Node query);`
`446`	`446`	`%type <list> locked_rels_list`
`447`	`447`	`%type <boolean> all_or_distinct`
`448`	`448`
`449`		`-%type <node> join_outer join_qual`
	`449`	`+%type <node> join_qual`
`450`	`450`	`%type <jtype> join_type`
`451`	`451`
`452`	`452`	`%type <list> extract_list overlay_list position_list`
`@@ -461,7 +461,7 @@ static Node makeRecursiveViewSelect(char relname, List aliases, Node query);`
`461`	`461`
`462`	`462`	`%type <boolean> copy_from opt_program`
`463`	`463`
`464`		`-%type <ival> opt_column event cursor_options opt_hold opt_set_data`
	`464`	`+%type <ival> event cursor_options opt_hold opt_set_data`
`465`	`465`	`%type <objtype> object_type_any_name object_type_name object_type_name_on_any_name`
`466`	`466`	`drop_type_name`
`467`	`467`
`@@ -992,9 +992,9 @@ CreateRoleStmt:`
`992`	`992`	`;`
`993`	`993`
`994`	`994`
`995`		`-opt_with: WITH {}`
`996`		`- \| WITH_LA {}`
`997`		`- \| /EMPTY/ {}`
	`995`	`+opt_with: WITH`
	`996`	`+ \| WITH_LA`
	`997`	`+ \| /EMPTY/`
`998`	`998`	`;`
`999`	`999`
`1000`	`1000`	`/*`
`@@ -3127,8 +3127,8 @@ copy_delimiter:`
`3127`	`3127`	`;`
`3128`	`3128`
`3129`	`3129`	`opt_using:`
`3130`		`- USING {}`
`3131`		`- \| /EMPTY/ {}`
	`3130`	`+ USING`
	`3131`	`+ \| /EMPTY/`
`3132`	`3132`	`;`
`3133`	`3133`
`3134`	`3134`	`/* new COPY option syntax */`
`@@ -4319,8 +4319,8 @@ SeqOptElem: AS SimpleTypename`
`4319`	`4319`	`}`
`4320`	`4320`	`;`
`4321`	`4321`
`4322`		`-opt_by: BY {}`
`4323`		`- \| /* empty */ {}`
	`4322`	`+opt_by: BY`
	`4323`	`+ \| /* empty */`
`4324`	`4324`	`;`
`4325`	`4325`
`4326`	`4326`	`NumericOnly:`
`@@ -4406,8 +4406,8 @@ opt_validator:`
`4406`	`4406`	`;`
`4407`	`4407`
`4408`	`4408`	`opt_procedural:`
`4409`		`- PROCEDURAL {}`
`4410`		`- \| /EMPTY/ {}`
	`4409`	`+ PROCEDURAL`
	`4410`	`+ \| /EMPTY/`
`4411`	`4411`	`;`
`4412`	`4412`
`4413`	`4413`	`/*****************************************************************************`
`@@ -5366,8 +5366,8 @@ TriggerForSpec:`
`5366`	`5366`	`;`
`5367`	`5367`
`5368`	`5368`	`TriggerForOptEach:`
`5369`		`- EACH {}`
`5370`		`- \| /EMPTY/ {}`
	`5369`	`+ EACH`
	`5370`	`+ \| /EMPTY/`
`5371`	`5371`	`;`
`5372`	`5372`
`5373`	`5373`	`TriggerForType:`
`@@ -6707,12 +6707,12 @@ fetch_args: cursor_name`
`6707`	`6707`	`}`
`6708`	`6708`	`;`
`6709`	`6709`
`6710`		`-from_in: FROM {}`
`6711`		`- \| IN_P {}`
	`6710`	`+from_in: FROM`
	`6711`	`+ \| IN_P`
`6712`	`6712`	`;`
`6713`	`6713`
`6714`		`-opt_from_in: from_in {}`
`6715`		`- \| /* EMPTY */ {}`
	`6714`	`+opt_from_in: from_in`
	`6715`	`+ \| /* EMPTY */`
`6716`	`6716`	`;`
`6717`	`6717`
`6718`	`6718`
`@@ -8836,8 +8836,8 @@ RenameStmt: ALTER AGGREGATE aggregate_with_argtypes RENAME TO name`
`8836`	`8836`	`}`
`8837`	`8837`	`;`
`8838`	`8838`
`8839`		`-opt_column: COLUMN { $$ = COLUMN; }`
`8840`		`- \| /EMPTY/ { $$ = 0; }`
	`8839`	`+opt_column: COLUMN`
	`8840`	`+ \| /EMPTY/`
`8841`	`8841`	`;`
`8842`	`8842`
`8843`	`8843`	`opt_set_data: SET DATA_P { $$ = 1; }`
`@@ -9859,9 +9859,9 @@ TransactionStmt:`
`9859`	`9859`	`}`
`9860`	`9860`	`;`
`9861`	`9861`
`9862`		`-opt_transaction: WORK {}`
`9863`		`- \| TRANSACTION {}`
`9864`		`- \| /EMPTY/ {}`
	`9862`	`+opt_transaction: WORK`
	`9863`	`+ \| TRANSACTION`
	`9864`	`+ \| /EMPTY/`
`9865`	`9865`	`;`
`9866`	`9866`
`9867`	`9867`	`transaction_mode_item:`
`@@ -10066,8 +10066,8 @@ createdb_opt_name:`
`10066`	`10066`	`* Though the equals sign doesn't match other WITH options, pg_dump uses`
`10067`	`10067`	`* equals for backward compatibility, and it doesn't seem worth removing it.`
`10068`	`10068`	`*/`
`10069`		`-opt_equal: '=' {}`
`10070`		`- \| /EMPTY/ {}`
	`10069`	`+opt_equal: '='`
	`10070`	`+ \| /EMPTY/`
`10071`	`10071`	`;`
`10072`	`10072`
`10073`	`10073`
`@@ -10285,8 +10285,8 @@ AlterDomainStmt:`
`10285`	`10285`	`}`
`10286`	`10286`	`;`
`10287`	`10287`
`10288`		`-opt_as: AS {}`
`10289`		`- \| /* EMPTY */ {}`
	`10288`	`+opt_as: AS`
	`10289`	`+ \| /* EMPTY */`
`10290`	`10290`	`;`
`10291`	`10291`
`10292`	`10292`
`@@ -10372,8 +10372,8 @@ AlterTSConfigurationStmt:`
`10372`	`10372`	`;`
`10373`	`10373`
`10374`	`10374`	`/* Use this if TIME or ORDINALITY after WITH should be taken as an identifier */`
`10375`		`-any_with: WITH {}`
`10376`		`- \| WITH_LA {}`
	`10375`	`+any_with: WITH`
	`10376`	`+ \| WITH_LA`
`10377`	`10377`	`;`
`10378`	`10378`
`10379`	`10379`
`@@ -10520,8 +10520,8 @@ vac_analyze_option_list:`
`10520`	`10520`	`;`
`10521`	`10521`
`10522`	`10522`	`analyze_keyword:`
`10523`		`- ANALYZE {}`
`10524`		`- \| ANALYSE /* British */ {}`
	`10523`	`+ ANALYZE`
	`10524`	`+ \| ANALYSE /* British */`
`10525`	`10525`	`;`
`10526`	`10526`
`10527`	`10527`	`vac_analyze_option_elem:`
`@@ -11462,8 +11462,8 @@ OptTempTableName:`
`11462`	`11462`	`}`
`11463`	`11463`	`;`
`11464`	`11464`
`11465`		`-opt_table: TABLE {}`
`11466`		`- \| /EMPTY/ {}`
	`11465`	`+opt_table: TABLE`
	`11466`	`+ \| /EMPTY/`
`11467`	`11467`	`;`
`11468`	`11468`
`11469`	`11469`	`all_or_distinct:`
`@@ -11481,8 +11481,8 @@ distinct_clause:`
`11481`	`11481`	`;`
`11482`	`11482`
`11483`	`11483`	`opt_all_clause:`
`11484`		`- ALL { $$ = NIL;}`
`11485`		`- \| /EMPTY/ { $$ = NIL; }`
	`11484`	`+ ALL`
	`11485`	`+ \| /EMPTY/`
`11486`	`11486`	`;`
`11487`	`11487`
`11488`	`11488`	`opt_sort_clause:`
`@@ -12086,15 +12086,15 @@ func_alias_clause:`
`12086`	`12086`	`}`
`12087`	`12087`	`;`
`12088`	`12088`
`12089`		`-join_type: FULL join_outer { $$ = JOIN_FULL; }`
`12090`		`- \| LEFT join_outer { $$ = JOIN_LEFT; }`
`12091`		`- \| RIGHT join_outer { $$ = JOIN_RIGHT; }`
	`12089`	`+join_type: FULL opt_outer { $$ = JOIN_FULL; }`
	`12090`	`+ \| LEFT opt_outer { $$ = JOIN_LEFT; }`
	`12091`	`+ \| RIGHT opt_outer { $$ = JOIN_RIGHT; }`
`12092`	`12092`	`\| INNER_P { $$ = JOIN_INNER; }`
`12093`	`12093`	`;`
`12094`	`12094`
`12095`	`12095`	`/* OUTER is just noise... */`
`12096`		`-join_outer: OUTER_P { $$ = NULL; }`
`12097`		`- \| /EMPTY/ { $$ = NULL; }`
	`12096`	`+opt_outer: OUTER_P`
	`12097`	`+ \| /EMPTY/`
`12098`	`12098`	`;`
`12099`	`12099`
`12100`	`12100`	`/* JOIN qualification clauses`