Merge branch 'master' into plugins

2020-07-26 10:05:56 +08:00
parent d278f3725c ba5c4fd040
commit 8e33cbfe34
35 changed files with 364 additions and 179 deletions
--- a/src/fn_call.rs
+++ b/src/fn_call.rs
@@ -865,10 +865,22 @@ impl Engine {
                EvalAltResult::ErrorFunctionNotFound(_, _) if def_val.is_some() => {
                    Ok(def_val.unwrap().into())
                }
-                EvalAltResult::ErrorFunctionNotFound(_, _) => {
+                EvalAltResult::ErrorFunctionNotFound(_, pos) => {
                    Err(Box::new(EvalAltResult::ErrorFunctionNotFound(
-                        format!("{}{}", modules, name),
-                        Position::none(),
+                        format!(
+                            "{}{} ({})",
+                            modules,
+                            name,
+                            args.iter()
+                                .map(|a| if a.is::<ImmutableString>() {
+                                    "&str | ImmutableString | String"
+                                } else {
+                                    self.map_type_name((*a).type_name())
+                                })
+                                .collect::<Vec<_>>()
+                                .join(", ")
+                        ),
+                        pos,
                    )))
                }
                _ => Err(err),