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

mostly style changes

Browse Source
This commit is contained in:
Daniel Lupu 2022-12-23 16:42:02 +02:00 committed by r0qs
parent bf9c95f5c9
commit b838b9a820
No known key found for this signature in database
GPG Key ID: 61503DBA6667276C
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/tools/yulopti.cpp
View File

@ -104,7 +104,7 @@ public:
m_inputIsCodeBlock = true; m_inputIsCodeBlock = true;
if (!_objectPath.empty()) if (!_objectPath.empty())
throw runtime_error("Object path argument cannot be used. Input is a code block."); solThrow(Exception, "Object path argument cannot be used. Input is a code block.");
} }
shared_ptr<Object> object = parser.parse(scanner, false); shared_ptr<Object> object = parser.parse(scanner, false);
@ -113,14 +113,13 @@ public:
{ {
cerr << "Error parsing source." << endl; cerr << "Error parsing source." << endl;
printErrors(charStream, errors); printErrors(charStream, errors);
throw runtime_error("Could not parse source."); solThrow(Exception, "Could not parse source.");
} }
m_object = Object::objectAt(object, _objectPath); m_object = Object::objectAt(object, _objectPath);
if (m_object == nullptr) { if (m_object == nullptr)
throw runtime_error("Assembly object not found."); solThrow(Exception, "Assembly object not found.");
}
runCodeAnalyzer(errorReporter); runCodeAnalyzer(errorReporter);
} }
@ -183,7 +182,8 @@ public:
void applyFunctionToObjectAndSubobjects(Object& _object, function<void(Object&)> _function) void applyFunctionToObjectAndSubobjects(Object& _object, function<void(Object&)> _function)
{ {
for (auto const& subObjectNode: _object.subObjects) { for (auto const& subObjectNode: _object.subObjects)
{
auto subObject = dynamic_pointer_cast<Object>(subObjectNode); auto subObject = dynamic_pointer_cast<Object>(subObjectNode);
if (subObject != nullptr) if (subObject != nullptr)
@ -234,10 +234,7 @@ public:
{ {
applyFunctionToObjectAndSubobjects( applyFunctionToObjectAndSubobjects(
*m_object, *m_object,
[&](Object& _object) [&](Object& _object) { OptimiserSuite{*m_context}.runSequence(_steps, *_object.code); }
{
OptimiserSuite{*m_context}.runSequence(_steps, *_object.code);
}
); );
} }
@ -245,10 +242,7 @@ public:
{ {
applyFunctionToObjectAndSubobjects( applyFunctionToObjectAndSubobjects(
*m_object, *m_object,
[&](Object& _object) [&](Object& _object) { VarNameCleaner::run(*m_context, *_object.code); }
{
VarNameCleaner::run(*m_context, *_object.code);
}
); );
} }
@ -256,10 +250,7 @@ public:
{ {
applyFunctionToObjectAndSubobjects( applyFunctionToObjectAndSubobjects(
*m_object, *m_object,
[&](Object& _object) [&](Object& _object) { StackCompressor::run(m_dialect, _object, true, 16); }
{
StackCompressor::run(m_dialect, _object, true, 16);
}
); );
} }
@ -267,7 +258,8 @@ public:
{ {
if (!m_inputIsCodeBlock) if (!m_inputIsCodeBlock)
cout << m_object->toString(&m_dialect) << endl; cout << m_object->toString(&m_dialect) << endl;
else { else
{
yulAssert( yulAssert(
m_object->subObjects.empty(), m_object->subObjects.empty(),
"Unexpected subObjects found." "Unexpected subObjects found."