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

Deprecate the throw statement

Browse Source
This commit is contained in:
Alex Beregszaszi 2018-07-11 15:06:31 +01:00 committed by chriseth
parent 931794001e
commit 21e97da294
5 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -20,6 +20,7 @@ Breaking Changes:
* General: Disallow raw ``callcode`` (was already deprecated in 0.4.12). It is still possible to use it via inline assembly. * General: Disallow raw ``callcode`` (was already deprecated in 0.4.12). It is still possible to use it via inline assembly.
* General: Disallow ``var`` keyword. * General: Disallow ``var`` keyword.
* General: Disallow ``sha3`` and ``suicide`` aliases. * General: Disallow ``sha3`` and ``suicide`` aliases.
* General: Disallow the ``throw`` statement. This was already the case in the experimental 0.5.0 mode.
* General: Disallow the ``years`` unit denomination (was already deprecated in 0.4.24) * General: Disallow the ``years`` unit denomination (was already deprecated in 0.4.24)
* General: Introduce ``emit`` as a keyword instead of parsing it as identifier. * General: Introduce ``emit`` as a keyword instead of parsing it as identifier.
* General: New keywords: ``calldata`` * General: New keywords: ``calldata``

16
libsolidity/analysis/SyntaxChecker.cpp
View File

@ -175,18 +175,10 @@ bool SyntaxChecker::visit(Break const& _breakStatement)
bool SyntaxChecker::visit(Throw const& _throwStatement) bool SyntaxChecker::visit(Throw const& _throwStatement)
{ {
bool const v050 = m_sourceUnit->annotation().experimentalFeatures.count(ExperimentalFeature::V050); m_errorReporter.syntaxError(
_throwStatement.location(),
if (v050) "\"throw\" is deprecated in favour of \"revert()\", \"require()\" and \"assert()\"."
m_errorReporter.syntaxError( );
_throwStatement.location(),
"\"throw\" is deprecated in favour of \"revert()\", \"require()\" and \"assert()\"."
);
else
m_errorReporter.warning(
_throwStatement.location(),
"\"throw\" is deprecated in favour of \"revert()\", \"require()\" and \"assert()\"."
);
return true; return true;
} }

9
test/libsolidity/syntaxTests/controlFlow/storageReturn/throw_fine.sol
View File

@ -1,9 +0,0 @@
contract C {
struct S { bool f; }
S s;
function f() internal pure returns (S storage) {
throw;
}
}
// ----
// Warning: (108-113): "throw" is deprecated in favour of "revert()", "require()" and "assert()".

2
test/libsolidity/syntaxTests/nameAndTypeResolution/426_throw_is_deprecated.sol
View File

@ -4,4 +4,4 @@ contract C {
} }
} }
// ---- // ----
// Warning: (52-57): "throw" is deprecated in favour of "revert()", "require()" and "assert()". // SyntaxError: (52-57): "throw" is deprecated in favour of "revert()", "require()" and "assert()".

8
test/libsolidity/syntaxTests/nameAndTypeResolution/427_throw_is_deprecated_v050.sol
View File

@ -1,8 +0,0 @@
pragma experimental "v0.5.0";
contract C {
function f() pure public {
throw;
}
}
// ----
// SyntaxError: (82-87): "throw" is deprecated in favour of "revert()", "require()" and "assert()".