Fix slightly-wrong syntax error messages from bootstrap parser, as per

tglsfdc · tglsfdc · commit 337f802460cf · 2004-06-09T19:49:56.000Z
report from Tom Cook.
diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/bootstrap/bootscanner.l,v 1.35 2004/06/03 02:08:02 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/bootstrap/bootscanner.l,v 1.36 2004/06/09 19:49:56 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -45,7 +45,7 @@
 #define fprintf(file, fmt, msg)  ereport(ERROR, (errmsg_internal("%s", msg)))
 
 
-static int	yyline;  /* keep track of the line number for error reporting */
+static int	yyline = 1;			/* line number for error reporting */
 
 %}
 
@@ -135,7 +135,7 @@ insert			{ return(INSERT_TUPLE); }
 %%
 
 void
-yyerror(const char *str)
+yyerror(const char *message)
 {
-	elog(ERROR, "syntax error at line %d: unexpected token \"%s\"", yyline, str);
+	elog(ERROR, "%s at line %d", message, yyline);
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/backend/bootstrap/bootscanner.l,v 1.35 2004/06/03 02:08:02 tgl Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/backend/bootstrap/bootscanner.l,v 1.36 2004/06/09 19:49:56 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -45,7 +45,7 @@`
`45`	`45`	`#define fprintf(file, fmt, msg) ereport(ERROR, (errmsg_internal("%s", msg)))`
`46`	`46`
`47`	`47`
`48`		`-static int yyline; /* keep track of the line number for error reporting */`
	`48`	`+static int yyline = 1; /* line number for error reporting */`
`49`	`49`
`50`	`50`	`%}`
`51`	`51`
`@@ -135,7 +135,7 @@ insert { return(INSERT_TUPLE); }`
`135`	`135`	`%%`
`136`	`136`
`137`	`137`	`void`
`138`		`-yyerror(const char *str)`
	`138`	`+yyerror(const char *message)`
`139`	`139`	`{`
`140`		`- elog(ERROR, "syntax error at line %d: unexpected token \"%s\"", yyline, str);`
	`140`	`+ elog(ERROR, "%s at line %d", message, yyline);`
`141`	`141`	`}`