From d663af8a46c52c0fa1b29bc9f1d67e5c5c58e2c8 Mon Sep 17 00:00:00 2001 From: Adam Wick Date: Thu, 22 Feb 2024 15:17:56 -0800 Subject: [PATCH] better --- examples/basic/function0002.ngr | 4 ++-- src/backend/into_crane.rs | 10 ++++++++-- src/type_infer/finalize.rs | 4 +++- src/type_infer/solve.rs | 12 ++++++++---- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/examples/basic/function0002.ngr b/examples/basic/function0002.ngr index 9d8f014..53a0bac 100644 --- a/examples/basic/function0002.ngr +++ b/examples/basic/function0002.ngr @@ -6,5 +6,5 @@ print x; result = add_x(a); print x; print result; -result = add_x_twice(a); -print result; \ No newline at end of file +result2 = add_x_twice(a); +print result2; \ No newline at end of file diff --git a/src/backend/into_crane.rs b/src/backend/into_crane.rs index 2526984..d4053b7 100644 --- a/src/backend/into_crane.rs +++ b/src/backend/into_crane.rs @@ -471,7 +471,10 @@ impl Backend { Some(ReferenceBuilder::Global(_, global_value)) => { let pointer = self.module.target_config().pointer_type(); let pointer_to = builder.ins().symbol_value(pointer, *global_value); - println!("STORE {}: cranelift_type {} origin type {:?}", name, value, value_type); + println!( + "STORE {}: cranelift_type {} origin type {:?}", + name, value, value_type + ); builder.ins().store(MemFlags::new(), value, pointer_to, 0); Ok((builder.ins().iconst(types::I64, 0), ConstantType::Void)) } @@ -597,7 +600,10 @@ impl Backend { let pointer_to = self.module.target_config().pointer_type(); let pointer_value = builder.ins().symbol_value(pointer_to, *gv); let cranelift_type = ir::Type::from(*ty); - println!("READ {}: cranelift_type {} origin type {:?}", name, cranelift_type, ty); + println!( + "READ {}: cranelift_type {} origin type {:?}", + name, cranelift_type, ty + ); let value = builder .ins() diff --git a/src/type_infer/finalize.rs b/src/type_infer/finalize.rs index 12bf00b..59aecf3 100644 --- a/src/type_infer/finalize.rs +++ b/src/type_infer/finalize.rs @@ -89,7 +89,9 @@ fn finalize_expression( Expression::Block(loc, finalize_type(ty, resolutions), final_exprs) } - Expression::Print(loc, var) => Expression::Print(loc, finalize_val_or_ref(var, resolutions)), + Expression::Print(loc, var) => { + Expression::Print(loc, finalize_val_or_ref(var, resolutions)) + } Expression::Call(loc, ty, fun, args) => Expression::Call( loc, diff --git a/src/type_infer/solve.rs b/src/type_infer/solve.rs index 44e8f90..fc9b849 100644 --- a/src/type_infer/solve.rs +++ b/src/type_infer/solve.rs @@ -530,7 +530,7 @@ pub fn solve_constraints( )); } changed_something = true; - println!("changed something because 12"); + println!("changed something because 12"); } Constraint::Equivalent( @@ -545,10 +545,14 @@ pub fn solve_constraints( ) => { errors.push(TypeInferenceError::NotEquivalent(loc, pt, ft)); changed_something = true; - println!("changed something because 13"); + println!("changed something because 13"); } - Constraint::Equivalent(_, TypeOrVar::Variable(_, name1), TypeOrVar::Variable(_, name2)) if name1 == name2 => { + Constraint::Equivalent( + _, + TypeOrVar::Variable(_, name1), + TypeOrVar::Variable(_, name2), + ) if name1 == name2 => { changed_something = true; } @@ -570,7 +574,7 @@ pub fn solve_constraints( } changed_something = true; - println!("changed something because 14"); + println!("changed something because 14"); } Constraint::Equivalent(_, TypeOrVar::Variable(_, ref name), ref rhs) => {