Do not use ICONST/SCONST in rules other than Iconst/Sconst.

Michael Meskes · Michael Meskes · commit 9e6976057c3f · 2008-11-12T15:50:20.000Z
diff --git 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.635 2008/11/07 18:25:06 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.636 2008/11/12 15:50:20 meskes Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -1295,7 +1295,7 @@ opt_encoding:
 
 ColId_or_Sconst:
 			ColId									{ $$ = $1; }
-			| SCONST								{ $$ = $1; }
+			| Sconst								{ $$ = $1; }
 		;
 
 VariableResetStmt:
@@ -2834,7 +2834,7 @@ TriggerFuncArgs:
 		;
 
 TriggerFuncArg:
-			ICONST
+			Iconst
 				{
 					char buf[64];
 					snprintf(buf, sizeof(buf), "%d", $1);
@@ -8848,7 +8848,7 @@ extract_list:
 			| /*EMPTY*/								{ $$ = NIL; }
 		;
 
-/* Allow delimited string SCONST in extract_arg as an SQL extension.
+/* Allow delimited string Sconst in extract_arg as an SQL extension.
  * - thomas 2001-04-12
  */
 extract_arg:
@@ -8859,7 +8859,7 @@ extract_arg:
 			| HOUR_P								{ $$ = "hour"; }
 			| MINUTE_P								{ $$ = "minute"; }
 			| SECOND_P								{ $$ = "second"; }
-			| SCONST								{ $$ = $1; }
+			| Sconst								{ $$ = $1; }
 		;
 
 /* OVERLAY() arguments
@@ -9333,9 +9333,9 @@ Iconst:		ICONST									{ $$ = $1; };
 Sconst:		SCONST									{ $$ = $1; };
 RoleId:		ColId									{ $$ = $1; };
 
-SignedIconst: ICONST								{ $$ = $1; }
-			| '+' ICONST							{ $$ = + $2; }
-			| '-' ICONST							{ $$ = - $2; }
+SignedIconst: Iconst								{ $$ = $1; }
+			| '+' Iconst							{ $$ = + $2; }
+			| '-' Iconst							{ $$ = - $2; }
 		;
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.635 2008/11/07 18:25:06 tgl Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.636 2008/11/12 15:50:20 meskes Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -1295,7 +1295,7 @@ opt_encoding:`
`1295`	`1295`
`1296`	`1296`	`ColId_or_Sconst:`
`1297`	`1297`	`ColId { $$ = $1; }`
`1298`		`- \| SCONST { $$ = $1; }`
	`1298`	`+ \| Sconst { $$ = $1; }`
`1299`	`1299`	`;`
`1300`	`1300`
`1301`	`1301`	`VariableResetStmt:`
`@@ -2834,7 +2834,7 @@ TriggerFuncArgs:`
`2834`	`2834`	`;`
`2835`	`2835`
`2836`	`2836`	`TriggerFuncArg:`
`2837`		`- ICONST`
	`2837`	`+ Iconst`
`2838`	`2838`	`{`
`2839`	`2839`	`char buf[64];`
`2840`	`2840`	`snprintf(buf, sizeof(buf), "%d", $1);`
`@@ -8848,7 +8848,7 @@ extract_list:`
`8848`	`8848`	`\| /EMPTY/ { $$ = NIL; }`
`8849`	`8849`	`;`
`8850`	`8850`
`8851`		`-/* Allow delimited string SCONST in extract_arg as an SQL extension.`
	`8851`	`+/* Allow delimited string Sconst in extract_arg as an SQL extension.`
`8852`	`8852`	`* - thomas 2001-04-12`
`8853`	`8853`	`*/`
`8854`	`8854`	`extract_arg:`
`@@ -8859,7 +8859,7 @@ extract_arg:`
`8859`	`8859`	`\| HOUR_P { $$ = "hour"; }`
`8860`	`8860`	`\| MINUTE_P { $$ = "minute"; }`
`8861`	`8861`	`\| SECOND_P { $$ = "second"; }`
`8862`		`- \| SCONST { $$ = $1; }`
	`8862`	`+ \| Sconst { $$ = $1; }`
`8863`	`8863`	`;`
`8864`	`8864`
`8865`	`8865`	`/* OVERLAY() arguments`
`@@ -9333,9 +9333,9 @@ Iconst: ICONST { $$ = $1; };`
`9333`	`9333`	`Sconst: SCONST { $$ = $1; };`
`9334`	`9334`	`RoleId: ColId { $$ = $1; };`
`9335`	`9335`
`9336`		`-SignedIconst: ICONST { $$ = $1; }`
`9337`		`- \| '+' ICONST { $$ = + $2; }`
`9338`		`- \| '-' ICONST { $$ = - $2; }`
	`9336`	`+SignedIconst: Iconst { $$ = $1; }`
	`9337`	`+ \| '+' Iconst { $$ = + $2; }`
	`9338`	`+ \| '-' Iconst { $$ = - $2; }`
`9339`	`9339`	`;`
`9340`	`9340`
`9341`	`9341`	`/*`