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

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 17:26:28 +01:00
parent 40171c216d
commit 921d52bfcd
4 changed files with 44 additions and 28 deletions
libyul
Utilities.cppUtilities.h
backends/evm
EVMCodeTransform.cpp
test/tools/yulInterpreter
Interpreter.cpp

37
libyul/Utilities.cpp
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
{

3
libyul/Utilities.h
View File

@ -27,6 +27,9 @@ namespace yul
{
dev::u256 valueOfNumberLiteral(Literal const& _literal);
dev::u256 valueOfStringLiteral(Literal const& _literal);
dev::u256 valueOfBoolLiteral(Literal const& _literal);
dev::u256 valueOfLiteral(Literal const& _literal);
/**
* Linear order on Yul AST nodes.

17
libyul/backends/evm/EVMCodeTransform.cpp
View File

@ -23,6 +23,7 @@
#include <libyul/optimiser/NameCollector.h>
#include <libyul/AsmAnalysisInfo.h>
#include <libyul/AsmData.h>
#include <libyul/Utilities.h>
#include <liblangutil/Exceptions.h>
@ -396,20 +397,8 @@ void CodeTransform::operator()(Identifier const& _identifier)
void CodeTransform::operator()(Literal const& _literal)
{
m_assembly.setSourceLocation(_literal.location);
if (_literal.kind == LiteralKind::Number)
m_assembly.appendConstant(u256(_literal.value.str()));
else if (_literal.kind == LiteralKind::Boolean)
{
if (_literal.value == "true"_yulstring)
m_assembly.appendConstant(u256(1));
else
m_assembly.appendConstant(u256(0));
}
else
{
solAssert(_literal.value.str().size() <= 32, "");
m_assembly.appendConstant(u256(h256(_literal.value.str(), h256::FromBinary, h256::AlignLeft)));
}
m_assembly.appendConstant(valueOfLiteral(_literal));
checkStackHeight(&_literal);
}

15
test/tools/yulInterpreter/Interpreter.cpp
View File

@ -155,20 +155,7 @@ void ExpressionEvaluator::operator()(Literal const& _literal)
static YulString const trueString("true");
static YulString const falseString("false");
switch (_literal.kind)
{
case LiteralKind::Boolean:
solAssert(_literal.value == trueString || _literal.value == falseString, "");
setValue(_literal.value == trueString ? 1 : 0);
break;
case LiteralKind::Number:
setValue(valueOfNumberLiteral(_literal));
break;
case LiteralKind::String:
solAssert(_literal.value.str().size() <= 32, "");
setValue(u256(h256(_literal.value.str(), h256::FromBinary, h256::AlignLeft)));
break;
}
setValue(valueOfLiteral(_literal));
}
void ExpressionEvaluator::operator()(Identifier const& _identifier)