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

fix Literalprint

Browse Source
This commit is contained in:
djudjuu 2017-05-30 19:07:47 +02:00
parent 254b55728f
commit 597bf8a43d
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libsolidity/ast/ASTJsonConverter.cpp
View File

@ -704,13 +704,13 @@ bool ASTJsonConverter::visit(ElementaryTypeNameExpression const& _node)
bool ASTJsonConverter::visit(Literal const& _node) bool ASTJsonConverter::visit(Literal const& _node)
{ {
char const* tokenString = Token::toString(_node.token()); string tokenString = tokenKind(_node.token());
Json::Value value{_node.value()}; Json::Value value{_node.value()};
if (!dev::validateUTF8(_node.value())) if (!dev::validateUTF8(_node.value()))
value = Json::nullValue; value = Json::nullValue;
Token::Value subdenomination = Token::Value(_node.subDenomination()); Token::Value subdenomination = Token::Value(_node.subDenomination());
std::vector<pair<string, Json::Value>> attributes = { std::vector<pair<string, Json::Value>> attributes = {
make_pair("token", tokenString ? tokenString : Json::Value()), make_pair(m_legacy ? "token" : "kind", tokenString),
make_pair("value", value), make_pair("value", value),
make_pair(m_legacy ? "hexvalue" : "hexValue", toHex(_node.value())), make_pair(m_legacy ? "hexvalue" : "hexValue", toHex(_node.value())),
make_pair( make_pair(
@ -793,6 +793,23 @@ string ASTJsonConverter::functionCallKind(FunctionCallKind _kind)
} }
} }
string ASTJsonConverter::tokenKind(Token::Value _token)
{
switch (_token)
{
case dev::solidity::Token::Number:
return "number";
case dev::solidity::Token::StringLiteral:
return "string";
case dev::solidity::Token::TrueLiteral:
return "bool";
case dev::solidity::Token::FalseLiteral:
return "bool";
default:
BOOST_THROW_EXCEPTION(InternalCompilerError() << errinfo_comment("Unknown kind of literal token."));
}
}
string ASTJsonConverter::type(Expression const& _expression) string ASTJsonConverter::type(Expression const& _expression)
{ {
return _expression.annotation().type ? _expression.annotation().type->toString() : "Unknown"; return _expression.annotation().type ? _expression.annotation().type->toString() : "Unknown";

1
libsolidity/ast/ASTJsonConverter.h
View File

@ -133,6 +133,7 @@ private:
std::string location(VariableDeclaration::Location _location); std::string location(VariableDeclaration::Location _location);
std::string contractKind(ContractDefinition::ContractKind _kind); std::string contractKind(ContractDefinition::ContractKind _kind);
std::string functionCallKind(FunctionCallKind _kind); std::string functionCallKind(FunctionCallKind _kind);
std::string tokenKind(Token::Value _token);
std::string type(Expression const& _expression); std::string type(Expression const& _expression);
std::string type(VariableDeclaration const& _varDecl); std::string type(VariableDeclaration const& _varDecl);
int nodeId(ASTNode const& _node) int nodeId(ASTNode const& _node)