aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity/parsing/Token.h
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-05-09 17:06:23 +0800
committerGitHub <noreply@github.com>2018-05-09 17:06:23 +0800
commit54aa10ce367297a4b4f5ae3513dbe8c715e9fb88 (patch)
treece5ad2cf32e2118ae92191ec648a1f522d1255c0 /libsolidity/parsing/Token.h
parentc79351efb05be08f3f1797c8cf6ff50988b74763 (diff)
parent840ed1e88a8d70bdbc541a1330654cb1e730e298 (diff)
downloaddexon-solidity-54aa10ce367297a4b4f5ae3513dbe8c715e9fb88.tar
dexon-solidity-54aa10ce367297a4b4f5ae3513dbe8c715e9fb88.tar.gz
dexon-solidity-54aa10ce367297a4b4f5ae3513dbe8c715e9fb88.tar.bz2
dexon-solidity-54aa10ce367297a4b4f5ae3513dbe8c715e9fb88.tar.lz
dexon-solidity-54aa10ce367297a4b4f5ae3513dbe8c715e9fb88.tar.xz
dexon-solidity-54aa10ce367297a4b4f5ae3513dbe8c715e9fb88.tar.zst
dexon-solidity-54aa10ce367297a4b4f5ae3513dbe8c715e9fb88.zip
Merge pull request #4054 from ethereum/token-names
Improve parser error messages
Diffstat (limited to 'libsolidity/parsing/Token.h')
-rw-r--r--libsolidity/parsing/Token.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/libsolidity/parsing/Token.h b/libsolidity/parsing/Token.h
index 805fbf5d..4d7a7bc6 100644
--- a/libsolidity/parsing/Token.h
+++ b/libsolidity/parsing/Token.h
@@ -304,6 +304,17 @@ public:
return m_string[tok];
}
+ static std::string friendlyName(Value tok)
+ {
+ char const* ret = toString(tok);
+ if (ret == nullptr)
+ {
+ ret = name(tok);
+ solAssert(ret != nullptr, "");
+ }
+ return std::string(ret);
+ }
+
// @returns the precedence > 0 for binary and compare
// operators; returns 0 otherwise.
static int precedence(Value tok)