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

Improve formatting.

Browse Source
This commit is contained in:
chriseth 2019-07-11 17:02:53 +02:00
parent e3433aa4eb
commit 6c31a5f3dd
3 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libyul/backends/wasm/EWasmToText.cpp
View File

@ -89,12 +89,14 @@ string EWasmToText::operator()(wasm::Label const& _label)
string EWasmToText::operator()(wasm::BuiltinCall const& _builtinCall) string EWasmToText::operator()(wasm::BuiltinCall const& _builtinCall)
{ {
return "(" + _builtinCall.functionName + " " + joinTransformed(_builtinCall.arguments) + ")"; string args = joinTransformed(_builtinCall.arguments);
return "(" + _builtinCall.functionName + (args.empty() ? "" : " " + args) + ")";
} }
string EWasmToText::operator()(wasm::FunctionCall const& _functionCall) string EWasmToText::operator()(wasm::FunctionCall const& _functionCall)
{ {
return "(call $" + _functionCall.functionName + " " + joinTransformed(_functionCall.arguments) + ")"; string args = joinTransformed(_functionCall.arguments);
return "(call $" + _functionCall.functionName + (args.empty() ? "" : " " + args) + ")";
} }
string EWasmToText::operator()(wasm::LocalAssignment const& _assignment) string EWasmToText::operator()(wasm::LocalAssignment const& _assignment)
@ -109,16 +111,16 @@ string EWasmToText::operator()(wasm::GlobalAssignment const& _assignment)
string EWasmToText::operator()(wasm::If const& _if) string EWasmToText::operator()(wasm::If const& _if)
{ {
string text = "(if " + visit(*_if.condition) + " (then\n" + indented(joinTransformed(_if.statements)) + ")"; string text = "(if " + visit(*_if.condition) + " (then\n" + indented(joinTransformed(_if.statements, '\n')) + ")";
if (_if.elseStatements) if (_if.elseStatements)
text += "(else\n" + indented(joinTransformed(*_if.elseStatements)) + ")"; text += "(else\n" + indented(joinTransformed(*_if.elseStatements, '\n')) + ")";
return std::move(text) + ")\n"; return std::move(text) + ")\n";
} }
string EWasmToText::operator()(wasm::Loop const& _loop) string EWasmToText::operator()(wasm::Loop const& _loop)
{ {
string label = _loop.labelName.empty() ? "" : " $" + _loop.labelName; string label = _loop.labelName.empty() ? "" : " $" + _loop.labelName;
return "(loop" + move(label) + "\n" + indented(joinTransformed(_loop.statements)) + ")\n"; return "(loop" + move(label) + "\n" + indented(joinTransformed(_loop.statements, '\n')) + ")\n";
} }
string EWasmToText::operator()(wasm::Break const& _break) string EWasmToText::operator()(wasm::Break const& _break)
@ -134,17 +136,22 @@ string EWasmToText::operator()(wasm::Continue const& _continue)
string EWasmToText::operator()(wasm::Block const& _block) string EWasmToText::operator()(wasm::Block const& _block)
{ {
string label = _block.labelName.empty() ? "" : " $" + _block.labelName; string label = _block.labelName.empty() ? "" : " $" + _block.labelName;
return "(block" + move(label) + "\n" + indented(joinTransformed(_block.statements)) + "\n)\n"; return "(block" + move(label) + "\n" + indented(joinTransformed(_block.statements, '\n')) + "\n)\n";
} }
string EWasmToText::indented(string const& _in) string EWasmToText::indented(string const& _in)
{ {
string replacement; string replacement;
if (!_in.empty()) if (!_in.empty())
{ {
replacement = " " + boost::replace_all_copy(_in, "\n", "\n "); replacement.reserve(_in.size() + 4);
if (_in.back() == '\n') replacement += " ";
replacement = replacement.substr(0, replacement.size() - 4); for (auto it = _in.begin(); it != _in.end(); ++it)
if (*it == '\n' && it + 1 != _in.end() && *(it + 1) != '\n')
replacement += "\n ";
else
replacement += *it;
} }
return replacement; return replacement;
} }
@ -171,14 +178,14 @@ string EWasmToText::visit(wasm::Expression const& _expression)
return boost::apply_visitor(*this, _expression); return boost::apply_visitor(*this, _expression);
} }
string EWasmToText::joinTransformed(vector<wasm::Expression> const& _expressions) string EWasmToText::joinTransformed(vector<wasm::Expression> const& _expressions, char _separator)
{ {
string ret; string ret;
for (auto const& e: _expressions) for (auto const& e: _expressions)
{ {
string t = visit(e); string t = visit(e);
if (!t.empty() && !ret.empty() && ret.back() != '\n') if (!t.empty() && !ret.empty() && ret.back() != '\n')
ret += ' '; ret += _separator;
ret += move(t); ret += move(t);
} }
return ret; return ret;

5
libyul/backends/wasm/EWasmToText.h
View File

@ -59,7 +59,10 @@ private:
std::string transform(wasm::FunctionDefinition const& _function); std::string transform(wasm::FunctionDefinition const& _function);
std::string visit(wasm::Expression const& _expression); std::string visit(wasm::Expression const& _expression);
std::string joinTransformed(std::vector<wasm::Expression> const& _expressions); std::string joinTransformed(
std::vector<wasm::Expression> const& _expressions,
char _separator = ' '
);
}; };
} }