aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity
diff options
context:
space:
mode:
authorchriseth <c@ethdev.com>2015-09-11 21:48:43 +0800
committerchriseth <c@ethdev.com>2015-09-11 21:48:43 +0800
commit3c25420b8476f1516ac8cb10f5c1552609a08675 (patch)
tree219f2ffe54f3cf11e172a04c8ca499babc2dea58 /libsolidity
parentc5b6d9d2a9fb379e35435726046ce6c551d25c17 (diff)
parent1d1386a58cdeada9497a3940ab9a7d5c68f21af8 (diff)
downloaddexon-solidity-3c25420b8476f1516ac8cb10f5c1552609a08675.tar
dexon-solidity-3c25420b8476f1516ac8cb10f5c1552609a08675.tar.gz
dexon-solidity-3c25420b8476f1516ac8cb10f5c1552609a08675.tar.bz2
dexon-solidity-3c25420b8476f1516ac8cb10f5c1552609a08675.tar.lz
dexon-solidity-3c25420b8476f1516ac8cb10f5c1552609a08675.tar.xz
dexon-solidity-3c25420b8476f1516ac8cb10f5c1552609a08675.tar.zst
dexon-solidity-3c25420b8476f1516ac8cb10f5c1552609a08675.zip
Merge pull request #69 from LianaHus/sol_enum_too_many_indexed_args
too many indexed arguments for event
Diffstat (limited to 'libsolidity')
-rw-r--r--libsolidity/AST.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/libsolidity/AST.cpp b/libsolidity/AST.cpp
index 1b22c44f..1ad34cfe 100644
--- a/libsolidity/AST.cpp
+++ b/libsolidity/AST.cpp
@@ -85,6 +85,9 @@ void ContractDefinition::checkTypeRequirements()
for (ASTPointer<VariableDeclaration> const& variable: m_stateVariables)
variable->checkTypeRequirements();
+ for (ASTPointer<EventDefinition> const& event: events())
+ event->checkTypeRequirements();
+
for (ASTPointer<ModifierDefinition> const& modifier: functionModifiers())
modifier->checkTypeRequirements();
@@ -699,13 +702,13 @@ void EventDefinition::checkTypeRequirements()
{
if (var->isIndexed())
numIndexed++;
+ if (numIndexed > 3)
+ BOOST_THROW_EXCEPTION(createTypeError("More than 3 indexed arguments for event."));
if (!var->type()->canLiveOutsideStorage())
BOOST_THROW_EXCEPTION(var->createTypeError("Type is required to live outside storage."));
if (!var->type()->externalType())
BOOST_THROW_EXCEPTION(var->createTypeError("Internal type is not allowed as event parameter type."));
}
- if (numIndexed > 3)
- BOOST_THROW_EXCEPTION(createTypeError("More than 3 indexed arguments for event."));
}
void Block::checkTypeRequirements()