cerc-io/solidity
10
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

dead-code cleanup & renames

Browse Source
This commit is contained in:
Christian Parpart 2020-06-08 11:43:24 +02:00
parent cca832e56a
commit 66fa2f6400
6 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libsolidity/ast/AST.cpp
View File

@ -74,22 +74,6 @@ set<SourceUnit const*> SourceUnit::referencedSourceUnits(bool _recurse, set<Sour
return sourceUnits; return sourceUnits;
} }
void SourceUnit::replaceNode(ASTPointer<ASTNode> _oldNode, ASTPointer<ASTNode> _newNode)
{
solAssert(
boost::range::find_if(
m_nodes,
[&](auto const& node) { return node->id() == _oldNode->id(); }
) != m_nodes.end(),
""
);
boost::range::replace_if(
m_nodes,
[&](auto const& node) { return node->id() == _oldNode->id(); },
_newNode
);
}
ImportAnnotation& ImportDirective::annotation() const ImportAnnotation& ImportDirective::annotation() const
{ {
return initAnnotation<ImportAnnotation>(); return initAnnotation<ImportAnnotation>();
@ -231,7 +215,7 @@ vector<pair<util::FixedHash<4>, FunctionTypePointer>> const& ContractDefinition:
}); });
} }
TypePointer ImportedContractDefinition::type() const TypePointer ImportedInterfaceDefinition::type() const
{ {
return {}; return {};
// TODO: Think about whether this type needs to be specified or returning {} is sufficient. // TODO: Think about whether this type needs to be specified or returning {} is sufficient.

9
libsolidity/ast/AST.h
View File

@ -173,9 +173,6 @@ public:
std::optional<std::string> const& licenseString() const { return m_licenseString; } std::optional<std::string> const& licenseString() const { return m_licenseString; }
std::vector<ASTPointer<ASTNode>> const& nodes() const { return m_nodes; } std::vector<ASTPointer<ASTNode>> const& nodes() const { return m_nodes; }
/// Replaces given top-level AST node with a new AST node.
void replaceNode(ASTPointer<ASTNode> _oldNode, ASTPointer<ASTNode> _newNode);
/// @returns a set of referenced SourceUnits. Recursively if @a _recurse is true. /// @returns a set of referenced SourceUnits. Recursively if @a _recurse is true.
std::set<SourceUnit const*> referencedSourceUnits(bool _recurse = false, std::set<SourceUnit const*> _skipList = std::set<SourceUnit const*>()) const; std::set<SourceUnit const*> referencedSourceUnits(bool _recurse = false, std::set<SourceUnit const*> _skipList = std::set<SourceUnit const*>()) const;
@ -458,13 +455,13 @@ protected:
* *
* This is not the actually imported interface but the reference to it. * This is not the actually imported interface but the reference to it.
* It will be resolved by CompilerStack to add any missing interface definitions * It will be resolved by CompilerStack to add any missing interface definitions
* by looking for any ImportedContractDefinition in the ASTs and append them - embeded into * by looking for any ImportedInterfaceDefinition in the ASTs and append them - embeded into
* SourceUnit's - to its collection of sources. * SourceUnit's - to its collection of sources.
*/ */
class ImportedContractDefinition: public Declaration // TODO(needed?), public StructurallyDocumented class ImportedInterfaceDefinition: public Declaration // TODO(needed?), public StructurallyDocumented
{ {
public: public:
ImportedContractDefinition( ImportedInterfaceDefinition(
int64_t _id, int64_t _id,
SourceLocation const& _location, SourceLocation const& _location,
ASTPointer<ASTString> _name, ASTPointer<ASTString> _name,

8
libsolidity/ast/ASTVisitor.h
View File

@ -56,7 +56,7 @@ public:
virtual bool visit(SourceUnit& _node) { return visitNode(_node); } virtual bool visit(SourceUnit& _node) { return visitNode(_node); }
virtual bool visit(PragmaDirective& _node) { return visitNode(_node); } virtual bool visit(PragmaDirective& _node) { return visitNode(_node); }
virtual bool visit(ImportDirective& _node) { return visitNode(_node); } virtual bool visit(ImportDirective& _node) { return visitNode(_node); }
virtual bool visit(ImportedContractDefinition& _node) { return visitNode(_node); } virtual bool visit(ImportedInterfaceDefinition& _node) { return visitNode(_node); }
virtual bool visit(ContractDefinition& _node) { return visitNode(_node); } virtual bool visit(ContractDefinition& _node) { return visitNode(_node); }
virtual bool visit(InheritanceSpecifier& _node) { return visitNode(_node); } virtual bool visit(InheritanceSpecifier& _node) { return visitNode(_node); }
virtual bool visit(UsingForDirective& _node) { return visitNode(_node); } virtual bool visit(UsingForDirective& _node) { return visitNode(_node); }
@ -109,7 +109,7 @@ public:
virtual void endVisit(SourceUnit& _node) { endVisitNode(_node); } virtual void endVisit(SourceUnit& _node) { endVisitNode(_node); }
virtual void endVisit(PragmaDirective& _node) { endVisitNode(_node); } virtual void endVisit(PragmaDirective& _node) { endVisitNode(_node); }
virtual void endVisit(ImportDirective& _node) { endVisitNode(_node); } virtual void endVisit(ImportDirective& _node) { endVisitNode(_node); }
virtual void endVisit(ImportedContractDefinition& _node) { endVisitNode(_node); } virtual void endVisit(ImportedInterfaceDefinition& _node) { endVisitNode(_node); }
virtual void endVisit(ContractDefinition& _node) { endVisitNode(_node); } virtual void endVisit(ContractDefinition& _node) { endVisitNode(_node); }
virtual void endVisit(InheritanceSpecifier& _node) { endVisitNode(_node); } virtual void endVisit(InheritanceSpecifier& _node) { endVisitNode(_node); }
virtual void endVisit(UsingForDirective& _node) { endVisitNode(_node); } virtual void endVisit(UsingForDirective& _node) { endVisitNode(_node); }
@ -184,7 +184,7 @@ public:
virtual bool visit(SourceUnit const& _node) { return visitNode(_node); } virtual bool visit(SourceUnit const& _node) { return visitNode(_node); }
virtual bool visit(PragmaDirective const& _node) { return visitNode(_node); } virtual bool visit(PragmaDirective const& _node) { return visitNode(_node); }
virtual bool visit(ImportDirective const& _node) { return visitNode(_node); } virtual bool visit(ImportDirective const& _node) { return visitNode(_node); }
virtual bool visit(ImportedContractDefinition const& _node) { return visitNode(_node); } virtual bool visit(ImportedInterfaceDefinition const& _node) { return visitNode(_node); }
virtual bool visit(ContractDefinition const& _node) { return visitNode(_node); } virtual bool visit(ContractDefinition const& _node) { return visitNode(_node); }
virtual bool visit(InheritanceSpecifier const& _node) { return visitNode(_node); } virtual bool visit(InheritanceSpecifier const& _node) { return visitNode(_node); }
virtual bool visit(StructDefinition const& _node) { return visitNode(_node); } virtual bool visit(StructDefinition const& _node) { return visitNode(_node); }
@ -237,7 +237,7 @@ public:
virtual void endVisit(SourceUnit const& _node) { endVisitNode(_node); } virtual void endVisit(SourceUnit const& _node) { endVisitNode(_node); }
virtual void endVisit(PragmaDirective const& _node) { endVisitNode(_node); } virtual void endVisit(PragmaDirective const& _node) { endVisitNode(_node); }
virtual void endVisit(ImportDirective const& _node) { endVisitNode(_node); } virtual void endVisit(ImportDirective const& _node) { endVisitNode(_node); }
virtual void endVisit(ImportedContractDefinition const& _node) { endVisitNode(_node); } virtual void endVisit(ImportedInterfaceDefinition const& _node) { endVisitNode(_node); }
virtual void endVisit(ContractDefinition const& _node) { endVisitNode(_node); } virtual void endVisit(ContractDefinition const& _node) { endVisitNode(_node); }
virtual void endVisit(InheritanceSpecifier const& _node) { endVisitNode(_node); } virtual void endVisit(InheritanceSpecifier const& _node) { endVisitNode(_node); }
virtual void endVisit(UsingForDirective const& _node) { endVisitNode(_node); } virtual void endVisit(UsingForDirective const& _node) { endVisitNode(_node); }

4
libsolidity/ast/AST_accept.h
View File

@ -79,13 +79,13 @@ void StructuredDocumentation::accept(ASTConstVisitor& _visitor) const
_visitor.endVisit(*this); _visitor.endVisit(*this);
} }
void ImportedContractDefinition::accept(ASTVisitor& _visitor) void ImportedInterfaceDefinition::accept(ASTVisitor& _visitor)
{ {
_visitor.visit(*this); _visitor.visit(*this);
_visitor.endVisit(*this); _visitor.endVisit(*this);
} }
void ImportedContractDefinition::accept(ASTConstVisitor& _visitor) const void ImportedInterfaceDefinition::accept(ASTConstVisitor& _visitor) const
{ {
_visitor.visit(*this); _visitor.visit(*this);
_visitor.endVisit(*this); _visitor.endVisit(*this);

10
libsolidity/interface/CompilerStack.cpp
View File

@ -289,9 +289,9 @@ void CompilerStack::loadMissingInterfaces(int64_t _baseNodeID)
for (ASTPointer<ASTNode> const& astNode: source->nodes()) for (ASTPointer<ASTNode> const& astNode: source->nodes())
{ {
if (auto const* importedContract = dynamic_cast<ImportedContractDefinition const*>(astNode.get())) if (auto const* importedInterface = dynamic_cast<ImportedInterfaceDefinition const*>(astNode.get()))
{ {
string const fileName = *importedContract->path(); string const fileName = *importedInterface->path();
ReadCallback::Result result{false, string("File not supplied initially.")}; ReadCallback::Result result{false, string("File not supplied initially.")};
if (m_readFile) if (m_readFile)
result = m_readFile(ReadCallback::kindString(ReadCallback::Kind::ReadFile), fileName); result = m_readFile(ReadCallback::kindString(ReadCallback::Kind::ReadFile), fileName);
@ -303,9 +303,9 @@ void CompilerStack::loadMissingInterfaces(int64_t _baseNodeID)
ASTPointer<SourceUnit> importedSource = ASTPointer<SourceUnit> importedSource =
interfaceImporter.importInterfaceAsSourceUnit( interfaceImporter.importInterfaceAsSourceUnit(
importedContract->location(), importedInterface->location(),
source->licenseString(), source->licenseString(),
importedContract->name(), importedInterface->name(),
json json
); );
@ -317,7 +317,7 @@ void CompilerStack::loadMissingInterfaces(int64_t _baseNodeID)
m_errorReporter.fatalParserError( m_errorReporter.fatalParserError(
31415_error, // TODO: ensure this number is unique (we should have a CI for that) 31415_error, // TODO: ensure this number is unique (we should have a CI for that)
astNode->location(), astNode->location(),
"Cannot load JSON source." "Cannot load JSON source. " + result.responseOrErrorMessage
); );
} }
} }

2
libsolidity/parsing/Parser.cpp
View File

@ -317,7 +317,7 @@ ASTPointer<ASTNode> Parser::parseInterfaceDefinition()
expectToken(Token::Semicolon); expectToken(Token::Semicolon);
auto fileName = make_shared<ASTString>(jsonSourceFileName.string()); auto fileName = make_shared<ASTString>(jsonSourceFileName.string());
return nodeFactory.createNode<ImportedContractDefinition>(name, fileName); return nodeFactory.createNode<ImportedInterfaceDefinition>(name, fileName);
} }
baseContracts = parseContractInheritanceList(); baseContracts = parseContractInheritanceList();