diff options
| author | Tom Lane | 2003-07-27 21:49:55 +0000 |
|---|---|---|
| committer | Tom Lane | 2003-07-27 21:49:55 +0000 |
| commit | b556e8200e55261cf41de7ce8be4b38b0a062c2b (patch) | |
| tree | 46ee8f2361510e4a530ab78e24275d25c1bc1599 /src/pl/plpgsql | |
| parent | 606debf26833371b9ea56f297d9ec0d2ada534d5 (diff) | |
elog mop-up: bring some straggling fprintf(stderr)'s into the elog world.
Diffstat (limited to 'src/pl/plpgsql')
| -rw-r--r-- | src/pl/plpgsql/src/gram.y | 18 | ||||
| -rw-r--r-- | src/pl/plpgsql/src/pl_comp.c | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y index 8f0f76a4eab..97fb17f1b6c 100644 --- a/src/pl/plpgsql/src/gram.y +++ b/src/pl/plpgsql/src/gram.y @@ -4,7 +4,7 @@ * procedural language * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.45 2003/07/25 23:37:28 tgl Exp $ + * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.46 2003/07/27 21:49:54 tgl Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -553,7 +553,7 @@ decl_aliasitem : T_WORD plpgsql_convert_ident(yytext, &name, 1); if (name[0] != '$') - yyerror("can only alias positional parameters"); + yyerror("only positional parameters may be aliased"); plpgsql_ns_setlocal(false); nsi = plpgsql_ns_lookup(name, NULL); @@ -647,10 +647,10 @@ decl_defval : ';' switch (tok) { case 0: - yyerror("unexpected end of file"); + yyerror("unexpected end of function"); case K_NULL: if (yylex() != ';') - yyerror("expected ; after NULL"); + yyerror("expected \";\" after \"NULL\""); free(expr); plpgsql_dstring_free(&ds); @@ -1201,7 +1201,7 @@ stmt_return : K_RETURN lno break; } if (yylex() != ';') - yyerror("expected ';'"); + yyerror("expected \";\""); } else new->expr = plpgsql_read_expression(';', ";"); @@ -1232,10 +1232,10 @@ stmt_return_next: K_RETURN_NEXT lno else if (tok == T_ROW) new->row = yylval.row; else - yyerror("Incorrect argument to RETURN NEXT"); + yyerror("incorrect argument to RETURN NEXT"); if (yylex() != ';') - yyerror("Expected ';'"); + yyerror("expected \";\""); } else new->expr = plpgsql_read_expression(';', ";"); @@ -1467,7 +1467,7 @@ stmt_open : K_OPEN lno cursor_varptr cp += strlen(cp) - 1; if (*cp != ')') - yyerror("missing )"); + yyerror("expected \")\""); *cp = '\0'; } else @@ -2096,7 +2096,7 @@ check_assignable(PLpgSQL_datum *datum) yyerror("cannot assign to tg_argv"); break; default: - yyerror("check_assignable: unexpected datum type"); + elog(ERROR, "unrecognized dtype: %d", datum->dtype); break; } } diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c index a423e0be5aa..8ede81d061e 100644 --- a/src/pl/plpgsql/src/pl_comp.c +++ b/src/pl/plpgsql/src/pl_comp.c @@ -3,7 +3,7 @@ * procedural language * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.62 2003/07/27 18:38:26 tgl Exp $ + * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.63 2003/07/27 21:49:54 tgl Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -755,7 +755,7 @@ plpgsql_parse_word(char *word) trigarg->dtype = PLPGSQL_DTYPE_TRIGARG; if (plpgsql_yylex() != '[') - plpgsql_yyerror("expected ["); + plpgsql_yyerror("expected \"[\""); trigarg->argnum = plpgsql_read_expression(']', "]"); |