From bdc2436ae38b9028311736ef52f36e3525227eb6 Mon Sep 17 00:00:00 2001 From: Alex Sinyagin Date: Wed, 17 Aug 2016 14:52:14 +0000 Subject: Add ast json converter for ModifierInvocation and EventDefinition --- libsolidity/ast/ASTJsonConverter.cpp | 22 ++++++++++++++++++++++ libsolidity/ast/ASTJsonConverter.h | 4 ++++ 2 files changed, 26 insertions(+) (limited to 'libsolidity') diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp index bcf2577a..b8d5f43e 100644 --- a/libsolidity/ast/ASTJsonConverter.cpp +++ b/libsolidity/ast/ASTJsonConverter.cpp @@ -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&) { } diff --git a/libsolidity/ast/ASTJsonConverter.h b/libsolidity/ast/ASTJsonConverter.h index 7808d76f..e26bab75 100644 --- a/libsolidity/ast/ASTJsonConverter.h +++ b/libsolidity/ast/ASTJsonConverter.h @@ -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; -- cgit