cerc-io/solidity
16
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 #2939 from roadriverrail/error_unary_plus

Browse Source 
Unary + now a synax error (experimental 0.5.0)
This commit is contained in:
Alex Beregszaszi 2017-09-29 18:20:39 +01:00 committed by GitHub
commit ba7c5d2305
3 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -2,6 +2,7 @@
Features: Features:
* Parser: Better error message for unexpected trailing comma in parameter lists. * Parser: Better error message for unexpected trailing comma in parameter lists.
* Syntax Checker: Unary ``+`` is now a syntax error as experimental 0.5.0 feature.
Bugfixes: Bugfixes:
* Parser: Fix source location of VariableDeclarationStatement. * Parser: Fix source location of VariableDeclarationStatement.

9
libsolidity/analysis/SyntaxChecker.cpp
View File

@ -182,8 +182,15 @@ bool SyntaxChecker::visit(Throw const& _throwStatement)
bool SyntaxChecker::visit(UnaryOperation const& _operation) bool SyntaxChecker::visit(UnaryOperation const& _operation)
{ {
bool const v050 = m_sourceUnit->annotation().experimentalFeatures.count(ExperimentalFeature::V050);
if (_operation.getOperator() == Token::Add) if (_operation.getOperator() == Token::Add)
m_errorReporter.warning(_operation.location(), "Use of unary + is deprecated."); {
if (v050)
m_errorReporter.syntaxError(_operation.location(), "Use of unary + is deprecated.");
else
m_errorReporter.warning(_operation.location(), "Use of unary + is deprecated.");
}
return true; return true;
} }

25
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -4135,6 +4135,8 @@ BOOST_AUTO_TEST_CASE(rational_unary_operation)
} }
)"; )";
CHECK_SUCCESS_NO_WARNINGS(text); CHECK_SUCCESS_NO_WARNINGS(text);
// Test deprecation warning under < 0.5.0
text = R"( text = R"(
contract test { contract test {
function f() pure public { function f() pure public {
@ -4154,6 +4156,29 @@ BOOST_AUTO_TEST_CASE(rational_unary_operation)
} }
)"; )";
CHECK_WARNING(text,"Use of unary + is deprecated"); CHECK_WARNING(text,"Use of unary + is deprecated");
// Test syntax error under 0.5.0
text = R"(
pragma experimental "v0.5.0";
contract test {
function f() pure public {
ufixed16x2 a = +3.25;
fixed16x2 b = -3.25;
a; b;
}
}
)";
CHECK_ERROR(text, SyntaxError, "Use of unary + is deprecated");
text = R"(
pragma experimental "v0.5.0";
contract test {
function f(uint x) pure public {
uint y = +x;
y;
}
}
)";
CHECK_ERROR(text, SyntaxError, "Use of unary + is deprecated");
} }
BOOST_AUTO_TEST_CASE(leading_zero_rationals_convert) BOOST_AUTO_TEST_CASE(leading_zero_rationals_convert)