working on #36

Author: Techcraft7

7Sharp/Intrerpreter/Nodes/FunctionCallNode.cs

@@ -13,30 +13,41 @@ internal class FunctionCallNode : Node
 		private readonly UserFunction userFunc;
 		private readonly bool isUserFunc;
 		private readonly List<List<Token<TokenType>>> args;
+		private string name;
 
 		public FunctionCallNode(UserFunction userFunc, List<List<Token<TokenType>>> args, LexerPosition linePosition) : base(linePosition)
 		{
 			func = null;
 			this.userFunc = userFunc;
 			isUserFunc = true;
 			this.args = args;
+			name = userFunc.Name;
 		}
 
 		public FunctionCallNode(_7sFunction func, List<List<Token<TokenType>>> args, LexerPosition linePosition) : base(linePosition)
 		{
 			this.func = func ?? throw new InterpreterException($"Unknown function at {linePosition}");
 			this.args = args;
+			isUserFunc = false;
+			name = func.Name;
 		}
 
 		public override void Run(ref InterpreterState state)
 		{
-			if (isUserFunc)
+			try
 			{
-				userFunc.Run(ref state, ParseArgs(args, state));
+				if (isUserFunc)
+				{
+					userFunc.Run(ref state, ParseArgs(args, state));
+				}
+				else
+				{
+					state.ReturnValue = func.Run(ParseArgs(args, state));
+				}
 			}
-			else
+			catch (Exception e)
 			{
-				state.ReturnValue = func.Run(ParseArgs(args, state));
+				throw new InterpreterException($"Error in {name}", e);
 			}
 		}
 

7Sharp/Intrerpreter/Sysfunctions.cs

@@ -7,7 +7,25 @@ namespace _7Sharp.Intrerpreter
 {
 	internal class SysFunctions
 	{
-		public static double Double(object value) => Convert.ToDouble(value);
+		public static double Double(object value)
+		{
+			try
+			{
+				return Convert.ToDouble(value);
+			}
+			catch (OverflowException)
+			{
+				throw new InterpreterException("double: Number is too big!");
+			}
+			catch (FormatException)
+			{
+				throw new InterpreterException("double: Invalid number!");
+			}
+			catch (Exception e)
+			{
+				throw new InterpreterException("double: Unkown error", e);
+			}
+		}
 
 		[ManualDocs("write", "{\"title\":\"write(value)\",\"sections\":[{\"header\":\"Syntax\",\"text\":[{\"text\":\"Outputs \"},{\"text\":\"value\",\"color\":\"Green\"},{\"text\":\" to the console, followed by a newline.\"}]}]}")]
 		public static void Write(object obj) => Console.WriteLine(obj);

7Sharp/Utils.cs

@@ -51,9 +51,10 @@ internal static string FormatPascalString(string v)
 
 		internal static void PrintError(Exception e)
 		{
-			if (e is InterpreterException)
+			bool hasInnerException = e.InnerException != null;
+			if (e is InterpreterException || (hasInnerException ? e.InnerException is InterpreterException : false))
 			{
-				ColorConsoleMethods.WriteLineColor($"{e.Message}", ConsoleColor.Red);
+				ColorConsoleMethods.WriteLineColor($"{(hasInnerException ? e.InnerException.Message : e.Message)}", ConsoleColor.Red);
 				return;
 			}
 			ColorConsoleMethods.WriteLineColor($"{e.GetType()}: {e.Message}\n{e.StackTrace}", ConsoleColor.Red);