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

Bugfixes concerning variable declarations.

Browse Source 
Fixes #1637
This commit is contained in:
chriseth 2015-04-16 00:06:57 +02:00
parent 820239a73c
commit 6e5de4832d
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
AST.cpp
View File

@ -378,20 +378,16 @@ void VariableDeclaration::checkTypeRequirements()
if ((m_type && !m_type->isValueType()) || !m_value) if ((m_type && !m_type->isValueType()) || !m_value)
BOOST_THROW_EXCEPTION(createTypeError("Unitialized \"constant\" variable.")); BOOST_THROW_EXCEPTION(createTypeError("Unitialized \"constant\" variable."));
} }
if (!m_value)
return;
if (m_type) if (m_type)
{ {
m_value->expectType(*m_type); if (m_value)
if (m_isStateVariable && !m_type->externalType() && getVisibility() >= Visibility::Public) m_value->expectType(*m_type);
BOOST_THROW_EXCEPTION(createTypeError("Internal type is not allowed for state variables."));
if (!FunctionType(*this).externalType())
BOOST_THROW_EXCEPTION(createTypeError("Internal type is not allowed for public state variables."));
} }
else else
{ {
// no type declared and no previous assignment, infer the type if (!m_value)
// This feature might be extended in the future.
BOOST_THROW_EXCEPTION(createTypeError("Assignment necessary for type detection."));
m_value->checkTypeRequirements(); m_value->checkTypeRequirements();
TypePointer type = m_value->getType(); TypePointer type = m_value->getType();
if (type->getCategory() == Type::Category::IntegerConstant) if (type->getCategory() == Type::Category::IntegerConstant)
@ -405,6 +401,8 @@ void VariableDeclaration::checkTypeRequirements()
BOOST_THROW_EXCEPTION(createTypeError("Variable cannot have void type.")); BOOST_THROW_EXCEPTION(createTypeError("Variable cannot have void type."));
m_type = type; m_type = type;
} }
if (m_isStateVariable && getVisibility() >= Visibility::Public && !FunctionType(*this).externalType())
BOOST_THROW_EXCEPTION(createTypeError("Internal type is not allowed for public state variables."));
} }
bool VariableDeclaration::isExternalFunctionParameter() const bool VariableDeclaration::isExternalFunctionParameter() const

23
Parser.cpp
View File

@ -472,17 +472,18 @@ ASTPointer<TypeName> Parser::parseTypeName(bool _allowVar)
else else
BOOST_THROW_EXCEPTION(createParserError("Expected type name")); BOOST_THROW_EXCEPTION(createParserError("Expected type name"));
// Parse "[...]" postfixes for arrays. if (type)
while (m_scanner->getCurrentToken() == Token::LBrack) // Parse "[...]" postfixes for arrays.
{ while (m_scanner->getCurrentToken() == Token::LBrack)
m_scanner->next(); {
ASTPointer<Expression> length; m_scanner->next();
if (m_scanner->getCurrentToken() != Token::RBrack) ASTPointer<Expression> length;
length = parseExpression(); if (m_scanner->getCurrentToken() != Token::RBrack)
nodeFactory.markEndPosition(); length = parseExpression();
expectToken(Token::RBrack); nodeFactory.markEndPosition();
type = nodeFactory.createNode<ArrayTypeName>(type, length); expectToken(Token::RBrack);
} type = nodeFactory.createNode<ArrayTypeName>(type, length);
}
return type; return type;
} }