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

Always use shortened literal number representation.

Browse Source
This commit is contained in:
chriseth 2018-02-13 11:43:47 +01:00
parent a320ffeafd
commit 560fbd0df1
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libsolidity/ast/Types.cpp
View File

@ -949,25 +949,25 @@ bool RationalNumberType::operator==(Type const& _other) const
return m_value == other.m_value; return m_value == other.m_value;
} }
string RationalNumberType::bigintToString(dev::bigint const& _num, bool _short) string RationalNumberType::bigintToReadableString(dev::bigint const& _num)
{ {
string str = _num.str(); string str = _num.str();
if (_short && str.size() > 32) if (str.size() > 32)
{ {
int omitted = str.size() - 8; int omitted = str.size() - 8;
return str.substr(0, 4) + "...(" + to_string(omitted) + " digits omitted)..." + str.substr(str.size() - 4, 4); str = str.substr(0, 4) + "...(" + to_string(omitted) + " digits omitted)..." + str.substr(str.size() - 4, 4);
} }
return str; return str;
} }
string RationalNumberType::toString(bool _short) const string RationalNumberType::toString(bool) const
{ {
if (!isFractional()) if (!isFractional())
return "int_const " + bigintToString(m_value.numerator(), _short); return "int_const " + bigintToReadableString(m_value.numerator());
string numerator = bigintToString(m_value.numerator(), _short); string numerator = bigintToReadableString(m_value.numerator());
string denominator = bigintToString(m_value.denominator(), _short); string denominator = bigintToReadableString(m_value.denominator());
return "rational_const " + numerator + '/' + denominator; return "rational_const " + numerator + " / " + denominator;
} }
u256 RationalNumberType::literalValue(Literal const*) const u256 RationalNumberType::literalValue(Literal const*) const

2
libsolidity/ast/Types.h
View File

@ -440,7 +440,7 @@ private:
/// @returns a truncated readable representation of the bigint keeping only /// @returns a truncated readable representation of the bigint keeping only
/// up to 4 leading and 4 trailing digits. /// up to 4 leading and 4 trailing digits.
static std::string bigintToString(dev::bigint const& num, bool _short); static std::string bigintToReadableString(dev::bigint const& num);
}; };
/** /**

2
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -4574,7 +4574,7 @@ BOOST_AUTO_TEST_CASE(rational_index_access)
} }
} }
)"; )";
CHECK_ERROR(text, TypeError, "rational_const 1/2 is not implicitly convertible to expected type uint256"); CHECK_ERROR(text, TypeError, "rational_const 1 / 2 is not implicitly convertible to expected type uint256");
} }
BOOST_AUTO_TEST_CASE(rational_to_fixed_literal_expression) BOOST_AUTO_TEST_CASE(rational_to_fixed_literal_expression)