From 9edad9941bb0f7490fd8f9c3349b454aea9999d3 Mon Sep 17 00:00:00 2001 From: Aboogeeky Date: Sun, 28 Apr 2024 16:44:22 +0100 Subject: [PATCH 1/3] Update lib.cairo feat: implement add, difference, multiplication and division functions --- src/lib.cairo | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/src/lib.cairo b/src/lib.cairo index f519d1c..9ae6b5f 100644 --- a/src/lib.cairo +++ b/src/lib.cairo @@ -1,17 +1,23 @@ fn main() { short_str(); let result = check_num(30); - println!("check_sum fn result here: {result}"); - let sum: u16 = add_num(10, 5); - println!("the sum of 2 numbers is: {sum}"); + println!("Check_sum function result here: {result}"); + let sum: u16 = add_num(20, 4); + println!("The sum of two numbers is: {sum}"); + let diff: u16 = sub_num(12, 3); + println!("The difference of 12 and 3 is: {}", sub); + let mul_val: u16 = mul_num(4, 5); + println!("The product of 4 and 5 equals {}", mul_val); + let div_val: u16 = div_num(12, 2); + println!("The division of 12 and 2 equals {}", div_val); } -// short string data type +// Short string data type fn short_str() { - println!("GM Cairo!"); + println!("Good morning, Cairo!"); } -// bool data type +// Boolean data type fn check_num(n1: u8) -> bool { if n1 > 20 { return true; @@ -19,9 +25,29 @@ fn check_num(n1: u8) -> bool { return false; } -// function to perform basic addition arithmetic operation +// Function to perform basic addition arithmetic operation fn add_num(n1: u16, n2: u16) -> u16 { let result: u16 = n1 + n2; return result; } +// Function to perform basic subtraction arithmetic operation +fn sub_num(n1: u16, n2: u16) -> u16 { + let result: u16 = n1 - n2; + result +} + +// Function to perform basic multiplication arithmetic operation +fn mul_num(n1: u16, n2: u16) -> u16 { + let result: u16 = n1 * n2; + result +} + +// Function to perform basic division arithmetic operation +fn div_num(n1: u16, n2: u16) -> u16 { + let result: u16 = (n1 / n2) + } + +} + + From 1b0750b55216e5230bd8eea03862327fc36dfea8 Mon Sep 17 00:00:00 2001 From: Aboogeeky Date: Sun, 28 Apr 2024 16:53:38 +0100 Subject: [PATCH 2/3] feat: implement add, difference, multiplication and division functions --- src/lib.cairo | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib.cairo b/src/lib.cairo index 9ae6b5f..fbf1acf 100644 --- a/src/lib.cairo +++ b/src/lib.cairo @@ -3,13 +3,13 @@ fn main() { let result = check_num(30); println!("Check_sum function result here: {result}"); let sum: u16 = add_num(20, 4); - println!("The sum of two numbers is: {sum}"); + println!("The sum is: {sum}"); let diff: u16 = sub_num(12, 3); - println!("The difference of 12 and 3 is: {}", sub); + println!("The difference is: {}", sub); let mul_val: u16 = mul_num(4, 5); - println!("The product of 4 and 5 equals {}", mul_val); + println!("The product is {}", mul_val); let div_val: u16 = div_num(12, 2); - println!("The division of 12 and 2 equals {}", div_val); + println!("The result is {}", div_val); } // Short string data type From 45e2738582f9cd38f336334786e6d58bec966c52 Mon Sep 17 00:00:00 2001 From: Aboogeeky Date: Mon, 29 Apr 2024 06:05:51 +0100 Subject: [PATCH 3/3] chore: correct code and ensure it compiles --- src/lib.cairo | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/src/lib.cairo b/src/lib.cairo index fbf1acf..50f52f2 100644 --- a/src/lib.cairo +++ b/src/lib.cairo @@ -1,11 +1,11 @@ fn main() { short_str(); let result = check_num(30); - println!("Check_sum function result here: {result}"); + println!("Check_sum function result here: {}", result); // Fixed the string interpolation syntax let sum: u16 = add_num(20, 4); - println!("The sum is: {sum}"); + println!("The sum is: {}", sum); // Fixed the string interpolation syntax let diff: u16 = sub_num(12, 3); - println!("The difference is: {}", sub); + println!("The difference is: {}", diff); // Fixed variable name mismatch in string interpolation let mul_val: u16 = mul_num(4, 5); println!("The product is {}", mul_val); let div_val: u16 = div_num(12, 2); @@ -19,35 +19,25 @@ fn short_str() { // Boolean data type fn check_num(n1: u8) -> bool { - if n1 > 20 { - return true; - } - return false; + n1 > 20 // Simplified boolean return } // Function to perform basic addition arithmetic operation fn add_num(n1: u16, n2: u16) -> u16 { - let result: u16 = n1 + n2; - return result; + n1 + n2 // Simplified return } // Function to perform basic subtraction arithmetic operation fn sub_num(n1: u16, n2: u16) -> u16 { - let result: u16 = n1 - n2; - result + n1 - n2 // Simplified return } // Function to perform basic multiplication arithmetic operation fn mul_num(n1: u16, n2: u16) -> u16 { - let result: u16 = n1 * n2; - result + n1 * n2 // Simplified return } // Function to perform basic division arithmetic operation fn div_num(n1: u16, n2: u16) -> u16 { - let result: u16 = (n1 / n2) - } - + n1 / n2 // Corrected syntax and simplified return } - -