Merge pull request #45 from coco33920/hotfix

Hotfix

CHANGELOG.md

@@ -1,3 +1,6 @@
+# Version 3.0.1 : Bug fix
+Fix stackoverflow on custom function call with same name 
+
 # Version 3.0.0 : Symbolic calculation!
 Version 3.0.0, at last! (if you've seen the PR for it it's been sitting for more
 than three weeks!) 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mini-calc"
-version = "3.0.0"
+version = "3.0.1"
 license = "GPL-3.0-or-later"
 description = "A fully-featured minimalistic configurable rust calculator"
 homepage = "https://calc.nwa2coco.fr"

src/configuration/loader.rs

@@ -131,7 +131,7 @@ pub fn load_color(string: String) -> Color {
 
 pub fn replace_variable(str: String) -> String {
     str.replace("%author%", "Charlotte Thomas")
-        .replace("%version%", "v3.0.0")
+        .replace("%version%", "v3.0.1")
         .to_string()
 }
 

src/functions/function.rs

@@ -56,8 +56,9 @@ pub fn apply_operator_reverse(
 }
 
 pub fn assign(s: Parameters, s2: Parameters) -> (String, Parameters) {
-    match s {
-        Identifier(s) => (s, s2),
+    match (s, s2.clone()) {
+        (Identifier(s), Identifier(s2)) if s == s2 => ("".to_string(), Identifier(s2)),
+        (Identifier(s), _) => (s, s2),
         _ => ("".to_string(), s2),
     }
 }

src/interpreting/stdlib.rs

@@ -75,9 +75,16 @@ pub fn exec(
                             },
                         }
                     }
-                    names.iter().zip(lst).for_each(|(name, param)| {
-                        sram.insert(name.to_string(), param);
-                    });
+                    names
+                        .iter()
+                        .zip(lst)
+                        .filter(|(name, param)| match param {
+                            Parameters::Identifier(s) => s.as_str() != name.as_str(),
+                            _ => true,
+                        })
+                        .for_each(|(name, param)| {
+                            sram.insert(name.to_string(), param);
+                        });
                     interpret(ast, &mut sram, &mut HashMap::new())
                 }
             }

src/main.rs

@@ -263,7 +263,7 @@ fn handle_config(line: &str, config: Config) -> (String, Option<Config>) {
 fn main() {
     let mut args: Args = env::args();
 
-    let version: String = "v3.0.0".to_string();
+    let version: String = "v3.0.1".to_string();
     if args.len() > 1 || !atty::is(Stream::Stdin) {
         let mut a = vec![];