cerc-io/solidity
15
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 #3349 from federicobond/number-improv

Browse Source 
Avoid output messages size blow-up using huge bignums literals
This commit is contained in:
Alex Beregszaszi 2018-02-13 12:36:05 +00:00 committed by GitHub
commit 8f8ad3840e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -14,6 +14,7 @@ Features:
* Type Checker: Issue warning for using ``public`` visibility for interface functions. * Type Checker: Issue warning for using ``public`` visibility for interface functions.
Bugfixes: Bugfixes:
* Error Output: Truncate huge number literals in the middle to avoid output blow-up.
* Parser: Disallow event declarations with no parameter list. * Parser: Disallow event declarations with no parameter list.
* Standard JSON: Populate the ``sourceLocation`` field in the error list. * Standard JSON: Populate the ``sourceLocation`` field in the error list.
* Standard JSON: Properly support contract and library file names containing a colon (such as URLs). * Standard JSON: Properly support contract and library file names containing a colon (such as URLs).

18
libsolidity/ast/Types.cpp
View File

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

4
libsolidity/ast/Types.h
View File

@ -437,6 +437,10 @@ private:
/// @returns true if the literal is a valid rational number. /// @returns true if the literal is a valid rational number.
static std::tuple<bool, rational> parseRational(std::string const& _value); static std::tuple<bool, rational> parseRational(std::string const& _value);
/// @returns a truncated readable representation of the bigint keeping only
/// up to 4 leading and 4 trailing digits.
static std::string bigintToReadableString(dev::bigint const& num);
}; };
/** /**

4
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -1752,7 +1752,7 @@ BOOST_AUTO_TEST_CASE(overflow_caused_by_ether_units)
uint256 a; uint256 a;
} }
)"; )";
CHECK_ERROR(sourceCode, TypeError, "Type int_const 115792089237316195423570985008687907853269984665640564039458000000000000000000 is not implicitly convertible to expected type uint256."); CHECK_ERROR(sourceCode, TypeError, "Type int_const 1157...(70 digits omitted)...0000 is not implicitly convertible to expected type uint256.");
} }
BOOST_AUTO_TEST_CASE(exp_operator_exponent_too_big) BOOST_AUTO_TEST_CASE(exp_operator_exponent_too_big)
@ -4586,7 +4586,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)