From e454737a3cf389ee400a9ef1d9f252c579a2ceea Mon Sep 17 00:00:00 2001 From: Lazaridis Date: Thu, 22 Nov 2018 18:37:19 +0200 Subject: adapt to latest code changes --- libsolidity/parsing/Parser.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'libsolidity/parsing/Parser.cpp') diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp index ffe2be83..b78c58c6 100644 --- a/libsolidity/parsing/Parser.cpp +++ b/libsolidity/parsing/Parser.cpp @@ -1558,6 +1558,30 @@ ASTPointer Parser::parsePrimaryExpression() case Token::IllegalHex: fatalParserError("Expected even number of hex-nibbles within double-quotes."); break; + case Token::IllegalCommentTerminator: + fatalParserError("Expected multi-line comment-terminator."); + break; + case Token::IllegalStringEscape: + fatalParserError("Invalid String Escape."); + break; + case Token::IllegalStringEndQuote: + fatalParserError("Expected String end-quote."); + break; + case Token::IllegalNumberSeparator: + fatalParserError("Invalid use of Number Separator '_'."); + break; + case Token::IllegalHexDigit: + fatalParserError("Hex Digit missing or invalid."); + break; + case Token::IllegalOctalNotAllowed: + fatalParserError("Octal Numbers not allowed."); + break; + case Token::IllegalExponent: + fatalParserError("Invalid Exponent."); + break; + case Token::IllegalNumberEnd: + fatalParserError("Digit or Identifier-Start not allowed at end of Number."); + break; default: if (TokenTraits::isElementaryTypeName(token)) { -- cgit v1.2.3 From e4106bd06eebce9e17d51858a37bf82566b7f640 Mon Sep 17 00:00:00 2001 From: Christian Parpart Date: Fri, 23 Nov 2018 16:47:34 +0100 Subject: Change scanner error diagnostics to be non-intrusive to the token API. This also implicitly eliminates the magic-token Token::IllegalHex, and streamlines error diagnostics over a custom enum class. --- libsolidity/parsing/Parser.cpp | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) (limited to 'libsolidity/parsing/Parser.cpp') diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp index b78c58c6..3f4a015b 100644 --- a/libsolidity/parsing/Parser.cpp +++ b/libsolidity/parsing/Parser.cpp @@ -1555,32 +1555,8 @@ ASTPointer Parser::parsePrimaryExpression() expression = nodeFactory.createNode(components, isArray); break; } - case Token::IllegalHex: - fatalParserError("Expected even number of hex-nibbles within double-quotes."); - break; - case Token::IllegalCommentTerminator: - fatalParserError("Expected multi-line comment-terminator."); - break; - case Token::IllegalStringEscape: - fatalParserError("Invalid String Escape."); - break; - case Token::IllegalStringEndQuote: - fatalParserError("Expected String end-quote."); - break; - case Token::IllegalNumberSeparator: - fatalParserError("Invalid use of Number Separator '_'."); - break; - case Token::IllegalHexDigit: - fatalParserError("Hex Digit missing or invalid."); - break; - case Token::IllegalOctalNotAllowed: - fatalParserError("Octal Numbers not allowed."); - break; - case Token::IllegalExponent: - fatalParserError("Invalid Exponent."); - break; - case Token::IllegalNumberEnd: - fatalParserError("Digit or Identifier-Start not allowed at end of Number."); + case Token::Illegal: + fatalParserError(to_string(m_scanner->currentError())); break; default: if (TokenTraits::isElementaryTypeName(token)) -- cgit v1.2.3