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

Fix parsing fixed point values.

Browse Source
This commit is contained in:
chriseth 2021-08-17 13:50:19 +02:00
parent 948665ff89
commit 063d481bb3
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/libsolidity/util/BytesUtils.cpp
View File

@ -94,12 +94,21 @@ bytes BytesUtils::convertNumber(string const& _literal)
bytes BytesUtils::convertFixedPoint(string const& _literal, size_t& o_fractionalDigits) bytes BytesUtils::convertFixedPoint(string const& _literal, size_t& o_fractionalDigits)
{ {
size_t dotPos = _literal.find('.'); size_t dotPos = _literal.find('.');
string valueInteger = _literal.substr(0, dotPos); o_fractionalDigits = dotPos < _literal.size() ? _literal.size() - dotPos : 0;
string valueFraction = _literal.substr(dotPos + 1); bool negative = !_literal.empty() && _literal.at(0) == '-';
o_fractionalDigits = valueFraction.length(); // remove decimal point
string valueInteger = _literal.substr(0, dotPos) + _literal.substr(dotPos + 1);
// erase leading zeros to avoid parsing as octal.
while (!valueInteger.empty() && (valueInteger.at(0) == '0' || valueInteger.at(0) == '-'))
valueInteger.erase(valueInteger.begin());
if (valueInteger.empty())
valueInteger = "0";
try try
{ {
return util::toBigEndian(u256(valueInteger + valueFraction)); u256 value(valueInteger);
if (negative)
value = s2u(-u2s(value));
return util::toBigEndian(value);
} }
catch (std::exception const&) catch (std::exception const&)
{ {