global-functions: $ExitError: give matching message for functions

1 files changed, 5 insertions, 3 deletions

diff --git a/global-functions.rsc b/global-functions.rsc
index 8941994..6c74c2f 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -428,13 +428,15 @@
 
 # simple macro to print error message on unintentional error
 :set ExitError do={
-  :local ExitOK     [ :tostr $1 ];
-  :local ScriptName [ :tostr $2 ];
+  :local ExitOK [ :tostr $1 ];
+  :local Name   [ :tostr $2 ];
 
+  :global IfThenElse;
   :global LogPrint; 
 
   :if ($ExitOK = "false") do={
-    $LogPrint error $ScriptName ("Script '" . $ScriptName . "' exited with error.");
+    $LogPrint error $Name ([ $IfThenElse ([ :pick $Name 0 1 ] = "\$") \
+        "Function" "Script" ] . " '" . $Name . "' exited with error.");
   }
 }