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.

1 files changed, 2 insertions, 26 deletions

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<Expression> Parser::parsePrimaryExpression()
 		expression = nodeFactory.createNode<TupleExpression>(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))