cerc-io/solidity
11
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

Merge remote-tracking branch 'origin/develop' into develop_060

Browse Source
This commit is contained in:
chriseth
2019-12-03 21:17:15 +01:00
parent 19a6f09cc8 306c7eb5e8
commit 2f11ac3590
31 changed files with 202 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libyul/AsmParser.cpp
+5 -4
View File
@@ -21,6 +21,7 @@
*/
#include <libyul/AsmParser.h>
#include <libyul/Exceptions.h>
#include <liblangutil/Scanner.h>
#include <liblangutil/ErrorReporter.h>
#include <libdevcore/Common.h>
@@ -52,7 +53,7 @@ shared_ptr<Block> Parser::parse(std::shared_ptr<Scanner> const& _scanner, bool _
}
catch (FatalError const&)
{
solAssert(!m_errorReporter.errors().empty(), "Fatal error detected, but no error is reported.");
yulAssert(!m_errorReporter.errors().empty(), "Fatal error detected, but no error is reported.");
}
return nullptr;
@@ -232,7 +233,7 @@ Statement Parser::parseStatement()
}
else
{
solAssert(false, "Invalid elementary operation.");
yulAssert(false, "Invalid elementary operation.");
return {};
}
}
@@ -252,7 +253,7 @@ Case Parser::parseCase()
_case.value = make_unique<Literal>(std::get<Literal>(std::move(literal)));
}
else
solAssert(false, "Case or default case expected.");
yulAssert(false, "Case or default case expected.");
_case.body = parseBlock();
_case.location.end = _case.body.location.end;
return _case;
@@ -292,7 +293,7 @@ Expression Parser::parseExpression()
return std::get<Identifier>(operation);
else
{
solAssert(holds_alternative<Literal>(operation), "");
yulAssert(holds_alternative<Literal>(operation), "");
return std::get<Literal>(operation);
}
}