cerc-io/solidity
11
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

Remove w parameter for toHex.

Browse Source
This commit is contained in:
chriseth
2018-12-05 22:51:49 +01:00
parent e8455c2a6d
commit bc6ddbdd09
8 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libdevcore/CommonData.cpp
+2 -3
View File
@@ -29,7 +29,7 @@
using namespace std;
using namespace dev;
string dev::toHex(bytes const& _data, int, HexPrefix _prefix, HexCase _case)
string dev::toHex(bytes const& _data, HexPrefix _prefix, HexCase _case)
{
std::ostringstream ret;
int rix = _data.size() - 1;
@@ -42,8 +42,7 @@ string dev::toHex(bytes const& _data, int, HexPrefix _prefix, HexCase _case)
else if (_case == HexCase::Mixed)
hexcase = (rix-- & 2) == 0 ? std::nouppercase : std::uppercase;
ret << std::hex << hexcase << std::setfill('0') << std::setw(_w)
<< size_t(c);
ret << std::hex << hexcase << std::setfill('0') << std::setw(2) << size_t(c);
}
return (_prefix == HexPrefix::Add) ? "0x" + ret.str() : ret.str();
libdevcore/CommonData.h
+3 -3
View File
@@ -61,7 +61,7 @@ enum class HexCase
/// Convert a series of bytes to the corresponding string of hex duplets.
/// @param _w specifies the width of the first of the elements. Defaults to two - enough to represent a byte.
/// @example toHex("A\x69") == "4169"
std::string toHex(bytes const& _data, int _w = 2, HexPrefix _prefix = HexPrefix::DontAdd, HexCase _case = HexCase::Lower);
std::string toHex(bytes const& _data, HexPrefix _prefix = HexPrefix::DontAdd, HexCase _case = HexCase::Lower);
/// Converts a (printable) ASCII hex character into the correspnding integer value.
/// @example fromHex('A') == 10 && fromHex('f') == 15 && fromHex('5') == 5
@@ -153,7 +153,7 @@ inline std::string formatNumber(bigint const& _value)
if (_value < 0)
return "-" + formatNumber(-_value);
if (_value > 0x1000000)
return toHex(toCompactBigEndian(_value), 2, HexPrefix::Add);
return toHex(toCompactBigEndian(_value), HexPrefix::Add);
else
return _value.str();
}
@@ -161,7 +161,7 @@ inline std::string formatNumber(bigint const& _value)
inline std::string formatNumber(u256 const& _value)
{
if (_value > 0x1000000)
return toHex(toCompactBigEndian(_value), 2, HexPrefix::Add);
return toHex(toCompactBigEndian(_value), HexPrefix::Add);
else
return _value.str();
}
libdevcore/StringUtils.h
+3 -3
View File
@@ -111,7 +111,7 @@ inline std::string formatNumberReadable(
// 0x100 yields 2**8 (N is 1 and redundant)
if (v == 1)
return "2**" + std::to_string(i * 8);
return toHex(toCompactBigEndian(v), 2, prefix, hexcase) +
return toHex(toCompactBigEndian(v), prefix, hexcase) +
" * 2**" +
std::to_string(i * 8);
}
@@ -125,12 +125,12 @@ inline std::string formatNumberReadable(
// 0xFF yields 2**8 - 1 (v is 0 in that case)
if (v == 0)
return "2**" + std::to_string(i * 8) + " - 1";
return toHex(toCompactBigEndian(T(v + 1)), 2, prefix, hexcase) +
return toHex(toCompactBigEndian(T(v + 1)), prefix, hexcase) +
" * 2**" + std::to_string(i * 8) +
" - 1";
}
std::string str = toHex(toCompactBigEndian(_value), 2, prefix, hexcase);
std::string str = toHex(toCompactBigEndian(_value), prefix, hexcase);
if (_useTruncation)
{
// return as interior-truncated hex.