fix problem with Pohuy trait

src/sustlang/mod.rs

@@ -1,7 +1,9 @@
 pub mod command;
+pub mod other;
 pub mod script;
 pub mod var;
 
 pub use command::*;
+pub use other::*;
 pub use script::*;
 pub use var::*;

src/sustlang/other.rs

@@ -0,0 +1,5 @@
+pub trait Pohuy<T, E> {
+    fn pohuy(&self) {}
+}
+
+impl<T, E> Pohuy<T, E> for Result<T, E> {}

src/sustlang/script/function.rs

@@ -1,7 +1,7 @@
 use super::super::command::{Command, CommandType};
-use super::super::script::ScriptError;
+use super::super::other::Pohuy;
 use super::super::var::{VarType, Variable};
-use super::RunningScript;
+use super::{RunningScript, ScriptError};
 
 use std::collections::HashMap;
 
@@ -33,7 +33,6 @@ impl Function {
         script: &mut RunningScript,
         result_var: String,
         args: Vec<Variable>,
-        globals: &mut HashMap<String, Variable>,
         is_global: bool,
     ) -> Result<(), (ScriptError, Command)> {
         let mut locals: HashMap<String, Variable> = HashMap::new();
@@ -54,27 +53,30 @@ impl Function {
                 return Ok(());
             }
 
-            command
+            command.execute(script, is_global, &mut locals, &mut temp_vars)?;
-                .execute(script, is_global, &mut locals, globals, &mut temp_vars)
-                .map_err(|f| (f, command.clone()))?;
 
             if let CommandType::TempVar = command.command_type {
                 continue;
             }
 
             for ele in temp_vars.clone() {
-                script.drop_var(ele, &mut locals);
+                script
+                    .drop_var(ele, &mut locals)
+                    .map_err(|f| (f, command.clone()))
+                    .pohuy();
             }
         }
 
         if result_var != "null" {
-            script.set_var(
+            script
-                result_var,
+                .set_var(
-                locals.get("result").unwrap().clone(),
+                    result_var,
-                is_global,
+                    locals.get("result").unwrap().clone(),
-                false,
+                    is_global,
-                &mut locals,
+                    false,
-            );
+                    &mut locals,
+                )
+                .unwrap();
         }
 
         Ok(())

src/sustlang/script/running_script.rs

@@ -288,9 +288,8 @@ impl RunningScript {
     }
 
     pub fn run(&mut self) -> Result<(), (ScriptError, Command)> {
-        let globals = &mut self.variables.clone();
         let main_function = self.main_function.clone();
 
-        main_function.execute(self, "null".to_string(), Vec::new(), globals, true)
+        main_function.execute(self, "null".to_string(), Vec::new(), true)
     }
 }