From 09ae4f54e31e0e1834c675eb586ef298ce766704 Mon Sep 17 00:00:00 2001 From: German Nikolishin Date: Mon, 1 Apr 2024 21:10:43 +0100 Subject: [PATCH] cleanup --- crates/verifier/src/transformer.rs | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/crates/verifier/src/transformer.rs b/crates/verifier/src/transformer.rs index 2bc7ee1..540ae24 100644 --- a/crates/verifier/src/transformer.rs +++ b/crates/verifier/src/transformer.rs @@ -57,20 +57,14 @@ pub fn transform_expr<'ctx>( ) -> Result, ()> { match expr { // literals - Expression::Int(u) => Ok(int(&u.element, &u.loc, ¶ms.ctx)), - Expression::UInt(u) => Ok(int(&u.element.clone().into(), &u.loc, ¶ms.ctx)), - Expression::Float(u) => Ok(real(&u.element, &u.loc, ¶ms.ctx)), - Expression::Boolean(u) => Ok(bool(u.element, &u.loc, ¶ms.ctx)), - Expression::String(u) => Ok(string(u.element.as_str(), &u.loc, ¶ms.ctx)), - Expression::Char(u) => Ok(char(u.element, &u.loc, ¶ms.ctx)), - Expression::Hex(u) => { - Ok(string( - hex::encode(&u.element).as_str(), - &u.loc, - ¶ms.ctx, - )) - } - Expression::Address(u) => Ok(string(u.element.to_string().as_str(), &u.loc, ¶ms.ctx)), + Expression::Int(u) => Ok(int(&u.element, &u.loc, params.ctx)), + Expression::UInt(u) => Ok(int(&u.element.clone().into(), &u.loc, params.ctx)), + Expression::Float(u) => Ok(real(&u.element, &u.loc, params.ctx)), + Expression::Boolean(u) => Ok(bool(u.element, &u.loc, params.ctx)), + Expression::String(u) => Ok(string(u.element.as_str(), &u.loc, params.ctx)), + Expression::Char(u) => Ok(char(u.element, &u.loc, params.ctx)), + Expression::Hex(u) => Ok(string(hex::encode(&u.element).as_str(), &u.loc, params.ctx)), + Expression::Address(u) => Ok(string(u.element.to_string().as_str(), &u.loc, params.ctx)), Expression::Enum(u) => Ok(enum_(u, params)), // binary operations @@ -127,7 +121,7 @@ fn list<'ctx>( u: &UnaryExpression>, params: &mut TransformParams<'ctx, '_>, ) -> Result, ()> { - let mut set = Set::empty(¶ms.ctx, &type_to_sort(&u.ty, ¶ms.ctx)); + let mut set = Set::empty(params.ctx, &type_to_sort(&u.ty, params.ctx)); for e in &u.element { let z3_e = transform_expr(e, params)?; set = set.add(&z3_e.element);