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 UsingForDirective

Browse Source
This commit is contained in:
Alex Sinyagin 2016-08-16 14:28:28 +00:00
parent 9e7fc12463
commit 40ca2c9e97
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libsolidity/ast/ASTJsonConverter.cpp
View File

@ -122,7 +122,13 @@ bool ASTJsonConverter::visit(ContractDefinition const& _node)
bool ASTJsonConverter::visit(InheritanceSpecifier const& _node) bool ASTJsonConverter::visit(InheritanceSpecifier const& _node)
{ {
addJsonNode(_node, "Inheritance", { }, true); addJsonNode(_node, "Inheritance", {}, true);
return true;
}
bool ASTJsonConverter::visit(UsingForDirective const& _node)
{
addJsonNode(_node, "UsingFor", {}, true);
return true; return true;
} }
@ -356,6 +362,11 @@ void ASTJsonConverter::endVisit(InheritanceSpecifier const&)
goUp(); goUp();
} }
void ASTJsonConverter::endVisit(UsingForDirective const&)
{
goUp();
}
void ASTJsonConverter::endVisit(StructDefinition const&) void ASTJsonConverter::endVisit(StructDefinition const&)
{ {
goUp(); goUp();

2
libsolidity/ast/ASTJsonConverter.h
View File

@ -54,6 +54,7 @@ public:
bool visit(ImportDirective const& _node) override; bool visit(ImportDirective const& _node) override;
bool visit(ContractDefinition const& _node) override; bool visit(ContractDefinition const& _node) override;
bool visit(InheritanceSpecifier const& _node) override; bool visit(InheritanceSpecifier const& _node) override;
bool visit(UsingForDirective const& _node) override;
bool visit(StructDefinition const& _node) override; bool visit(StructDefinition const& _node) override;
bool visit(ParameterList const& _node) override; bool visit(ParameterList const& _node) override;
bool visit(FunctionDefinition const& _node) override; bool visit(FunctionDefinition const& _node) override;
@ -89,6 +90,7 @@ public:
void endVisit(ImportDirective const&) override; void endVisit(ImportDirective const&) override;
void endVisit(ContractDefinition const&) override; void endVisit(ContractDefinition const&) override;
void endVisit(InheritanceSpecifier const&) override; void endVisit(InheritanceSpecifier const&) override;
void endVisit(UsingForDirective const&) override;
void endVisit(StructDefinition const&) override; void endVisit(StructDefinition const&) override;
void endVisit(ParameterList const&) override; void endVisit(ParameterList const&) override;
void endVisit(FunctionDefinition const&) override; void endVisit(FunctionDefinition const&) override;

17
test/libsolidity/ASTJSON.cpp
View File

@ -76,6 +76,23 @@ BOOST_AUTO_TEST_CASE(inheritance_specifier)
BOOST_CHECK_EQUAL(astJson["children"][1]["children"][0]["children"][0]["attributes"]["name"], "C1"); BOOST_CHECK_EQUAL(astJson["children"][1]["children"][0]["children"][0]["attributes"]["name"], "C1");
} }
BOOST_AUTO_TEST_CASE(using_for_directive)
{
CompilerStack c;
c.addSource("a", "library L {} contract C { using L for uint; }");
c.parse();
map<string, unsigned> sourceIndices;
sourceIndices["a"] = 1;
Json::Value astJson = ASTJsonConverter(c.ast("a"), sourceIndices).json();
Json::Value usingFor = astJson["children"][1]["children"][0];
BOOST_CHECK_EQUAL(usingFor["name"], "UsingFor");
BOOST_CHECK_EQUAL(usingFor["src"], "26:17:1");
BOOST_CHECK_EQUAL(usingFor["children"][0]["name"], "UserDefinedTypeName");
BOOST_CHECK_EQUAL(usingFor["children"][0]["attributes"]["name"], "L");
BOOST_CHECK_EQUAL(usingFor["children"][1]["name"], "ElementaryTypeName");
BOOST_CHECK_EQUAL(usingFor["children"][1]["attributes"]["name"], "uint");
}
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()
} }