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

include new InlineAssemblyInformation into JSON

Browse Source
This commit is contained in:
djudjuu 2017-05-17 15:52:45 +02:00
parent a4ba5ace8a
commit e3583d04f7
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libsolidity/ast/ASTJsonConverter.cpp
View File

@ -171,6 +171,16 @@ void ASTJsonConverter::appendExpressionAttributes(
_attributes.insert(_attributes.end(), exprAttributes.begin(), exprAttributes.end());
}
Json::Value ASTJsonConverter::inlineAssemblyIdentifierToJson(pair<assembly::Identifier const* ,InlineAssemblyAnnotation::ExternalIdentifierInfo> _info)
{
Json::Value tuple(Json::objectValue);
tuple["src"] = sourceLocationToString(_info.first->location);
tuple["declaration"] = idOrNull(_info.second.declaration);
tuple["isSlot"] = Json::Value(_info.second.isSlot);
tuple["isOffset"] = Json::Value(_info.second.isOffset);
tuple["valueSize"] = _info.second.valueSize;
return tuple;
}
void ASTJsonConverter::print(ostream& _stream, ASTNode const& _node)
{
@ -441,10 +451,10 @@ bool ASTJsonConverter::visit(InlineAssembly const& _node)
Json::Value externalReferences(Json::arrayValue);
for (auto const& it : _node.annotation().externalReferences)
{
if (it.first && it.second)
if (it.first)
{
Json::Value tuple(Json::objectValue);
tuple[it.first->name] = nodeId(*it.second);
tuple[it.first->name] = inlineAssemblyIdentifierToJson(it);
externalReferences.append(tuple);
}
}

1
libsolidity/ast/ASTJsonConverter.h
View File

@ -128,6 +128,7 @@ private:
{
return _node ? toJson(*_node) : Json::nullValue;
}
Json::Value inlineAssemblyIdentifierToJson(std::pair<assembly::Identifier const* , InlineAssemblyAnnotation::ExternalIdentifierInfo> _info);
std::string visibility(Declaration::Visibility const& _visibility);
std::string location(VariableDeclaration::Location _location);
std::string contractKind(ContractDefinition::ContractKind _kind);