cerc-io/solidity
15
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

Merge pull request #1018 from ethereum/constructor-constant

Browse Source 
Constructor constant
This commit is contained in:
chriseth 2016-09-06 17:52:17 +02:00 committed by GitHub
commit e8cb4d2897
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -22,6 +22,7 @@ Breaking Changes:
* Modifiers: return does not skip part in modifier after ``_`` * Modifiers: return does not skip part in modifier after ``_``
* Placeholder statement `_` in modifier now requires explicit `;`. * Placeholder statement `_` in modifier now requires explicit `;`.
* ``ecrecover`` now returns zero if the input is malformed (it previously returned garbage) * ``ecrecover`` now returns zero if the input is malformed (it previously returned garbage)
* The ``constant`` keyword cannot be used for constructors or the fallback function.
* Removed ``--interface`` (Solidity interface) output option * Removed ``--interface`` (Solidity interface) output option
* JSON AST: General cleanup, renamed many nodes to match their C++ names. * JSON AST: General cleanup, renamed many nodes to match their C++ names.
* Json Output: srcmap-runtime renamed to srcmapRuntime * Json Output: srcmap-runtime renamed to srcmapRuntime

8
libsolidity/analysis/TypeChecker.cpp
View File

@ -75,8 +75,12 @@ bool TypeChecker::visit(ContractDefinition const& _contract)
checkContractAbstractConstructors(_contract); checkContractAbstractConstructors(_contract);
FunctionDefinition const* function = _contract.constructor(); FunctionDefinition const* function = _contract.constructor();
if (function && !function->returnParameters().empty()) if (function) {
typeError(function->returnParameterList()->location(), "Non-empty \"returns\" directive for constructor."); if (!function->returnParameters().empty())
typeError(function->returnParameterList()->location(), "Non-empty \"returns\" directive for constructor.");
if (function->isDeclaredConst())
typeError(function->location(), "Constructor cannot be defined as constant.");
}
FunctionDefinition const* fallbackFunction = nullptr; FunctionDefinition const* fallbackFunction = nullptr;
for (FunctionDefinition const* function: _contract.definedFunctions()) for (FunctionDefinition const* function: _contract.definedFunctions())

11
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -3989,6 +3989,17 @@ BOOST_AUTO_TEST_CASE(unsatisfied_version)
BOOST_CHECK(expectError(text, true) == Error::Type::SyntaxError); BOOST_CHECK(expectError(text, true) == Error::Type::SyntaxError);
} }
BOOST_AUTO_TEST_CASE(constant_constructor)
{
char const* text = R"(
contract test {
function test() constant {}
}
)";
BOOST_CHECK(expectError(text, false) == Error::Type::TypeError);
}
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()
} }