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

Rename formatting function.

Browse Source
This commit is contained in:
chriseth 2021-09-06 18:41:02 +02:00
parent 63993387d6
commit dafa6f552b
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libyul/AsmPrinter.cpp
View File

@ -45,7 +45,7 @@ using namespace solidity::yul;
string AsmPrinter::operator()(Literal const& _literal) string AsmPrinter::operator()(Literal const& _literal)
{ {
string const locationComment = formatSourceLocationComment(_literal); string const locationComment = formatDebugData(_literal);
switch (_literal.kind) switch (_literal.kind)
{ {
@ -65,19 +65,19 @@ string AsmPrinter::operator()(Literal const& _literal)
string AsmPrinter::operator()(Identifier const& _identifier) string AsmPrinter::operator()(Identifier const& _identifier)
{ {
yulAssert(!_identifier.name.empty(), "Invalid identifier."); yulAssert(!_identifier.name.empty(), "Invalid identifier.");
return formatSourceLocationComment(_identifier) + _identifier.name.str(); return formatDebugData(_identifier) + _identifier.name.str();
} }
string AsmPrinter::operator()(ExpressionStatement const& _statement) string AsmPrinter::operator()(ExpressionStatement const& _statement)
{ {
string const locationComment = formatSourceLocationComment(_statement); string const locationComment = formatDebugData(_statement);
return locationComment + std::visit(*this, _statement.expression); return locationComment + std::visit(*this, _statement.expression);
} }
string AsmPrinter::operator()(Assignment const& _assignment) string AsmPrinter::operator()(Assignment const& _assignment)
{ {
string const locationComment = formatSourceLocationComment(_assignment); string const locationComment = formatDebugData(_assignment);
yulAssert(_assignment.variableNames.size() >= 1, ""); yulAssert(_assignment.variableNames.size() >= 1, "");
string variables = (*this)(_assignment.variableNames.front()); string variables = (*this)(_assignment.variableNames.front());
@ -89,7 +89,7 @@ string AsmPrinter::operator()(Assignment const& _assignment)
string AsmPrinter::operator()(VariableDeclaration const& _variableDeclaration) string AsmPrinter::operator()(VariableDeclaration const& _variableDeclaration)
{ {
string out = formatSourceLocationComment(_variableDeclaration); string out = formatDebugData(_variableDeclaration);
out += "let "; out += "let ";
out += boost::algorithm::join( out += boost::algorithm::join(
@ -110,7 +110,7 @@ string AsmPrinter::operator()(FunctionDefinition const& _functionDefinition)
{ {
yulAssert(!_functionDefinition.name.empty(), "Invalid function name."); yulAssert(!_functionDefinition.name.empty(), "Invalid function name.");
string out = formatSourceLocationComment(_functionDefinition); string out = formatDebugData(_functionDefinition);
out += "function " + _functionDefinition.name.str() + "("; out += "function " + _functionDefinition.name.str() + "(";
out += boost::algorithm::join( out += boost::algorithm::join(
_functionDefinition.parameters | ranges::views::transform( _functionDefinition.parameters | ranges::views::transform(
@ -135,7 +135,7 @@ string AsmPrinter::operator()(FunctionDefinition const& _functionDefinition)
string AsmPrinter::operator()(FunctionCall const& _functionCall) string AsmPrinter::operator()(FunctionCall const& _functionCall)
{ {
string const locationComment = formatSourceLocationComment(_functionCall); string const locationComment = formatDebugData(_functionCall);
string const functionName = (*this)(_functionCall.functionName); string const functionName = (*this)(_functionCall.functionName);
return return
locationComment + locationComment +
@ -150,7 +150,7 @@ string AsmPrinter::operator()(If const& _if)
{ {
yulAssert(_if.condition, "Invalid if condition."); yulAssert(_if.condition, "Invalid if condition.");
string out = formatSourceLocationComment(_if); string out = formatDebugData(_if);
out += "if " + std::visit(*this, *_if.condition); out += "if " + std::visit(*this, *_if.condition);
string body = (*this)(_if.body); string body = (*this)(_if.body);
@ -165,7 +165,7 @@ string AsmPrinter::operator()(Switch const& _switch)
{ {
yulAssert(_switch.expression, "Invalid expression pointer."); yulAssert(_switch.expression, "Invalid expression pointer.");
string out = formatSourceLocationComment(_switch); string out = formatDebugData(_switch);
out += "switch " + std::visit(*this, *_switch.expression); out += "switch " + std::visit(*this, *_switch.expression);
for (auto const& _case: _switch.cases) for (auto const& _case: _switch.cases)
@ -182,7 +182,7 @@ string AsmPrinter::operator()(Switch const& _switch)
string AsmPrinter::operator()(ForLoop const& _forLoop) string AsmPrinter::operator()(ForLoop const& _forLoop)
{ {
yulAssert(_forLoop.condition, "Invalid for loop condition."); yulAssert(_forLoop.condition, "Invalid for loop condition.");
string const locationComment = formatSourceLocationComment(_forLoop); string const locationComment = formatDebugData(_forLoop);
string pre = (*this)(_forLoop.pre); string pre = (*this)(_forLoop.pre);
string condition = std::visit(*this, *_forLoop.condition); string condition = std::visit(*this, *_forLoop.condition);
@ -203,23 +203,23 @@ string AsmPrinter::operator()(ForLoop const& _forLoop)
string AsmPrinter::operator()(Break const& _break) string AsmPrinter::operator()(Break const& _break)
{ {
return formatSourceLocationComment(_break) + "break"; return formatDebugData(_break) + "break";
} }
string AsmPrinter::operator()(Continue const& _continue) string AsmPrinter::operator()(Continue const& _continue)
{ {
return formatSourceLocationComment(_continue) + "continue"; return formatDebugData(_continue) + "continue";
} }
// '_leave' and '__leave' is reserved in VisualStudio // '_leave' and '__leave' is reserved in VisualStudio
string AsmPrinter::operator()(Leave const& leave_) string AsmPrinter::operator()(Leave const& leave_)
{ {
return formatSourceLocationComment(leave_) + "leave"; return formatDebugData(leave_) + "leave";
} }
string AsmPrinter::operator()(Block const& _block) string AsmPrinter::operator()(Block const& _block)
{ {
string const locationComment = formatSourceLocationComment(_block); string const locationComment = formatDebugData(_block);
if (_block.statements.empty()) if (_block.statements.empty())
return locationComment + "{ }"; return locationComment + "{ }";
@ -239,7 +239,7 @@ string AsmPrinter::operator()(Block const& _block)
string AsmPrinter::formatTypedName(TypedName _variable) string AsmPrinter::formatTypedName(TypedName _variable)
{ {
yulAssert(!_variable.name.empty(), "Invalid variable name."); yulAssert(!_variable.name.empty(), "Invalid variable name.");
return formatSourceLocationComment(_variable) + _variable.name.str() + appendTypeName(_variable.type); return formatDebugData(_variable) + _variable.name.str() + appendTypeName(_variable.type);
} }
string AsmPrinter::appendTypeName(YulString _type, bool _isBoolLiteral) const string AsmPrinter::appendTypeName(YulString _type, bool _isBoolLiteral) const
@ -300,7 +300,7 @@ string AsmPrinter::formatSourceLocationComment(
"/** " + joinHumanReadable(vector<string>{sourceLocation, solidityCodeSnippet}, " ") + " */ "; "/** " + joinHumanReadable(vector<string>{sourceLocation, solidityCodeSnippet}, " ") + " */ ";
} }
string AsmPrinter::formatSourceLocationComment(shared_ptr<DebugData const> const& _debugData, bool _statement) string AsmPrinter::formatDebugData(shared_ptr<DebugData const> const& _debugData, bool _statement)
{ {
if ( if (
!_debugData || !_debugData ||

6
libyul/AsmPrinter.h
View File

@ -90,12 +90,12 @@ public:
private: private:
std::string formatTypedName(TypedName _variable); std::string formatTypedName(TypedName _variable);
std::string appendTypeName(YulString _type, bool _isBoolLiteral = false) const; std::string appendTypeName(YulString _type, bool _isBoolLiteral = false) const;
std::string formatSourceLocationComment(std::shared_ptr<DebugData const> const& _debugData, bool _statement); std::string formatDebugData(std::shared_ptr<DebugData const> const& _debugData, bool _statement);
template <class T> template <class T>
std::string formatSourceLocationComment(T const& _node) std::string formatDebugData(T const& _node)
{ {
bool isExpression = std::is_constructible<Expression, T>::value; bool isExpression = std::is_constructible<Expression, T>::value;
return formatSourceLocationComment(_node.debugData, !isExpression); return formatDebugData(_node.debugData, !isExpression);
} }
Dialect const* const m_dialect = nullptr; Dialect const* const m_dialect = nullptr;