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

Move Literal to u256 conversions to extra functions

Browse Source 
That way we can reuse them at different places
This commit is contained in:
Mathias Baumann
2019-03-05 18:39:27 +01:00
parent 40171c216d
commit 921d52bfcd
4 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libyul/Utilities.cpp
+37
View File
@@ -24,6 +24,7 @@
#include <libyul/Exceptions.h>
#include <libdevcore/CommonData.h>
#include <libdevcore/FixedHash.h>
using namespace std;
using namespace dev;
@@ -32,11 +33,47 @@ using namespace yul;
u256 yul::valueOfNumberLiteral(Literal const& _literal)
{
assertThrow(_literal.kind == LiteralKind::Number, OptimizerException, "");
std::string const& literalString = _literal.value.str();
assertThrow(isValidDecimal(literalString) || isValidHex(literalString), OptimizerException, "");
return u256(literalString);
}
u256 yul::valueOfStringLiteral(Literal const& _literal)
{
yulAssert(_literal.kind == LiteralKind::String, "Expected string literal!");
yulAssert(_literal.value.str().size() <= 32, "Literal string too long!");
return u256(h256(_literal.value.str(), h256::FromBinary, h256::AlignLeft));
}
u256 yul::valueOfBoolLiteral(Literal const& _literal)
{
yulAssert(_literal.kind == LiteralKind::Boolean, "Expected bool literal!");
if (_literal.value == "true"_yulstring)
return u256(1);
else if (_literal.value == "false"_yulstring)
return u256(0);
yulAssert(false, "Unexpected bool literal value!");
}
u256 yul::valueOfLiteral(Literal const& _literal)
{
switch(_literal.kind)
{
case LiteralKind::Number:
return valueOfNumberLiteral(_literal);
case LiteralKind::Boolean:
return valueOfBoolLiteral(_literal);
case LiteralKind::String:
return valueOfStringLiteral(_literal);
default:
yulAssert(false, "Unexpected literal kind!");
}
}
template<>
bool Less<Literal>::operator()(Literal const& _lhs, Literal const& _rhs) const
{