cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TestFileParser: rework readStream and handle new lines properly

Browse Source
This commit is contained in:
Alex Beregszaszi 2021-05-13 19:34:49 +01:00
parent 324caef53c
commit b24f2e0215
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/libsolidity/util/TestFileParser.cpp
View File

@ -489,11 +489,25 @@ string TestFileParser::parseString()
return literal;
}
namespace {
string _readStream(istream& _stream)
{
string ret;
while (!_stream.eof())
{
string tmp;
// NOTE: this will read until EOF or NL
getline(_stream, tmp);
ret.append(tmp);
ret.append("\n");
}
return ret;
}
}
void TestFileParser::Scanner::readStream(istream& _stream)
{
std::string line;
while (std::getline(_stream, line))
m_line += line;
m_line = _readStream(_stream);
m_char = m_line.begin();
}
@ -529,12 +543,8 @@ void TestFileParser::Scanner::scanNextToken()
{
switch(current())
{
case '/':
advance();
if (current() == '/')
selectToken(Token::Newline);
else
selectToken(Token::Invalid);
case '\n':
selectToken(Token::Newline);
break;
case '-':
if (peek() == '>')