Comparison operations.

This commit is contained in:
chriseth 2019-05-02 14:25:23 +02:00
parent 4069b19734
commit 3fa4c3da1e
2 changed files with 106 additions and 1 deletions

View File

@ -203,14 +203,45 @@ void IRGeneratorForStatements::endVisit(BinaryOperation const& _binOp)
{
solAssert(!!_binOp.annotation().commonType, "");
TypePointer commonType = _binOp.annotation().commonType;
langutil::Token op = _binOp.getOperator();
if (_binOp.getOperator() == Token::And || _binOp.getOperator() == Token::Or)
if (op == Token::And || op == Token::Or)
// special case: short-circuiting
solUnimplementedAssert(false, "");
else if (commonType->category() == Type::Category::RationalNumber)
defineExpression(_binOp) <<
toCompactHexWithPrefix(commonType->literalValue(nullptr)) <<
"\n";
else if (TokenTraits::isCompareOp(op))
{
solUnimplementedAssert(commonType->category() != Type::Category::Function, "");
solAssert(commonType->isValueType(), "");
bool isSigned = false;
if (auto type = dynamic_cast<IntegerType const*>(commonType))
isSigned = type->isSigned();
string args =
expressionAsType(_binOp.leftExpression(), *commonType) +
", " +
expressionAsType(_binOp.rightExpression(), *commonType);
string expr;
if (op == Token::Equal)
expr = "eq(" + move(args) + ")";
else if (op == Token::NotEqual)
expr = "iszero(eq(" + move(args) + "))";
else if (op == Token::GreaterThanOrEqual)
expr = "iszero(" + string(isSigned ? "slt(" : "lt(") + move(args) + "))";
else if (op == Token::LessThanOrEqual)
expr = "iszero(" + string(isSigned ? "sgt(" : "gt(") + move(args) + "))";
else if (op == Token::GreaterThan)
expr = (isSigned ? "sgt(" : "gt(") + move(args) + ")";
else if (op == Token::LessThan)
expr = (isSigned ? "slt(" : "lt(") + move(args) + ")";
else
solAssert(false, "Unknown comparison operator.");
defineExpression(_binOp) << expr << "\n";
}
else
{
solUnimplementedAssert(_binOp.getOperator() == Token::Add, "");

View File

@ -0,0 +1,74 @@
contract C {
function f(address a) public pure returns (bool) {
return a == address(0);
}
function g() public pure returns (bool) {
return bytes3("abc") == bytes4("abc");
}
function lt(uint a, uint b) public pure returns (bool) {
return a < b;
}
function slt(int a, int b) public pure returns (bool) {
return a < b;
}
function lte(uint a, uint b) public pure returns (bool) {
return a <= b;
}
function slte(int a, int b) public pure returns (bool) {
return a <= b;
}
function gt(uint a, uint b) public pure returns (bool) {
return a > b;
}
function sgt(int a, int b) public pure returns (bool) {
return a > b;
}
function gte(uint a, uint b) public pure returns (bool) {
return a >= b;
}
function sgte(int a, int b) public pure returns (bool) {
return a >= b;
}
function eq(uint a, uint b) public pure returns (bool) {
return a == b;
}
function neq(uint a, uint b) public pure returns (bool) {
return a != b;
}
}
// ====
// compileViaYul: true
// ----
// f(address): 0x1234 -> false
// f(address): 0x00 -> true
// g() -> true
// lt(uint256,uint256): 4, 5 -> true
// lt(uint256,uint256): 5, 5 -> false
// lt(uint256,uint256): 6, 5 -> false
// gt(uint256,uint256): 4, 5 -> false
// gt(uint256,uint256): 5, 5 -> false
// gt(uint256,uint256): 6, 5 -> true
// lte(uint256,uint256): 4, 5 -> true
// lte(uint256,uint256): 5, 5 -> true
// lte(uint256,uint256): 6, 5 -> false
// gte(uint256,uint256): 4, 5 -> false
// gte(uint256,uint256): 5, 5 -> true
// gte(uint256,uint256): 6, 5 -> true
// eq(uint256,uint256): 4, 5 -> false
// eq(uint256,uint256): 5, 5 -> true
// eq(uint256,uint256): 6, 5 -> false
// neq(uint256,uint256): 4, 5 -> true
// neq(uint256,uint256): 5, 5 -> false
// neq(uint256,uint256): 6, 5 -> true
// slt(int256,int256): -1, 0 -> true
// slt(int256,int256): 0, 0 -> false
// slt(int256,int256): 1, 0 -> false
// sgt(int256,int256): -1, 0 -> false
// sgt(int256,int256): 0, 0 -> false
// sgt(int256,int256): 1, 0 -> true
// slte(int256,int256): -1, 0 -> true
// slte(int256,int256): 0, 0 -> true
// slte(int256,int256): 1, 0 -> false
// sgte(int256,int256): -1, 0 -> false
// sgte(int256,int256): 0, 0 -> true
// sgte(int256,int256): 1, 0 -> true