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

Fix some styling issues and remove comments

Browse Source
This commit is contained in:
Lefteris Karapetsas 2015-03-30 17:18:38 +02:00
parent 85bb056993
commit c6781ed38d
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
AST.cpp
View File

@ -136,34 +136,20 @@ void ContractDefinition::checkAbstractFunctions()
// Search from base to derived // Search from base to derived
for (ContractDefinition const* contract: boost::adaptors::reverse(getLinearizedBaseContracts())) for (ContractDefinition const* contract: boost::adaptors::reverse(getLinearizedBaseContracts()))
{
for (ASTPointer<FunctionDefinition> const& function: contract->getDefinedFunctions()) for (ASTPointer<FunctionDefinition> const& function: contract->getDefinedFunctions())
{ {
string const& name = function->getName(); string const& name = function->getName();
if (!function->isFullyImplemented() && functions.count(name) && functions[name]) if (!function->isFullyImplemented() && functions.count(name) && functions[name])
BOOST_THROW_EXCEPTION(function->createTypeError("Redeclaring an already implemented function as abstract")); BOOST_THROW_EXCEPTION(function->createTypeError("Redeclaring an already implemented function as abstract"));
// if (functions.count(name) && !functions[name] && function->isFullyImplemented())
// functions.insert(make_pair(name, true);
// if (functions.count(name) && !functions[name] && function->isFullyImplemented)
// functions.insert(make_pair(name, true));
// functions.insert(make_pair(name, function->isFullyImplemented()));
functions[name] = function->isFullyImplemented(); functions[name] = function->isFullyImplemented();
// if (function->isFullyImplemented())
// full_functions.insert(make_pair(name, function.get()));
// else
// abs_functions.insert(make_pair(name, function.get()));
} }
}
for (auto const& it: functions) for (auto const& it: functions)
if (!it.second) if (!it.second)
{ {
setFullyImplemented(false); setFullyImplemented(false);
break; break;
} }
} }
void ContractDefinition::checkIllegalOverrides() const void ContractDefinition::checkIllegalOverrides() const
@ -682,7 +668,7 @@ void NewExpression::checkTypeRequirements()
if (!m_contract) if (!m_contract)
BOOST_THROW_EXCEPTION(createTypeError("Identifier is not a contract.")); BOOST_THROW_EXCEPTION(createTypeError("Identifier is not a contract."));
if (!m_contract->isFullyImplemented()) if (!m_contract->isFullyImplemented())
BOOST_THROW_EXCEPTION(m_contract->createTypeError("Trying to create an object of an abstract contract.")); BOOST_THROW_EXCEPTION(m_contract->createTypeError("Trying to create an instance of an abstract contract."));
shared_ptr<ContractType const> contractType = make_shared<ContractType>(*m_contract); shared_ptr<ContractType const> contractType = make_shared<ContractType>(*m_contract);
TypePointers const& parameterTypes = contractType->getConstructorType()->getParameterTypes(); TypePointers const& parameterTypes = contractType->getConstructorType()->getParameterTypes();
m_type = make_shared<FunctionType>(parameterTypes, TypePointers{contractType}, m_type = make_shared<FunctionType>(parameterTypes, TypePointers{contractType},