Commit2efb8e8

committed

Code review for 'at character n' patch --- point at proper end of

a token scanned by multiple lex rules.

1 parent2c6b34d commit2efb8e8Copy full SHA for 2efb8e8

File tree

-8

lines changed

-8

lines changed

Lines changed: 8 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.99 2002/08/17 13:06:50 momjian Exp $`
	`12`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.100 2002/08/18 03:35:08 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -582,12 +582,13 @@ other.`
`582`	`582`	`void`
`583`	`583`	`yyerror(constchar *message)`
`584`	`584`	`{`
`585`		`-if(yyleng ==1 && *yytext == YY_END_OF_BUFFER_CHAR)`
`586`		`-elog(ERROR,"parser: %s at end of input",message);`
`587`		`-else`
`588`		`-elog(ERROR,"parser: %s at or near\"%s\" at character %i",`
`589`		`- message,token_start ? token_start : yytext,`
`590`		`- (unsignedint)(yytext - scanbuf +1));`
	`585`	`+constchar *loc = token_start ? token_start : yytext;`
	`586`	`+`
	`587`	`+if (*loc == YY_END_OF_BUFFER_CHAR)`
	`588`	`+elog(ERROR,"parser: %s at end of input", message);`
	`589`	`+else`
	`590`	`+elog(ERROR,"parser: %s at or near\"%s\" at character %d",`
	`591`	`+ message, loc, (loc - scanbuf +1));`
`591`	`592`	`}`
`592`	`593`
`593`	`594`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ SELECT 'first line'`
`18`	`18`	`' - next line' /* this comment is not allowed here */`
`19`	`19`	`' - third line'`
`20`	`20`	`AS "Illegal comment within continuation";`
`21`		`-ERROR: parser: parse error at or near "' - third line'" at character89`
	`21`	`+ERROR: parser: parse error at or near "' - third line'" at character75`
`22`	`22`	`--`
`23`	`23`	`-- test conversions between various string types`
`24`	`24`	`-- E021-10 implicit casting among the character data types`

Comments

(0)