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

Add ast json converter for ModifierInvocation and EventDefinition

Browse Source
This commit is contained in:
Alex Sinyagin 2016-08-17 14:52:14 +00:00
parent a5d15e6895
commit bdc2436ae3
3 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libsolidity/ast/ASTJsonConverter.cpp
View File

@ -181,11 +181,23 @@ bool ASTJsonConverter::visit(ModifierDefinition const& _node)
return true;
}
bool ASTJsonConverter::visit(ModifierInvocation const& _node)
{
addJsonNode(_node, "Modifier", {}, true);
return true;
}
bool ASTJsonConverter::visit(TypeName const&)
{
return true;
}
bool ASTJsonConverter::visit(EventDefinition const& _node)
{
addJsonNode(_node, "Event", { make_pair("name", _node.name()) }, true);
return true;
}
bool ASTJsonConverter::visit(ElementaryTypeName const& _node)
{
addJsonNode(_node, "ElementaryTypeName", { make_pair("name", _node.typeName().toString()) });
@ -420,6 +432,16 @@ void ASTJsonConverter::endVisit(ModifierDefinition const&)
goUp();
}
void ASTJsonConverter::endVisit(ModifierInvocation const&)
{
goUp();
}
void ASTJsonConverter::endVisit(EventDefinition const&)
{
goUp();
}
void ASTJsonConverter::endVisit(TypeName const&)
{
}

4
libsolidity/ast/ASTJsonConverter.h
View File

@ -62,6 +62,8 @@ public:
bool visit(FunctionDefinition const& _node) override;
bool visit(VariableDeclaration const& _node) override;
bool visit(ModifierDefinition const& _node) override;
bool visit(ModifierInvocation const& _node) override;
bool visit(EventDefinition const& _node) override;
bool visit(TypeName const& _node) override;
bool visit(ElementaryTypeName const& _node) override;
bool visit(UserDefinedTypeName const& _node) override;
@ -101,6 +103,8 @@ public:
void endVisit(FunctionDefinition const&) override;
void endVisit(VariableDeclaration const&) override;
void endVisit(ModifierDefinition const&) override;
void endVisit(ModifierInvocation const&) override;
void endVisit(EventDefinition const&) override;
void endVisit(TypeName const&) override;
void endVisit(ElementaryTypeName const&) override;
void endVisit(UserDefinedTypeName const&) override;

30
test/libsolidity/ASTJSON.cpp
View File

@ -139,6 +139,36 @@ BOOST_AUTO_TEST_CASE(modifier_definition)
BOOST_CHECK_EQUAL(modifier["src"], "13:24:1");
}
BOOST_AUTO_TEST_CASE(modifier_invocation)
{
CompilerStack c;
c.addSource("a", "contract C { modifier M(uint i) { _ } function F() M(1) {} }");
c.parse();
map<string, unsigned> sourceIndices;
sourceIndices["a"] = 1;
Json::Value astJson = ASTJsonConverter(c.ast("a"), sourceIndices).json();
Json::Value modifier = astJson["children"][0]["children"][1]["children"][2];
BOOST_CHECK_EQUAL(modifier["name"], "Modifier");
BOOST_CHECK_EQUAL(modifier["src"], "51:4:1");
BOOST_CHECK_EQUAL(modifier["children"][0]["attributes"]["type"], "modifier (uint256)");
BOOST_CHECK_EQUAL(modifier["children"][0]["attributes"]["value"], "M");
BOOST_CHECK_EQUAL(modifier["children"][1]["attributes"]["value"], "1");
}
BOOST_AUTO_TEST_CASE(event_definition)
{
CompilerStack c;
c.addSource("a", "contract C { event E(); }");
c.parse();
map<string, unsigned> sourceIndices;
sourceIndices["a"] = 1;
Json::Value astJson = ASTJsonConverter(c.ast("a"), sourceIndices).json();
Json::Value event = astJson["children"][0]["children"][0];
BOOST_CHECK_EQUAL(event["name"], "Event");
BOOST_CHECK_EQUAL(event["attributes"]["name"], "E");
BOOST_CHECK_EQUAL(event["src"], "13:10:1");
}
BOOST_AUTO_TEST_SUITE_END()
}