cerc-io/solidity
10
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

Rework TestFileParser

Browse Source
This commit is contained in:
Alex Beregszaszi 2020-11-03 20:19:02 +00:00 committed by chriseth
parent c002fcc39f
commit 81c448fb4c
2 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -487,26 +487,28 @@ void TestFileParser::Scanner::scanNextToken()
// Make code coverage happy. // Make code coverage happy.
assert(formatToken(Token::NUM_TOKENS) == ""); assert(formatToken(Token::NUM_TOKENS) == "");
auto detectKeyword = [](std::string const& _literal = "") -> TokenDesc { auto detectKeyword = [](std::string const& _literal = "") -> std::pair<Token, std::string> {
if (_literal == "true") return TokenDesc{Token::Boolean, _literal}; if (_literal == "true") return {Token::Boolean, "true"};
if (_literal == "false") return TokenDesc{Token::Boolean, _literal}; if (_literal == "false") return {Token::Boolean, "false"};
if (_literal == "ether") return TokenDesc{Token::Ether, _literal}; if (_literal == "ether") return {Token::Ether, ""};
if (_literal == "wei") return TokenDesc{Token::Wei, _literal}; if (_literal == "wei") return {Token::Wei, ""};
if (_literal == "left") return TokenDesc{Token::Left, _literal}; if (_literal == "left") return {Token::Left, ""};
if (_literal == "library") return TokenDesc{Token::Library, _literal}; if (_literal == "library") return {Token::Library, ""};
if (_literal == "right") return TokenDesc{Token::Right, _literal}; if (_literal == "right") return {Token::Right, ""};
if (_literal == "hex") return TokenDesc{Token::Hex, _literal}; if (_literal == "hex") return {Token::Hex, ""};
if (_literal == "FAILURE") return TokenDesc{Token::Failure, _literal}; if (_literal == "FAILURE") return {Token::Failure, ""};
if (_literal == "storage") return TokenDesc{Token::Storage, _literal}; if (_literal == "storage") return {Token::Storage, ""};
return TokenDesc{Token::Identifier, _literal}; return {Token::Identifier, _literal};
}; };
auto selectToken = [this](Token _token, std::optional<std::string> _literal = std::nullopt) -> TokenDesc { auto selectToken = [this](Token _token, std::string const& _literal = "") {
advance(); advance();
return make_pair(_token, _literal.has_value() ? *_literal : formatToken(_token)); m_currentToken = _token;
m_currentLiteral = _literal;
}; };
TokenDesc token = make_pair(Token::Unknown, ""); m_currentToken = Token::Unknown;
m_currentLiteral = "";
do do
{ {
switch(current()) switch(current())
@ -514,48 +516,48 @@ void TestFileParser::Scanner::scanNextToken()
case '/': case '/':
advance(); advance();
if (current() == '/') if (current() == '/')
token = selectToken(Token::Newline); selectToken(Token::Newline);
else else
token = selectToken(Token::Invalid); selectToken(Token::Invalid);
break; break;
case '-': case '-':
if (peek() == '>') if (peek() == '>')
{ {
advance(); advance();
token = selectToken(Token::Arrow); selectToken(Token::Arrow);
} }
else else
token = selectToken(Token::Sub); selectToken(Token::Sub);
break; break;
case ':': case ':':
token = selectToken(Token::Colon); selectToken(Token::Colon);
break; break;
case '#': case '#':
token = selectToken(Token::Comment, scanComment()); selectToken(Token::Comment, scanComment());
break; break;
case ',': case ',':
token = selectToken(Token::Comma); selectToken(Token::Comma);
break; break;
case '(': case '(':
token = selectToken(Token::LParen); selectToken(Token::LParen);
break; break;
case ')': case ')':
token = selectToken(Token::RParen); selectToken(Token::RParen);
break; break;
case '[': case '[':
token = selectToken(Token::LBrack); selectToken(Token::LBrack);
break; break;
case ']': case ']':
token = selectToken(Token::RBrack); selectToken(Token::RBrack);
break; break;
case '\"': case '\"':
token = selectToken(Token::String, scanString()); selectToken(Token::String, scanString());
break; break;
default: default:
if (langutil::isIdentifierStart(current())) if (langutil::isIdentifierStart(current()))
{ {
TokenDesc detectedToken = detectKeyword(scanIdentifierOrKeyword()); std::tie(m_currentToken, m_currentLiteral) = detectKeyword(scanIdentifierOrKeyword());
token = selectToken(detectedToken.first, detectedToken.second); advance();
} }
else if (langutil::isDecimalDigit(current())) else if (langutil::isDecimalDigit(current()))
{ {
@ -563,22 +565,24 @@ void TestFileParser::Scanner::scanNextToken()
{ {
advance(); advance();
advance(); advance();
token = selectToken(Token::HexNumber, "0x" + scanHexNumber()); selectToken(Token::HexNumber, "0x" + scanHexNumber());
} }
else else
token = selectToken(Token::Number, scanDecimalNumber()); selectToken(Token::Number, scanDecimalNumber());
} }
else if (langutil::isWhiteSpace(current())) else if (langutil::isWhiteSpace(current()))
token = selectToken(Token::Whitespace); selectToken(Token::Whitespace);
else if (isEndOfLine()) else if (isEndOfLine())
token = make_pair(Token::EOS, "EOS"); {
m_currentToken = Token::EOS;
m_currentLiteral = "";
}
else else
throw TestParserError("Unexpected character: '" + string{current()} + "'"); throw TestParserError("Unexpected character: '" + string{current()} + "'");
break; break;
} }
} }
while (token.first == Token::Whitespace); while (m_currentToken == Token::Whitespace);
m_currentToken = token;
} }
string TestFileParser::Scanner::scanComment() string TestFileParser::Scanner::scanComment()

9
test/libsolidity/util/TestFileParser.h
View File

@ -79,8 +79,8 @@ private:
/// Reads character stream and creates token. /// Reads character stream and creates token.
void scanNextToken(); void scanNextToken();
soltest::Token currentToken() { return m_currentToken.first; } soltest::Token currentToken() { return m_currentToken; }
std::string currentLiteral() { return m_currentToken.second; } std::string currentLiteral() { return m_currentLiteral; }
std::string scanComment(); std::string scanComment();
std::string scanIdentifierOrKeyword(); std::string scanIdentifierOrKeyword();
@ -90,8 +90,6 @@ private:
char scanHexPart(); char scanHexPart();
private: private:
using TokenDesc = std::pair<soltest::Token, std::string>;
/// Advances current position in the input stream. /// Advances current position in the input stream.
void advance(unsigned n = 1) void advance(unsigned n = 1)
{ {
@ -118,7 +116,8 @@ private:
std::string m_line; std::string m_line;
std::string::const_iterator m_char; std::string::const_iterator m_char;
TokenDesc m_currentToken; std::string m_currentLiteral;
soltest::Token m_currentToken = soltest::Token::Unknown;
}; };
bool accept(soltest::Token _token, bool const _expect = false); bool accept(soltest::Token _token, bool const _expect = false);