diff options
| author | chriseth <chris@ethereum.org> | 2016-10-26 20:28:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-26 20:28:10 +0800 |
| commit | 34e2209bcc782ceb0400b73cda23bf1173ea34e9 (patch) | |
| tree | 33d044a39ec84cd20c505b62c0d440ad78ee6617 | |
| parent | 4f1b5d26f7942117b44f199b0e73ce648b90bafb (diff) | |
| parent | 3ca5900b8c0b69d640ef46388b0d2250275356fc (diff) | |
| download | dexon-solidity-34e2209bcc782ceb0400b73cda23bf1173ea34e9.tar.gz dexon-solidity-34e2209bcc782ceb0400b73cda23bf1173ea34e9.tar.zst dexon-solidity-34e2209bcc782ceb0400b73cda23bf1173ea34e9.zip | |
Merge pull request #1274 from ethereum/signed-exp
Banning signed exp
| -rw-r--r-- | Changelog.md | 1 | ||||
| -rw-r--r-- | libsolidity/ast/Types.cpp | 5 | ||||
| -rw-r--r-- | test/libsolidity/SolidityNameAndTypeResolution.cpp | 16 |
3 files changed, 21 insertions, 1 deletions
diff --git a/Changelog.md b/Changelog.md index a24ac211..8fa54c81 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,7 @@ Features: Bugfixes: + * Type checker: forbid signed exponential that led to an incorrect use of EXP opcode. ### 0.4.3 (2016-10-25) diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp index 7cfed3c8..7fe97fa7 100644 --- a/libsolidity/ast/Types.cpp +++ b/libsolidity/ast/Types.cpp @@ -349,11 +349,14 @@ TypePointer IntegerType::binaryOperatorResult(Token::Value _operator, TypePointe return commonType; if (Token::isBooleanOp(_operator)) return TypePointer(); - // Nothing else can be done with addresses if (auto intType = dynamic_pointer_cast<IntegerType const>(commonType)) { + // Nothing else can be done with addresses if (intType->isAddress()) return TypePointer(); + // Signed EXP is not allowed + if (Token::Exp == _operator && intType->isSigned()) + return TypePointer(); } else if (auto fixType = dynamic_pointer_cast<FixedPointType const>(commonType)) if (Token::Exp == _operator) diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp index 9fe91cca..640cc108 100644 --- a/test/libsolidity/SolidityNameAndTypeResolution.cpp +++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp @@ -2098,6 +2098,22 @@ BOOST_AUTO_TEST_CASE(integer_boolean_operators) BOOST_CHECK(expectError(sourceCode3) == Error::Type::TypeError); } +BOOST_AUTO_TEST_CASE(exp_signed_variable) +{ + char const* sourceCode1 = R"( + contract test { function() { uint x = 3; int y = -4; x ** y; } } + )"; + BOOST_CHECK(expectError(sourceCode1) == Error::Type::TypeError); + char const* sourceCode2 = R"( + contract test { function() { uint x = 3; int y = -4; y ** x; } } + )"; + BOOST_CHECK(expectError(sourceCode2) == Error::Type::TypeError); + char const* sourceCode3 = R"( + contract test { function() { int x = -3; int y = -4; x ** y; } } + )"; + BOOST_CHECK(expectError(sourceCode3) == Error::Type::TypeError); +} + BOOST_AUTO_TEST_CASE(reference_compare_operators) { char const* sourceCode1 = R"( |