cerc-io/solidity
16
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 #12284 from ethereum/fix-isoltest-formatting-for-strings-with-control-chars

Browse Source 
Fix formatting for strings with control characters in isoltest expectations
This commit is contained in:
chriseth 2021-11-16 11:31:52 +01:00 committed by GitHub
commit e55795262b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/libsolidity/semanticTests/isoltestTesting/format_raw_string_with_control_chars.sol Normal file
View File

@ -0,0 +1,12 @@
contract C {
function f(string memory s) external pure returns (string memory) {
return s;
}
}
// NOTE: The test is here to illustrate the problem with formatting control chars in strings in
// test expectations but unfortunately it can only be triggered manually. It does not test anything
// unless you introduce a difference in expectations to force isoltest to reformat them.
// ====
// compileViaYul: also
// ----
// f(string): 0x20, 16, "\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83" -> 0x20, 16, "\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83" # Input/Output: "😃😃😃😃" #

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

@ -219,7 +219,7 @@ string BytesUtils::formatString(bytes const& _bytes, size_t _cutOff)
if (isprint(v))
os << v;
else
os << "\\x" << toHex(v);
os << "\\x" << toHex(v, HexCase::Lower);
}
}
os << "\"";

4
test/libsolidity/util/TestFunctionCall.cpp
View File

@ -322,7 +322,9 @@ string TestFunctionCall::formatRawParameters(
if (param.format.newline)
os << endl << _linePrefix << "// ";
for (auto const c: param.rawString)
os << (c >= ' ' ? string(1, c) : "\\x" + toHex(static_cast<uint8_t>(c)));
// NOTE: Even though we have a toHex() overload specifically for uint8_t, the compiler
// chooses the one for bytes if the second argument is omitted.
os << (c >= ' ' ? string(1, c) : "\\x" + toHex(static_cast<uint8_t>(c), HexCase::Lower));
if (&param != &_params.back())
os << ", ";
}