aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity
diff options
context:
space:
mode:
authorchriseth <c@ethdev.com>2016-11-16 22:09:01 +0800
committerchriseth <c@ethdev.com>2016-11-16 22:09:01 +0800
commit2c14a96820233809db4360b39f5f02039be5730a (patch)
treeee20fa35cbc19eddcddd1013e745b387e7371be3 /libsolidity
parent2defe4dcefb6f0e17d7f87231233ff637dad55a8 (diff)
downloaddexon-solidity-2c14a96820233809db4360b39f5f02039be5730a.tar
dexon-solidity-2c14a96820233809db4360b39f5f02039be5730a.tar.gz
dexon-solidity-2c14a96820233809db4360b39f5f02039be5730a.tar.bz2
dexon-solidity-2c14a96820233809db4360b39f5f02039be5730a.tar.lz
dexon-solidity-2c14a96820233809db4360b39f5f02039be5730a.tar.xz
dexon-solidity-2c14a96820233809db4360b39f5f02039be5730a.tar.zst
dexon-solidity-2c14a96820233809db4360b39f5f02039be5730a.zip
Some more assertions and style changes.
Diffstat (limited to 'libsolidity')
-rw-r--r--libsolidity/ast/Types.cpp41
-rw-r--r--libsolidity/codegen/CompilerUtils.cpp2
2 files changed, 26 insertions, 17 deletions
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 3a8fc075..4488398f 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -1827,23 +1827,28 @@ FunctionType::FunctionType(FunctionTypeName const& _typeName):
m_isPayable(_typeName.isPayable())
{
if (_typeName.isPayable())
+ {
solAssert(m_location == Location::External, "Internal payable function type used.");
+ solAssert(!m_isConstant, "Payable constant function");
+ }
for (auto const& t: _typeName.parameterTypes())
{
solAssert(t->annotation().type, "Type not set for parameter.");
- solAssert(
- m_location != Location::External || t->annotation().type->canBeUsedExternally(false),
- "Internal type used as parameter for external function."
- );
+ if (m_location == Location::External)
+ solAssert(
+ t->annotation().type->canBeUsedExternally(false),
+ "Internal type used as parameter for external function."
+ );
m_parameterTypes.push_back(t->annotation().type);
}
for (auto const& t: _typeName.returnParameterTypes())
{
solAssert(t->annotation().type, "Type not set for return parameter.");
- solAssert(
- m_location != Location::External || t->annotation().type->canBeUsedExternally(false),
- "Internal type used as return parameter for external function."
- );
+ if (m_location == Location::External)
+ solAssert(
+ t->annotation().type->canBeUsedExternally(false),
+ "Internal type used as return parameter for external function."
+ );
m_returnParameterTypes.push_back(t->annotation().type);
}
}
@@ -1941,17 +1946,21 @@ string FunctionType::toString(bool _short) const
string name = "function (";
for (auto it = m_parameterTypes.begin(); it != m_parameterTypes.end(); ++it)
name += (*it)->toString(_short) + (it + 1 == m_parameterTypes.end() ? "" : ",");
- name += ") ";
+ name += ")";
if (m_isConstant)
- name += "constant ";
+ name += " constant";
if (m_isPayable)
- name += "payable ";
+ name += " payable";
if (m_location == Location::External)
- name += "external ";
- name += "returns (";
- for (auto it = m_returnParameterTypes.begin(); it != m_returnParameterTypes.end(); ++it)
- name += (*it)->toString(_short) + (it + 1 == m_returnParameterTypes.end() ? "" : ",");
- return name + ")";
+ name += " external";
+ if (!m_returnParameterTypes.empty())
+ {
+ name += " returns (";
+ for (auto it = m_returnParameterTypes.begin(); it != m_returnParameterTypes.end(); ++it)
+ name += (*it)->toString(_short) + (it + 1 == m_returnParameterTypes.end() ? "" : ",");
+ name += ")";
+ }
+ return name;
}
unsigned FunctionType::calldataEncodedSize(bool _padded) const
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp
index 1e819ed4..bfe5386b 100644
--- a/libsolidity/codegen/CompilerUtils.cpp
+++ b/libsolidity/codegen/CompilerUtils.cpp
@@ -138,7 +138,7 @@ void CompilerUtils::storeInMemoryDynamic(Type const& _type, bool _padToWordBound
dynamic_cast<FunctionType const&>(_type).location() == FunctionType::Location::External
)
{
- solAssert(_padToWordBoundaries, "Non-padded store for function not implemented.");
+ solUnimplementedAssert(_padToWordBoundaries, "Non-padded store for function not implemented.");
combineExternalFunctionType(true);
m_context << Instruction::DUP2 << Instruction::MSTORE;
m_context << u256(_padToWordBoundaries ? 32 : 24) << Instruction::ADD;