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

Assembly printing fixes.

Browse Source
This commit is contained in:
chriseth 2017-02-14 15:41:07 +01:00
parent 58849cb1d5
commit 24197a2b3f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libsolidity/inlineasm/AsmPrinter.cpp
View File

@ -52,9 +52,7 @@ string AsmPrinter::operator()(assembly::Literal const& _literal)
if (c == '\\') if (c == '\\')
out += "\\\\"; out += "\\\\";
else if (c == '"') else if (c == '"')
out += "\\"; out += "\\\"";
else if (c == '\'')
out += "\\'";
else if (c == '\b') else if (c == '\b')
out += "\\b"; out += "\\b";
else if (c == '\f') else if (c == '\f')
@ -70,7 +68,7 @@ string AsmPrinter::operator()(assembly::Literal const& _literal)
else if (!isprint(c, locale::classic())) else if (!isprint(c, locale::classic()))
{ {
ostringstream o; ostringstream o;
o << std::hex << setfill('0') << setw(2) << unsigned(c); o << std::hex << setfill('0') << setw(2) << (unsigned)(unsigned char)(c);
out += "\\x" + o.str(); out += "\\x" + o.str();
} }
else else
@ -86,7 +84,7 @@ string AsmPrinter::operator()(assembly::Identifier const& _identifier)
string AsmPrinter::operator()(assembly::FunctionalInstruction const& _functionalInstruction) string AsmPrinter::operator()(assembly::FunctionalInstruction const& _functionalInstruction)
{ {
return return
(*this)(_functionalInstruction.instruction); + (*this)(_functionalInstruction.instruction) +
"(" + "(" +
boost::algorithm::join( boost::algorithm::join(
_functionalInstruction.arguments | boost::adaptors::transformed(boost::apply_visitor(*this)), _functionalInstruction.arguments | boost::adaptors::transformed(boost::apply_visitor(*this)),
@ -116,6 +114,8 @@ string AsmPrinter::operator()(assembly::VariableDeclaration const& _variableDecl
string AsmPrinter::operator()(Block const& _block) string AsmPrinter::operator()(Block const& _block)
{ {
if (_block.statements.empty())
return "{\n}";
string body = boost::algorithm::join( string body = boost::algorithm::join(
_block.statements | boost::adaptors::transformed(boost::apply_visitor(*this)), _block.statements | boost::adaptors::transformed(boost::apply_visitor(*this)),
"\n" "\n"