Fix some bogus code in ConstBit production --- it managed to work, but

tglsfdc · tglsfdc · commit adc507f24244 · 2004-06-28T00:18:47.000Z
only because 14627 still contained the same node that BitWithoutLength had
just produced.  Make it more transparent.  Also adjust ConstCharacter
to be coded the same way for consistency.
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.463 2004/06/25 21:55:55 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.464 2004/06/28 00:18:47 tgl Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -5617,8 +5617,8 @@ ConstBit:	BitWithLength
 				}
 			| BitWithoutLength
 				{
-					$$->typmod = -1;
 					$$ = $1;
+					$$->typmod = -1;
 				}
 		;
 
@@ -5687,8 +5687,8 @@ ConstCharacter:  CharacterWithLength
 					 * of one, but should not be constrained if the length
 					 * was not specified.
 					 */
-					$1->typmod = -1;
 					$$ = $1;
+					$$->typmod = -1;
 				}
 		;
 

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.463 2004/06/25 21:55:55 tgl Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.464 2004/06/28 00:18:47 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -5617,8 +5617,8 @@ ConstBit: BitWithLength`
`5617`	`5617`	`}`
`5618`	`5618`	`\| BitWithoutLength`
`5619`	`5619`	`{`
`5620`		`- $$->typmod = -1;`
`5621`	`5620`	`$$ = $1;`
	`5621`	`+ $$->typmod = -1;`
`5622`	`5622`	`}`
`5623`	`5623`	`;`
`5624`	`5624`
`@@ -5687,8 +5687,8 @@ ConstCharacter: CharacterWithLength`
`5687`	`5687`	`* of one, but should not be constrained if the length`
`5688`	`5688`	`* was not specified.`
`5689`	`5689`	`*/`
`5690`		`- $1->typmod = -1;`
`5691`	`5690`	`$$ = $1;`
	`5691`	`+ $$->typmod = -1;`
`5692`	`5692`	`}`
`5693`	`5693`	`;`
`5694`	`5694`