*** empty log message ***

Michael Meskes · Michael Meskes · commit e18c912acfe1 · 1999-05-07T18:03:37.000Z
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -569,6 +569,11 @@ Sat Apr 24 12:39:07 CEST 1999
 	- Synced preproc.y with gram.y.
 	- Allow more than one blank between EXEC and SQL.
 	- Allow statements to be prepared from a character string, too.
+
+Fri Mai  7 07:11:38 CEST 1999
+
+	- Synced preproc.y with gram.y.
+	- Fixed small bug in parser.
 	- Set library version to 3.0.0
 	- Set ecpg version to 2.6.0
 
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
@@ -3241,16 +3241,16 @@ Typename:  Array opt_array_bounds
 				{
 					$$ = cat2_str($1, $2.str);
 				}
-		| Character	{ $$ = $1; }
 		| SETOF Array
 				{
 					$$ = cat2_str(make1_str("setof"), $2);
 				}
 		;
 
-Array:  Generic
+Array:  Generic			{ $$ = $1; }
 		| Datetime	{ $$ = $1; }
 		| Numeric	{ $$ = $1; }
+		| Character	{ $$ = $1; }
 		;
 
 Generic:  generic

Original file line number	Diff line number	Diff line change
`@@ -3241,16 +3241,16 @@ Typename: Array opt_array_bounds`
`3241`	`3241`	`{`
`3242`	`3242`	`$$ = cat2_str($1, $2.str);`
`3243`	`3243`	`}`
`3244`		`- \| Character { $$ = $1; }`
`3245`	`3244`	`\| SETOF Array`
`3246`	`3245`	`{`
`3247`	`3246`	`$$ = cat2_str(make1_str("setof"), $2);`
`3248`	`3247`	`}`
`3249`	`3248`	`;`
`3250`	`3249`
`3251`		`-Array: Generic`
	`3250`	`+Array: Generic { $$ = $1; }`
`3252`	`3251`	`\| Datetime { $$ = $1; }`
`3253`	`3252`	`\| Numeric { $$ = $1; }`
	`3253`	`+ \| Character { $$ = $1; }`
`3254`	`3254`	`;`
`3255`	`3255`
`3256`	`3256`	`Generic: generic`