From e3279d8af89c9b5e99e6bca206cb5ce6ef5b0291 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 17 Apr 2018 13:28:47 +0100
Subject: Display nicer error messages in the parser (display tokens and not
 internal names)

---
 libsolidity/parsing/ParserBase.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'libsolidity/parsing/ParserBase.cpp')

diff --git a/libsolidity/parsing/ParserBase.cpp b/libsolidity/parsing/ParserBase.cpp
index 617a1779..1dd3bdd2 100644
--- a/libsolidity/parsing/ParserBase.cpp
+++ b/libsolidity/parsing/ParserBase.cpp
@@ -71,10 +71,10 @@ void ParserBase::expectToken(Token::Value _value, bool _advance)
 		if (Token::isReservedKeyword(tok))
 		{
 			fatalParserError(
-				string("Expected token ") +
-				string(Token::name(_value)) +
-				string(" got reserved keyword '") +
-				string(Token::name(tok)) +
+				string("Expected '") +
+				string(Token::toString(_value)) +
+				string("' but got reserved keyword '") +
+				string(Token::toString(tok)) +
 				string("'")
 			);
 		}
@@ -82,19 +82,19 @@ void ParserBase::expectToken(Token::Value _value, bool _advance)
 		{
 			ElementaryTypeNameToken elemTypeName = m_scanner->currentElementaryTypeNameToken();
 			fatalParserError(
-				string("Expected token ") +
-				string(Token::name(_value)) +
-				string(" got '") +
+				string("Expected '") +
+				string(Token::toString(_value)) +
+				string("' but got '") +
 				elemTypeName.toString() +
 				string("'")
 			);
 		}
 		else
 			fatalParserError(
-				string("Expected token ") +
-				string(Token::name(_value)) +
-				string(" got '") +
-				string(Token::name(m_scanner->currentToken())) +
+				string("Expected '") +
+				string(Token::toString(_value)) +
+				string("' but got '") +
+				string(Token::toString(m_scanner->currentToken())) +
 				string("'")
 			);
 	}
-- 
cgit v1.2.3