From ed592d6ccb9a8a088dc8153baae78f771304a257 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Thu, 13 Jul 2017 00:17:25 +0100 Subject: Add option to recurse referencedSourceUnits --- libsolidity/ast/AST.cpp | 11 ++++++++--- libsolidity/ast/AST.h | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'libsolidity') diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp index c5fb35f6..a126e6ed 100644 --- a/libsolidity/ast/AST.cpp +++ b/libsolidity/ast/AST.cpp @@ -84,12 +84,17 @@ SourceUnitAnnotation& SourceUnit::annotation() const return dynamic_cast(*m_annotation); } -vector SourceUnit::referencedSourceUnits() const +set SourceUnit::referencedSourceUnits(bool _recurse) const { - vector sourceUnits; + set sourceUnits; for (ImportDirective const* importDirective: filteredNodes(nodes())) { - sourceUnits.push_back(importDirective->annotation().sourceUnit); + sourceUnits.insert(importDirective->annotation().sourceUnit); + if (_recurse) + { + set referencedSourceUnits = importDirective->annotation().sourceUnit->referencedSourceUnits(true); + sourceUnits.insert(referencedSourceUnits.begin(), referencedSourceUnits.end()); + } } return sourceUnits; } diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h index e2117613..2522867b 100644 --- a/libsolidity/ast/AST.h +++ b/libsolidity/ast/AST.h @@ -136,8 +136,8 @@ public: std::vector> nodes() const { return m_nodes; } - /// @returns a vector of referenced SourceUnits. - std::vector referencedSourceUnits() const; + /// @returns a set of referenced SourceUnits. Recursively if @a _recurse is true. + std::set referencedSourceUnits(bool _recurse = false) const; private: std::vector> m_nodes; -- cgit