firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 22:43:03 +01:00
Code Issues

This should fix CORE-5183: line/column numbering may be twisted if

Browse Source 
alias.name syntax is used. Testing is required before backporting into
v3.0.
This commit is contained in:
Dmitry Yemanov 2016-04-06 18:03:35 +03:00
parent aa799cefa1
commit 8e81bd6fc3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dsql/Parser.cpp
View File

@ -280,8 +280,8 @@ int Parser::yylex()
if (!yylexSkipSpaces())
return -1;
yyposn.firstLine = lex.lines;
yyposn.firstColumn = lex.ptr - lex.line_start;
yyposn.firstLine = lex.lines_bk;
yyposn.firstColumn = lex.last_token_bk - lex.line_start_bk + 1;
yyposn.firstPos = lex.ptr - 1;
lex.prev_keyword = yylexAux();

4
src/dsql/Parser.h
View File

@ -188,8 +188,8 @@ public:
private:
template <typename T> T* setupNode(Node* node)
{
node->line = (ULONG) lex.lines_bk;
node->column = (ULONG) (lex.last_token_bk - lex.line_start_bk + 1);
node->line = yyposn.firstLine;
node->column = yyposn.firstColumn;
return static_cast<T*>(node);
}