Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf12f899

Browse files
committed
Fix error line numbers reported for errors in plpgsql_parse_word and
siblings.
1 parent3467b1a commitf12f899

File tree

1 file changed

+52
-18
lines changed

1 file changed

+52
-18
lines changed

‎src/pl/plpgsql/src/scan.l

Lines changed: 52 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* procedural language
55
*
66
* IDENTIFICATION
7-
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/scan.l,v 1.26 2003/05/29 22:30:02 tgl Exp $
7+
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/scan.l,v 1.27 2003/06/17 04:35:03 tgl Exp $
88
*
99
* This software is copyrighted by Jan Wieck - Hamburg.
1010
*
@@ -168,25 +168,59 @@ dump{ return O_DUMP;}
168168

169169
/* ----------
170170
* Special word rules
171+
*
172+
* We set plpgsql_error_lineno in each rule so that errors reported
173+
* in the pl_comp.c subroutines will point to the right place.
171174
* ----------
172175
*/
173-
{identifier}{returnplpgsql_parse_word(yytext);}
174-
{identifier}{space}*\.{space}*{identifier}{returnplpgsql_parse_dblword(yytext);}
175-
{identifier}{space}*\.{space}*{identifier}{space}*\.{space}*{identifier}{returnplpgsql_parse_tripword(yytext); }
176-
{identifier}{space}*%TYPE{returnplpgsql_parse_wordtype(yytext);}
177-
{identifier}{space}*\.{space}*{identifier}{space}*%TYPE{returnplpgsql_parse_dblwordtype(yytext); }
178-
{identifier}{space}*\.{space}*{identifier}{space}*\.{space}*{identifier}{space}*%TYPE{returnplpgsql_parse_tripwordtype(yytext); }
179-
{identifier}{space}*%ROWTYPE{returnplpgsql_parse_wordrowtype(yytext);}
180-
{identifier}{space}*\.{space}*{identifier}{space}*%ROWTYPE{returnplpgsql_parse_dblwordrowtype(yytext);}
181-
182-
\${digit}+{returnplpgsql_parse_word(yytext);}
183-
\${digit}+{space}*\.{space}*{identifier}{returnplpgsql_parse_dblword(yytext);}
184-
\${digit}+{space}*\.{space}*{identifier}{space}*\.{space}*{identifier}{returnplpgsql_parse_tripword(yytext); }
185-
\${digit}+{space}*%TYPE{returnplpgsql_parse_wordtype(yytext);}
186-
\${digit}+{space}*\.{space}*{identifier}{space}*%TYPE{returnplpgsql_parse_dblwordtype(yytext); }
187-
\${digit}+{space}*\.{space}*{identifier}{space}*\.{space}*{identifier}{space}*%TYPE{returnplpgsql_parse_tripwordtype(yytext); }
188-
\${digit}+{space}*%ROWTYPE{returnplpgsql_parse_wordrowtype(yytext);}
189-
\${digit}+{space}*\.{space}*{identifier}{space}*%ROWTYPE{returnplpgsql_parse_dblwordrowtype(yytext);}
176+
{identifier}{
177+
plpgsql_error_lineno =plpgsql_scanner_lineno();
178+
returnplpgsql_parse_word(yytext); }
179+
{identifier}{space}*\.{space}*{identifier}{
180+
plpgsql_error_lineno =plpgsql_scanner_lineno();
181+
returnplpgsql_parse_dblword(yytext); }
182+
{identifier}{space}*\.{space}*{identifier}{space}*\.{space}*{identifier}{
183+
plpgsql_error_lineno =plpgsql_scanner_lineno();
184+
returnplpgsql_parse_tripword(yytext); }
185+
{identifier}{space}*%TYPE{
186+
plpgsql_error_lineno =plpgsql_scanner_lineno();
187+
returnplpgsql_parse_wordtype(yytext); }
188+
{identifier}{space}*\.{space}*{identifier}{space}*%TYPE{
189+
plpgsql_error_lineno =plpgsql_scanner_lineno();
190+
returnplpgsql_parse_dblwordtype(yytext); }
191+
{identifier}{space}*\.{space}*{identifier}{space}*\.{space}*{identifier}{space}*%TYPE{
192+
plpgsql_error_lineno =plpgsql_scanner_lineno();
193+
returnplpgsql_parse_tripwordtype(yytext); }
194+
{identifier}{space}*%ROWTYPE{
195+
plpgsql_error_lineno =plpgsql_scanner_lineno();
196+
returnplpgsql_parse_wordrowtype(yytext); }
197+
{identifier}{space}*\.{space}*{identifier}{space}*%ROWTYPE{
198+
plpgsql_error_lineno =plpgsql_scanner_lineno();
199+
returnplpgsql_parse_dblwordrowtype(yytext); }
200+
\${digit}+{
201+
plpgsql_error_lineno =plpgsql_scanner_lineno();
202+
returnplpgsql_parse_word(yytext); }
203+
\${digit}+{space}*\.{space}*{identifier}{
204+
plpgsql_error_lineno =plpgsql_scanner_lineno();
205+
returnplpgsql_parse_dblword(yytext); }
206+
\${digit}+{space}*\.{space}*{identifier}{space}*\.{space}*{identifier}{
207+
plpgsql_error_lineno =plpgsql_scanner_lineno();
208+
returnplpgsql_parse_tripword(yytext); }
209+
\${digit}+{space}*%TYPE{
210+
plpgsql_error_lineno =plpgsql_scanner_lineno();
211+
returnplpgsql_parse_wordtype(yytext); }
212+
\${digit}+{space}*\.{space}*{identifier}{space}*%TYPE{
213+
plpgsql_error_lineno =plpgsql_scanner_lineno();
214+
returnplpgsql_parse_dblwordtype(yytext); }
215+
\${digit}+{space}*\.{space}*{identifier}{space}*\.{space}*{identifier}{space}*%TYPE{
216+
plpgsql_error_lineno =plpgsql_scanner_lineno();
217+
returnplpgsql_parse_tripwordtype(yytext); }
218+
\${digit}+{space}*%ROWTYPE{
219+
plpgsql_error_lineno =plpgsql_scanner_lineno();
220+
returnplpgsql_parse_wordrowtype(yytext); }
221+
\${digit}+{space}*\.{space}*{identifier}{space}*%ROWTYPE{
222+
plpgsql_error_lineno =plpgsql_scanner_lineno();
223+
returnplpgsql_parse_dblwordrowtype(yytext); }
190224

191225
{digit}+{return T_NUMBER;}
192226

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp