From 2a8d64fc592c60ee34924078e251c26ba2c60909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Capucho?= Date: Thu, 16 Dec 2021 16:12:28 +0000 Subject: [PATCH] spv-in: Implement remaining sign agnostic ops --- src/front/spv/mod.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/front/spv/mod.rs b/src/front/spv/mod.rs index 9644099895..132b49b624 100644 --- a/src/front/spv/mod.rs +++ b/src/front/spv/mod.rs @@ -1834,7 +1834,7 @@ impl> Parser { inst.expect(4)?; parse_expr_op!(crate::UnaryOperator::Negate, UNARY)?; } - Op::IAdd | Op::ISub => { + Op::IAdd | Op::ISub | Op::IMul | Op::IEqual | Op::INotEqual => { inst.expect(5)?; let operator = map_binary_operator(inst.op)?; self.parse_expr_binary_op_sign_adjusted( @@ -1854,7 +1854,7 @@ impl> Parser { inst.expect(5)?; parse_expr_op!(crate::BinaryOperator::Subtract, BINARY)?; } - Op::IMul | Op::FMul => { + Op::FMul => { inst.expect(5)?; parse_expr_op!(crate::BinaryOperator::Multiply, BINARY)?; } @@ -2640,12 +2640,7 @@ impl> Parser { inst.expect(5)?; parse_expr_op!(crate::BinaryOperator::LogicalAnd, BINARY)?; } - Op::IEqual - | Op::INotEqual - | Op::SGreaterThan - | Op::SGreaterThanEqual - | Op::SLessThan - | Op::SLessThanEqual => { + Op::SGreaterThan | Op::SGreaterThanEqual | Op::SLessThan | Op::SLessThanEqual => { inst.expect(5)?; self.parse_expr_int_comparison( ctx,