eelke/pgLab
1
0
Fork 0
Code Issues 28 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix lexer for empty input.

Browse source
This commit is contained in:
eelke 2019-01-28 20:52:39 +01:00
parent 077fae50af
commit 3b482c1c73
3 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/SqlLexer.cpp
View file

@ -148,7 +148,9 @@ bool SqlLexer::nextBasicToken(int &startpos, int &length, BasicTokenType &tokent
// m_state = LexerState::InBlockComment;
// }
else if (c == QChar::Null) {
break;
length = 0;
tokentype = BasicTokenType::End;
return true;
}
else if (c == '$') {
return parseDollarQuote(startpos, length, tokentype, out);

2
core/SqlLexer.h
View file

@ -52,7 +52,7 @@ public:
SqlToken nextBasicToken()
{
SqlToken token;
token.ok = !nextBasicToken(token.startPos, token.length, token.tokenType, token.out);
token.ok = nextBasicToken(token.startPos, token.length, token.tokenType, token.out);
return token;
}

13
tests/pglabtests/tst_SqlLexer.cpp
View file

@ -5,6 +5,19 @@
using namespace testing;
TEST(SqlLexer, emptyInput)
{
QString input;
SqlLexer lexer(input, LexerState::Null);
int startpos, length;
BasicTokenType tokentype;
QString out;
lexer.nextBasicToken(startpos, length, tokentype, out);
ASSERT_THAT(startpos, Eq(0));
ASSERT_THAT(tokentype, Eq(BasicTokenType::End));
}
TEST(SqlLexer, lexer)
{