Mark noise keyword actions with {} rather than returning TRUE, like

bmomjian · bmomjian · commit e25f9e4f5de9 · 2002-06-17T20:38:04.000Z
opt_with and from_in.
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.326 2002/06/17 20:27:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.327 2002/06/17 20:38:04 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -171,7 +171,7 @@ static void doNegateFloat(Value *v);
 %type <str>		OptSchemaName
 %type <list>	OptSchemaEltList
 
-%type <boolean> TriggerActionTime, TriggerForSpec, opt_trusted, opt_procedural
+%type <boolean> TriggerActionTime, TriggerForSpec, opt_trusted
 %type <str>		opt_lancompiler
 
 %type <str>		TriggerEvents
@@ -223,7 +223,7 @@ static void doNegateFloat(Value *v);
 %type <list>	for_update_clause, opt_for_update_clause, update_list
 %type <boolean> opt_all
 %type <boolean> opt_table
-%type <boolean> opt_chain, opt_trans
+%type <boolean> opt_chain
 
 %type <node>	join_outer, join_qual
 %type <jtype>	join_type
@@ -233,9 +233,9 @@ static void doNegateFloat(Value *v);
 %type <ival>	opt_interval
 %type <node>	overlay_placing, substr_from, substr_for
 
-%type <boolean> opt_binary, opt_using, opt_instead, opt_cursor, opt_with
+%type <boolean> opt_binary, opt_instead, opt_cursor
 %type <boolean> opt_with_copy, index_opt_unique, opt_verbose, opt_full
-%type <boolean> opt_freeze, analyze_keyword
+%type <boolean> opt_freeze
 
 %type <ival>	copy_dirn, direction, reindex_type, drop_type,
 				opt_column, event, comment_type
@@ -530,8 +530,8 @@ CreateUserStmt:
 		;
 
 
-opt_with:	WITH									{ $$ = TRUE; }
-			| /*EMPTY*/								{ $$ = TRUE; }
+opt_with:	WITH									{}
+			| /*EMPTY*/								{}
 		;
 
 /*****************************************************************************
@@ -1318,8 +1318,8 @@ copy_delimiter:
 			| /*EMPTY*/								{ $$ = "\t"; }
 		;
 
-opt_using:	USING									{ $$ = TRUE; }
-			| /*EMPTY*/								{ $$ = TRUE; }
+opt_using:	USING									{}
+			| /*EMPTY*/								{}
 		;
 
 copy_null:	WITH NULL_P AS Sconst					{ $$ = $4; }
@@ -1902,8 +1902,8 @@ DropPLangStmt:
 		;
 
 opt_procedural:
-			PROCEDURAL								{ $$ = TRUE; }
-			| /*EMPTY*/								{ $$ = TRUE; }
+			PROCEDURAL								{}
+			| /*EMPTY*/								{}
 		;
 
 /*****************************************************************************
@@ -2498,8 +2498,8 @@ fetch_how_many:
 			| PRIOR									{ $$ = -1; }
 		;
 
-from_in:	IN_P									{ }
-			| FROM									{ }
+from_in:	IN_P									{}
+			| FROM									{}
 		;
 
 
@@ -3296,9 +3296,9 @@ TransactionStmt:
 				}
 		;
 
-opt_trans:	WORK									{ $$ = TRUE; }
-			| TRANSACTION							{ $$ = TRUE; }
-			| /*EMPTY*/								{ $$ = TRUE; }
+opt_trans:	WORK									{}
+			| TRANSACTION							{}
+			| /*EMPTY*/								{}
 		;
 
 opt_chain:	AND NO CHAIN							{ $$ = FALSE; }
@@ -3631,8 +3631,8 @@ AnalyzeStmt:
 		;
 
 analyze_keyword:
