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

Yul formatting: Reduce multiple consecutive empty lines to a single one.

Browse Source
This commit is contained in:
chriseth 2020-04-22 10:49:44 +02:00
parent c7b4fa34bd
commit f82f167290
7 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libyul/Utilities.cpp
View File

@ -59,6 +59,13 @@ string solidity::yul::reindent(string const& _code)
for (string& line: lines) for (string& line: lines)
boost::trim(line); boost::trim(line);
// Reduce multiple consecutive empty lines.
lines = fold(lines, vector<string>{}, [](auto&& _lines, auto&& _line) {
if (!(_line.empty() && !_lines.empty() && _lines.back().empty()))
_lines.emplace_back(std::move(_line));
return std::move(_lines);
});
stringstream out; stringstream out;
int depth = 0; int depth = 0;

6
test/cmdlineTests/standard_ir_requested/output.json
View File

@ -16,12 +16,8 @@ object \"C_6\" {
codecopy(0, dataoffset(\"C_6_deployed\"), datasize(\"C_6_deployed\")) codecopy(0, dataoffset(\"C_6_deployed\"), datasize(\"C_6_deployed\"))
return(0, datasize(\"C_6_deployed\")) return(0, datasize(\"C_6_deployed\"))
function constructor_C_6() { function constructor_C_6() {
} }
} }
@ -50,7 +46,6 @@ object \"C_6\" {
if iszero(calldatasize()) { } if iszero(calldatasize()) { }
revert(0, 0) revert(0, 0)
function abi_decode_tuple_(headStart, dataEnd) { function abi_decode_tuple_(headStart, dataEnd) {
if slt(sub(dataEnd, headStart), 0) { revert(0, 0) } if slt(sub(dataEnd, headStart), 0) { revert(0, 0) }
@ -71,7 +66,6 @@ object \"C_6\" {
function fun_f_5() { function fun_f_5() {
} }
function shift_right_224_unsigned(value) -> newValue { function shift_right_224_unsigned(value) -> newValue {

8
test/cmdlineTests/yul_string_format_ascii/output.json
View File

@ -16,12 +16,8 @@ object \"C_10\" {
codecopy(0, dataoffset(\"C_10_deployed\"), datasize(\"C_10_deployed\")) codecopy(0, dataoffset(\"C_10_deployed\"), datasize(\"C_10_deployed\"))
return(0, datasize(\"C_10_deployed\")) return(0, datasize(\"C_10_deployed\"))
function constructor_C_10() { function constructor_C_10() {
} }
} }
@ -50,7 +46,6 @@ object \"C_10\" {
if iszero(calldatasize()) { } if iszero(calldatasize()) { }
revert(0, 0) revert(0, 0)
function abi_decode_tuple_(headStart, dataEnd) { function abi_decode_tuple_(headStart, dataEnd) {
if slt(sub(dataEnd, headStart), 0) { revert(0, 0) } if slt(sub(dataEnd, headStart), 0) { revert(0, 0) }
@ -81,11 +76,8 @@ object \"C_10\" {
function array_length_t_string_memory_ptr(value) -> length { function array_length_t_string_memory_ptr(value) -> length {
length := mload(value) length := mload(value)
} }
function array_storeLengthForEncoding_t_string_memory_ptr_fromStack(pos, length) -> updated_pos { function array_storeLengthForEncoding_t_string_memory_ptr_fromStack(pos, length) -> updated_pos {

5
test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
View File

@ -16,12 +16,8 @@ object \"C_10\" {
codecopy(0, dataoffset(\"C_10_deployed\"), datasize(\"C_10_deployed\")) codecopy(0, dataoffset(\"C_10_deployed\"), datasize(\"C_10_deployed\"))
return(0, datasize(\"C_10_deployed\")) return(0, datasize(\"C_10_deployed\"))
function constructor_C_10() { function constructor_C_10() {
} }
} }
@ -50,7 +46,6 @@ object \"C_10\" {
if iszero(calldatasize()) { } if iszero(calldatasize()) { }
revert(0, 0) revert(0, 0)
function abi_decode_tuple_(headStart, dataEnd) { function abi_decode_tuple_(headStart, dataEnd) {
if slt(sub(dataEnd, headStart), 0) { revert(0, 0) } if slt(sub(dataEnd, headStart), 0) { revert(0, 0) }

5
test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json
View File

@ -16,12 +16,8 @@ object \"C_10\" {
codecopy(0, dataoffset(\"C_10_deployed\"), datasize(\"C_10_deployed\")) codecopy(0, dataoffset(\"C_10_deployed\"), datasize(\"C_10_deployed\"))
return(0, datasize(\"C_10_deployed\")) return(0, datasize(\"C_10_deployed\"))
function constructor_C_10() { function constructor_C_10() {
} }
} }
@ -50,7 +46,6 @@ object \"C_10\" {
if iszero(calldatasize()) { } if iszero(calldatasize()) { }
revert(0, 0) revert(0, 0)
function abi_decode_tuple_(headStart, dataEnd) { function abi_decode_tuple_(headStart, dataEnd) {
if slt(sub(dataEnd, headStart), 0) { revert(0, 0) } if slt(sub(dataEnd, headStart), 0) { revert(0, 0) }

8
test/cmdlineTests/yul_string_format_ascii_long/output.json
View File

@ -16,12 +16,8 @@ object \"C_10\" {
codecopy(0, dataoffset(\"C_10_deployed\"), datasize(\"C_10_deployed\")) codecopy(0, dataoffset(\"C_10_deployed\"), datasize(\"C_10_deployed\"))
return(0, datasize(\"C_10_deployed\")) return(0, datasize(\"C_10_deployed\"))
function constructor_C_10() { function constructor_C_10() {
} }
} }
@ -50,7 +46,6 @@ object \"C_10\" {
if iszero(calldatasize()) { } if iszero(calldatasize()) { }
revert(0, 0) revert(0, 0)
function abi_decode_tuple_(headStart, dataEnd) { function abi_decode_tuple_(headStart, dataEnd) {
if slt(sub(dataEnd, headStart), 0) { revert(0, 0) } if slt(sub(dataEnd, headStart), 0) { revert(0, 0) }
@ -81,11 +76,8 @@ object \"C_10\" {
function array_length_t_string_memory_ptr(value) -> length { function array_length_t_string_memory_ptr(value) -> length {
length := mload(value) length := mload(value)
} }
function array_storeLengthForEncoding_t_string_memory_ptr_fromStack(pos, length) -> updated_pos { function array_storeLengthForEncoding_t_string_memory_ptr_fromStack(pos, length) -> updated_pos {

5
test/cmdlineTests/yul_string_format_hex/output.json
View File

@ -16,12 +16,8 @@ object \"C_10\" {
codecopy(0, dataoffset(\"C_10_deployed\"), datasize(\"C_10_deployed\")) codecopy(0, dataoffset(\"C_10_deployed\"), datasize(\"C_10_deployed\"))
return(0, datasize(\"C_10_deployed\")) return(0, datasize(\"C_10_deployed\"))
function constructor_C_10() { function constructor_C_10() {
} }
} }
@ -50,7 +46,6 @@ object \"C_10\" {
if iszero(calldatasize()) { } if iszero(calldatasize()) { }
revert(0, 0) revert(0, 0)
function abi_decode_tuple_(headStart, dataEnd) { function abi_decode_tuple_(headStart, dataEnd) {
if slt(sub(dataEnd, headStart), 0) { revert(0, 0) } if slt(sub(dataEnd, headStart), 0) { revert(0, 0) }