Merge pull request #921 from chriseth/astjsoncleanup

JSON AST: Some attribute cleanup. Add linearized base contracts.
This commit is contained in:
chriseth 2016-08-23 17:14:13 +02:00 committed by GitHub
commit cab0f5448f
2 changed files with 35 additions and 36 deletions

View File

@ -31,21 +31,10 @@ namespace dev
namespace solidity namespace solidity
{ {
void ASTJsonConverter::addKeyValue(Json::Value& _obj, string const& _key, string const& _val)
{
// special handling for booleans
if (_key == "const" || _key == "public" || _key == "local" ||
_key == "lvalue" || _key == "local_lvalue" || _key == "prefix")
_obj[_key] = (_val == "1") ? true : false;
else
// else simply add it as a string
_obj[_key] = _val;
}
void ASTJsonConverter::addJsonNode( void ASTJsonConverter::addJsonNode(
ASTNode const& _node, ASTNode const& _node,
string const& _nodeName, string const& _nodeName,
initializer_list<pair<string const, string const>> _list, initializer_list<pair<string const, Json::Value const>> _attributes,
bool _hasChildren = false bool _hasChildren = false
) )
{ {
@ -54,11 +43,11 @@ void ASTJsonConverter::addJsonNode(
node["id"] = reinterpret_cast<Json::UInt64>(&_node); node["id"] = reinterpret_cast<Json::UInt64>(&_node);
node["src"] = sourceLocationToString(_node.location()); node["src"] = sourceLocationToString(_node.location());
node["name"] = _nodeName; node["name"] = _nodeName;
if (_list.size() != 0) if (_attributes.size() != 0)
{ {
Json::Value attrs; Json::Value attrs;
for (auto& e: _list) for (auto& e: _attributes)
addKeyValue(attrs, e.first, e.second); attrs[e.first] = e.second;
node["attributes"] = attrs; node["attributes"] = attrs;
} }
@ -122,7 +111,15 @@ bool ASTJsonConverter::visit(ImportDirective const& _node)
bool ASTJsonConverter::visit(ContractDefinition const& _node) bool ASTJsonConverter::visit(ContractDefinition const& _node)
{ {
addJsonNode(_node, "ContractDefinition", { make_pair("name", _node.name()) }, true); Json::Value linearizedBaseContracts(Json::arrayValue);
for (auto const& baseContract: _node.annotation().linearizedBaseContracts)
linearizedBaseContracts.append(reinterpret_cast<Json::UInt64>(baseContract));
addJsonNode(_node, "ContractDefinition", {
make_pair("name", _node.name()),
make_pair("isLibrary", _node.isLibrary()),
make_pair("fullyImplemented", _node.annotation().isFullyImplemented),
make_pair("linearizedBaseContracts", linearizedBaseContracts),
}, true);
return true; return true;
} }
@ -164,11 +161,11 @@ bool ASTJsonConverter::visit(ParameterList const& _node)
bool ASTJsonConverter::visit(FunctionDefinition const& _node) bool ASTJsonConverter::visit(FunctionDefinition const& _node)
{ {
addJsonNode(_node, "FunctionDefinition", addJsonNode(_node, "FunctionDefinition", {
{ make_pair("name", _node.name()), make_pair("name", _node.name()),
make_pair("public", boost::lexical_cast<std::string>(_node.isPublic())), make_pair("public", _node.isPublic()),
make_pair("const", boost::lexical_cast<std::string>(_node.isDeclaredConst())) }, make_pair("constant", _node.isDeclaredConst())
true); }, true);
return true; return true;
} }
@ -176,7 +173,7 @@ bool ASTJsonConverter::visit(VariableDeclaration const& _node)
{ {
addJsonNode(_node, "VariableDeclaration", { addJsonNode(_node, "VariableDeclaration", {
make_pair("name", _node.name()), make_pair("name", _node.name()),
make_pair("name", _node.name()), make_pair("type", type(_node))
}, true); }, true);
return true; return true;
} }
@ -326,7 +323,7 @@ bool ASTJsonConverter::visit(TupleExpression const& _node)
bool ASTJsonConverter::visit(UnaryOperation const& _node) bool ASTJsonConverter::visit(UnaryOperation const& _node)
{ {
addJsonNode(_node, "UnaryOperation", addJsonNode(_node, "UnaryOperation",
{ make_pair("prefix", boost::lexical_cast<std::string>(_node.isPrefixOperation())), { make_pair("prefix", _node.isPrefixOperation()),
make_pair("operator", Token::toString(_node.getOperator())), make_pair("operator", Token::toString(_node.getOperator())),
make_pair("type", type(_node)) }, make_pair("type", type(_node)) },
true); true);
@ -345,7 +342,7 @@ bool ASTJsonConverter::visit(BinaryOperation const& _node)
bool ASTJsonConverter::visit(FunctionCall const& _node) bool ASTJsonConverter::visit(FunctionCall const& _node)
{ {
addJsonNode(_node, "FunctionCall", { addJsonNode(_node, "FunctionCall", {
make_pair("type_conversion", boost::lexical_cast<std::string>(_node.annotation().isTypeConversion)), make_pair("type_conversion", _node.annotation().isTypeConversion),
make_pair("type", type(_node)) make_pair("type", type(_node))
}, true); }, true);
return true; return true;
@ -359,10 +356,10 @@ bool ASTJsonConverter::visit(NewExpression const& _node)
bool ASTJsonConverter::visit(MemberAccess const& _node) bool ASTJsonConverter::visit(MemberAccess const& _node)
{ {
addJsonNode(_node, "MemberAccess", addJsonNode(_node, "MemberAccess", {
{ make_pair("member_name", _node.memberName()), make_pair("member_name", _node.memberName()),
make_pair("type", type(_node)) }, make_pair("type", type(_node))
true); }, true);
return true; return true;
} }
@ -381,18 +378,21 @@ bool ASTJsonConverter::visit(Identifier const& _node)
bool ASTJsonConverter::visit(ElementaryTypeNameExpression const& _node) bool ASTJsonConverter::visit(ElementaryTypeNameExpression const& _node)
{ {
addJsonNode(_node, "ElementaryTypenameExpression", addJsonNode(_node, "ElementaryTypenameExpression", {
{ make_pair("value", _node.typeName().toString()), make_pair("type", type(_node)) }); make_pair("value", _node.typeName().toString()),
make_pair("type", type(_node))
});
return true; return true;
} }
bool ASTJsonConverter::visit(Literal const& _node) bool ASTJsonConverter::visit(Literal const& _node)
{ {
char const* tokenString = Token::toString(_node.token()); char const* tokenString = Token::toString(_node.token());
addJsonNode(_node, "Literal", addJsonNode(_node, "Literal", {
{ make_pair("string", (tokenString) ? tokenString : "null"), make_pair("string", tokenString ? tokenString : Json::Value()),
make_pair("value", _node.value()), make_pair("value", _node.value()),
make_pair("type", type(_node)) }); make_pair("type", type(_node))
});
return true; return true;
} }

View File

@ -141,11 +141,10 @@ public:
private: private:
void process(); void process();
void addKeyValue(Json::Value& _obj, std::string const& _key, std::string const& _val);
void addJsonNode( void addJsonNode(
ASTNode const& _node, ASTNode const& _node,
std::string const& _nodeName, std::string const& _nodeName,
std::initializer_list<std::pair<std::string const, std::string const>> _list, std::initializer_list<std::pair<std::string const, Json::Value const>> _attributes,
bool _hasChildren bool _hasChildren
); );
std::string sourceLocationToString(SourceLocation const& _location) const; std::string sourceLocationToString(SourceLocation const& _location) const;