diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-08-07 09:40:39 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2018-08-07 20:23:14 +0800 |
| commit | b0f9fc5af08a34f3025acf37db170ddca77796e1 (patch) | |
| tree | 01bdc222655e0e73893ccfeac6c2fe4599f55c50 | |
| parent | 9d3827266cc734ac91368acff010e094f100f850 (diff) | |
| download | dexon-solidity-b0f9fc5af08a34f3025acf37db170ddca77796e1.tar dexon-solidity-b0f9fc5af08a34f3025acf37db170ddca77796e1.tar.gz dexon-solidity-b0f9fc5af08a34f3025acf37db170ddca77796e1.tar.bz2 dexon-solidity-b0f9fc5af08a34f3025acf37db170ddca77796e1.tar.lz dexon-solidity-b0f9fc5af08a34f3025acf37db170ddca77796e1.tar.xz dexon-solidity-b0f9fc5af08a34f3025acf37db170ddca77796e1.tar.zst dexon-solidity-b0f9fc5af08a34f3025acf37db170ddca77796e1.zip | |
Fix type identifiers for RationalNumberType
| -rw-r--r-- | Changelog.md | 1 | ||||
| -rw-r--r-- | libsolidity/ast/Types.cpp | 9 | ||||
| -rw-r--r-- | test/libsolidity/SolidityTypes.cpp | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/Changelog.md b/Changelog.md index e00f74b3..f645933c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -79,6 +79,7 @@ Compiler Features: Bugfixes: * Tests: Fix chain parameters to make ipc tests work with newer versions of cpp-ethereum. * Code Generator: Fix allocation of byte arrays (zeroed out too much memory). + * Code Generator: Properly handle negative number literals in ABIEncoderV2. * Commandline Interface: Correctly handle paths with backslashes on windows. * Fix NatSpec json output for `@notice` and `@dev` tags on contract definitions. * References Resolver: Do not crash on using ``_slot`` and ``_offset`` suffixes on their own. diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp index 7bcae812..eff31b8d 100644 --- a/libsolidity/ast/Types.cpp +++ b/libsolidity/ast/Types.cpp @@ -1146,7 +1146,14 @@ TypePointer RationalNumberType::binaryOperatorResult(Token::Value _operator, Typ string RationalNumberType::richIdentifier() const { - return "t_rational_" + m_value.numerator().str() + "_by_" + m_value.denominator().str(); + // rational seemingly will put the sign always on the numerator, + // but let just make it deterministic here. + bigint numerator = abs(m_value.numerator()); + bigint denominator = abs(m_value.denominator()); + if (m_value < 0) + return "t_rational_minus_" + numerator.str() + "_by_" + denominator.str(); + else + return "t_rational_" + numerator.str() + "_by_" + denominator.str(); } bool RationalNumberType::operator==(Type const& _other) const diff --git a/test/libsolidity/SolidityTypes.cpp b/test/libsolidity/SolidityTypes.cpp index b8b537e5..db0e3b66 100644 --- a/test/libsolidity/SolidityTypes.cpp +++ b/test/libsolidity/SolidityTypes.cpp @@ -157,6 +157,9 @@ BOOST_AUTO_TEST_CASE(type_identifiers) BOOST_CHECK_EQUAL(RationalNumberType(rational(7, 1)).identifier(), "t_rational_7_by_1"); BOOST_CHECK_EQUAL(RationalNumberType(rational(200, 77)).identifier(), "t_rational_200_by_77"); BOOST_CHECK_EQUAL(RationalNumberType(rational(2 * 200, 2 * 77)).identifier(), "t_rational_200_by_77"); + BOOST_CHECK_EQUAL(RationalNumberType(rational(-2 * 200, -2 * 77)).identifier(), "t_rational_200_by_77"); + BOOST_CHECK_EQUAL(RationalNumberType(rational(-2 * 200, 2 * 77)).identifier(), "t_rational_minus_200_by_77"); + BOOST_CHECK_EQUAL(RationalNumberType(rational(2 * 200, -2 * 77)).identifier(), "t_rational_minus_200_by_77"); BOOST_CHECK_EQUAL( StringLiteralType(Literal(SourceLocation{}, Token::StringLiteral, make_shared<string>("abc - def"))).identifier(), "t_stringliteral_196a9142ee0d40e274a6482393c762b16dd8315713207365e1e13d8d85b74fc4" |