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

Change retrieveContract to take name and not index

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-09-06 15:05:35 +01:00
parent fbe24da159
commit 7ed938b95e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/libsolidity/AnalysisFramework.cpp
View File

@ -106,12 +106,12 @@ void AnalysisFramework::printErrors()
); );
} }
ContractDefinition const* AnalysisFramework::retrieveContract(SourceUnit const& _source, unsigned index) ContractDefinition const* AnalysisFramework::retrieveContractByName(SourceUnit const& _source, string const& _name)
{ {
ContractDefinition* contract = nullptr; ContractDefinition* contract = nullptr;
unsigned counter = 0;
for (shared_ptr<ASTNode> const& node: _source.nodes()) for (shared_ptr<ASTNode> const& node: _source.nodes())
if ((contract = dynamic_cast<ContractDefinition*>(node.get())) && counter == index) if ((contract = dynamic_cast<ContractDefinition*>(node.get())) && contract->name() == _name)
return contract; return contract;
return nullptr; return nullptr;

2
test/libsolidity/AnalysisFramework.h
View File

@ -59,7 +59,7 @@ protected:
void printErrors(); void printErrors();
ContractDefinition const* retrieveContract(SourceUnit const& _source, unsigned index); ContractDefinition const* retrieveContractByName(SourceUnit const& _source, std::string const& _name);
FunctionTypePointer retrieveFunctionBySignature( FunctionTypePointer retrieveFunctionBySignature(
ContractDefinition const& _contract, ContractDefinition const& _contract,
std::string const& _signature std::string const& _signature

4
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -976,7 +976,7 @@ BOOST_AUTO_TEST_CASE(state_variable_accessors)
SourceUnit const* source; SourceUnit const* source;
ContractDefinition const* contract; ContractDefinition const* contract;
source = parseAndAnalyse(text); source = parseAndAnalyse(text);
BOOST_REQUIRE((contract = retrieveContract(*source, 0)) != nullptr); BOOST_REQUIRE((contract = retrieveContractByName(*source, "test")) != nullptr);
FunctionTypePointer function = retrieveFunctionBySignature(*contract, "foo()"); FunctionTypePointer function = retrieveFunctionBySignature(*contract, "foo()");
BOOST_REQUIRE(function && function->hasDeclaration()); BOOST_REQUIRE(function && function->hasDeclaration());
auto returnParams = function->returnParameterTypes(); auto returnParams = function->returnParameterTypes();
@ -1029,7 +1029,7 @@ BOOST_AUTO_TEST_CASE(private_state_variable)
ContractDefinition const* contract; ContractDefinition const* contract;
SourceUnit const* source = parseAndAnalyse(text); SourceUnit const* source = parseAndAnalyse(text);
BOOST_CHECK((contract = retrieveContract(*source, 0)) != nullptr); BOOST_CHECK((contract = retrieveContractByName(*source, "test")) != nullptr);
FunctionTypePointer function; FunctionTypePointer function;
function = retrieveFunctionBySignature(*contract, "foo()"); function = retrieveFunctionBySignature(*contract, "foo()");
BOOST_CHECK_MESSAGE(function == nullptr, "Accessor function of a private variable should not exist"); BOOST_CHECK_MESSAGE(function == nullptr, "Accessor function of a private variable should not exist");