diff options
| author | Christian Parpart <christian@parpart.family> | 2018-10-23 07:50:15 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 07:50:15 +0800 |
| commit | a2f5087d13274d6832669a39694ee5a3bf68f878 (patch) | |
| tree | 4b6b8b3816a0a1620e73a30de687ff3557a10098 /libsolidity/formal/SMTChecker.cpp | |
| parent | c13b5280c1b44f18a2a1fb61ef5556e91c5678e7 (diff) | |
| parent | f112377dd44e8281bff092639bb546ec8a6a39ac (diff) | |
| download | dexon-solidity-a2f5087d13274d6832669a39694ee5a3bf68f878.tar dexon-solidity-a2f5087d13274d6832669a39694ee5a3bf68f878.tar.gz dexon-solidity-a2f5087d13274d6832669a39694ee5a3bf68f878.tar.bz2 dexon-solidity-a2f5087d13274d6832669a39694ee5a3bf68f878.tar.lz dexon-solidity-a2f5087d13274d6832669a39694ee5a3bf68f878.tar.xz dexon-solidity-a2f5087d13274d6832669a39694ee5a3bf68f878.tar.zst dexon-solidity-a2f5087d13274d6832669a39694ee5a3bf68f878.zip | |
Merge pull request #5286 from ethereum/refactor-token-as-enum-class
refactor `libsolidity::Token` into a strongly typed enum
Diffstat (limited to 'libsolidity/formal/SMTChecker.cpp')
| -rw-r--r-- | libsolidity/formal/SMTChecker.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libsolidity/formal/SMTChecker.cpp b/libsolidity/formal/SMTChecker.cpp index e5648eb3..99ab2cb5 100644 --- a/libsolidity/formal/SMTChecker.cpp +++ b/libsolidity/formal/SMTChecker.cpp @@ -212,7 +212,7 @@ void SMTChecker::endVisit(VariableDeclarationStatement const& _varDecl) void SMTChecker::endVisit(Assignment const& _assignment) { - if (_assignment.assignmentOperator() != Token::Value::Assign) + if (_assignment.assignmentOperator() != Token::Assign) m_errorReporter.warning( _assignment.location(), "Assertion checker does not yet implement compound assignment." @@ -331,11 +331,11 @@ void SMTChecker::endVisit(UnaryOperation const& _op) void SMTChecker::endVisit(BinaryOperation const& _op) { - if (Token::isArithmeticOp(_op.getOperator())) + if (TokenTraits::isArithmeticOp(_op.getOperator())) arithmeticOperation(_op); - else if (Token::isCompareOp(_op.getOperator())) + else if (TokenTraits::isCompareOp(_op.getOperator())) compareOperation(_op); - else if (Token::isBooleanOp(_op.getOperator())) + else if (TokenTraits::isBooleanOp(_op.getOperator())) booleanOperation(_op); else m_errorReporter.warning( @@ -530,7 +530,7 @@ void SMTChecker::arithmeticOperation(BinaryOperation const& _op) auto const& intType = dynamic_cast<IntegerType const&>(*_op.annotation().commonType); smt::Expression left(expr(_op.leftExpression())); smt::Expression right(expr(_op.rightExpression())); - Token::Value op = _op.getOperator(); + Token op = _op.getOperator(); smt::Expression value( op == Token::Add ? left + right : op == Token::Sub ? left - right : @@ -564,7 +564,7 @@ void SMTChecker::compareOperation(BinaryOperation const& _op) { smt::Expression left(expr(_op.leftExpression())); smt::Expression right(expr(_op.rightExpression())); - Token::Value op = _op.getOperator(); + Token op = _op.getOperator(); shared_ptr<smt::Expression> value; if (isNumber(_op.annotation().commonType->category())) { |