-			ANALYZE									{ $$ = TRUE; }
-			| ANALYSE /* British */					{ $$ = TRUE; }
+			ANALYZE									{}
+			| ANALYSE /* British */					{}
 		;
 
 opt_verbose:

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.326 2002/06/17 20:27:43 momjian Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.327 2002/06/17 20:38:04 momjian Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -171,7 +171,7 @@ static void doNegateFloat(Value *v);`
`171`	`171`	`%type <str> OptSchemaName`
`172`	`172`	`%type <list> OptSchemaEltList`
`173`	`173`
`174`		`-%type <boolean> TriggerActionTime, TriggerForSpec, opt_trusted, opt_procedural`
	`174`	`+%type <boolean> TriggerActionTime, TriggerForSpec, opt_trusted`
`175`	`175`	`%type <str> opt_lancompiler`
`176`	`176`
`177`	`177`	`%type <str> TriggerEvents`
`@@ -223,7 +223,7 @@ static void doNegateFloat(Value *v);`
`223`	`223`	`%type <list> for_update_clause, opt_for_update_clause, update_list`
`224`	`224`	`%type <boolean> opt_all`
`225`	`225`	`%type <boolean> opt_table`
`226`		`-%type <boolean> opt_chain, opt_trans`
	`226`	`+%type <boolean> opt_chain`
`227`	`227`
`228`	`228`	`%type <node> join_outer, join_qual`
`229`	`229`	`%type <jtype> join_type`
`@@ -233,9 +233,9 @@ static void doNegateFloat(Value *v);`
`233`	`233`	`%type <ival> opt_interval`
`234`	`234`	`%type <node> overlay_placing, substr_from, substr_for`
`235`	`235`
`236`		`-%type <boolean> opt_binary, opt_using, opt_instead, opt_cursor, opt_with`
	`236`	`+%type <boolean> opt_binary, opt_instead, opt_cursor`
`237`	`237`	`%type <boolean> opt_with_copy, index_opt_unique, opt_verbose, opt_full`
`238`		`-%type <boolean> opt_freeze, analyze_keyword`
	`238`	`+%type <boolean> opt_freeze`
`239`	`239`
`240`	`240`	`%type <ival> copy_dirn, direction, reindex_type, drop_type,`
`241`	`241`	`opt_column, event, comment_type`
`@@ -530,8 +530,8 @@ CreateUserStmt:`
`530`	`530`	`;`
`531`	`531`
`532`	`532`
`533`		`-opt_with: WITH { $$ = TRUE; }`
`534`		`- \| /EMPTY/ { $$ = TRUE; }`
	`533`	`+opt_with: WITH {}`
	`534`	`+ \| /EMPTY/ {}`
`535`	`535`	`;`
`536`	`536`
`537`	`537`	`/*****************************************************************************`
`@@ -1318,8 +1318,8 @@ copy_delimiter:`
`1318`	`1318`	`\| /EMPTY/ { $$ = "\t"; }`
`1319`	`1319`	`;`
`1320`	`1320`
`1321`		`-opt_using: USING { $$ = TRUE; }`
`1322`		`- \| /EMPTY/ { $$ = TRUE; }`
	`1321`	`+opt_using: USING {}`
	`1322`	`+ \| /EMPTY/ {}`
`1323`	`1323`	`;`
`1324`	`1324`
`1325`	`1325`	`copy_null: WITH NULL_P AS Sconst { $$ = $4; }`
`@@ -1902,8 +1902,8 @@ DropPLangStmt:`
`1902`	`1902`	`;`
`1903`	`1903`
`1904`	`1904`	`opt_procedural:`
`1905`		`- PROCEDURAL { $$ = TRUE; }`
`1906`		`- \| /EMPTY/ { $$ = TRUE; }`
	`1905`	`+ PROCEDURAL {}`
	`1906`	`+ \| /EMPTY/ {}`
`1907`	`1907`	`;`
`1908`	`1908`
`1909`	`1909`	`/*****************************************************************************`
`@@ -2498,8 +2498,8 @@ fetch_how_many:`
`2498`	`2498`	`\| PRIOR { $$ = -1; }`
`2499`	`2499`	`;`
`2500`	`2500`
`2501`		`-from_in: IN_P { }`
`2502`		`- \| FROM { }`
	`2501`	`+from_in: IN_P {}`
	`2502`	`+ \| FROM {}`
`2503`	`2503`	`;`
`2504`	`2504`
`2505`	`2505`
`@@ -3296,9 +3296,9 @@ TransactionStmt:`
`3296`	`3296`	`}`
`3297`	`3297`	`;`
`3298`	`3298`
`3299`		`-opt_trans: WORK { $$ = TRUE; }`
`3300`		`- \| TRANSACTION { $$ = TRUE; }`
`3301`		`- \| /EMPTY/ { $$ = TRUE; }`
	`3299`	`+opt_trans: WORK {}`
	`3300`	`+ \| TRANSACTION {}`
	`3301`	`+ \| /EMPTY/ {}`
`3302`	`3302`	`;`
`3303`	`3303`
`3304`	`3304`	`opt_chain: AND NO CHAIN { $$ = FALSE; }`
`@@ -3631,8 +3631,8 @@ AnalyzeStmt:`
`3631`	`3631`	`;`
`3632`	`3632`
`3633`	`3633`	`analyze_keyword:`
`3634`		`- ANALYZE { $$ = TRUE; }`
`3635`		`- \| ANALYSE /* British */ { $$ = TRUE; }`
	`3634`	`+ ANALYZE {}`
	`3635`	`+ \| ANALYSE /* British */ {}`
`3636`	`3636`	`;`
`3637`	`3637`
`3638`	`3638`	`opt_verbose:`