mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Arrange that the string "syntax error" generated by bison is translated.

Browse Source
This commit is contained in:
Peter Eisentraut 2009-06-10 23:11:52 +00:00
parent 14ba9fdef6
commit 0465c52b00
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/interfaces/ecpg/preproc/ecpg.header
View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.header,v 1.6 2009/06/03 20:24:51 tgl Exp $ */ /* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.header,v 1.7 2009/06/10 23:11:52 petere Exp $ */
/* Copyright comment */ /* Copyright comment */
%{ %{
@ -22,6 +22,12 @@
*/ */
#define base_yylex filtered_base_yylex #define base_yylex filtered_base_yylex
/*
* This is only here so the string gets into the POT. Bison uses it
* internally.
*/
#define bison_gettext_dummy gettext_noop("syntax error")
/* /*
* Variables containing simple states. * Variables containing simple states.
*/ */

5
src/interfaces/ecpg/preproc/ecpg.trailer
View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.8 2009/06/03 20:24:51 tgl Exp $ */ /* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.9 2009/06/10 23:11:52 petere Exp $ */
statements: /*EMPTY*/ statements: /*EMPTY*/
| statements statement | statements statement
@ -1987,8 +1987,9 @@ ecpg_into: INTO into_list { $$ = EMPTY; }
void base_yyerror(const char *error) void base_yyerror(const char *error)
{ {
/* translator: %s is typically the translation of "syntax error" */
mmerror(PARSE_ERROR, ET_ERROR, "%s at or near \"%s\"", mmerror(PARSE_ERROR, ET_ERROR, "%s at or near \"%s\"",
error, token_start ? token_start : yytext); _(error), token_start ? token_start : yytext);
} }
void parser_init(void) void parser_init(void)