diff --git a/YesNt.Interpreter.App/Program.cs b/YesNt.Interpreter.App/Program.cs index f9da080..553cf8a 100644 --- a/YesNt.Interpreter.App/Program.cs +++ b/YesNt.Interpreter.App/Program.cs @@ -1,9 +1,16 @@ using System; +using System.IO; using YesNt.Interpreter.Runtime; if (args.Length == 1) { + if (!File.Exists(args[0])) + { + Console.WriteLine("File not found: " + args[0]); + return; + } + YesNtInterpreter interpreter = new YesNtInterpreter(); interpreter.Execute(args[0]); } diff --git a/YesNt.Interpreter/Runtime/YesNtInterpreter.cs b/YesNt.Interpreter/Runtime/YesNtInterpreter.cs index 2b75594..2707aad 100644 --- a/YesNt.Interpreter/Runtime/YesNtInterpreter.cs +++ b/YesNt.Interpreter/Runtime/YesNtInterpreter.cs @@ -449,18 +449,11 @@ public class YesNtInterpreter if (!File.Exists(path)) { - Console.WriteLine($"File \"{path}\" not found!"); return false; } string[] lines = File.ReadAllLines(path); - if (lines.Length <= 0) - { - Console.WriteLine($"File \"{path}\" is empty!"); - return false; - } - runtimeInfo.WorkingDirectory = Path.GetDirectoryName(path); for (int i = 0; i < lines.Length; i++) diff --git a/YesNt.Interpreter/Statements/SystemStatements.cs b/YesNt.Interpreter/Statements/SystemStatements.cs index 9824bba..3b46cbb 100644 --- a/YesNt.Interpreter/Statements/SystemStatements.cs +++ b/YesNt.Interpreter/Statements/SystemStatements.cs @@ -64,7 +64,7 @@ internal class SystemStatements : StatementRuntimeInformation } } - private static void Process_ErrorDataReceived(Utilities.DataReceivedEventArgs e, Stack outputStack) + private void Process_ErrorDataReceived(Utilities.DataReceivedEventArgs e, Stack outputStack) { if (string.IsNullOrWhiteSpace(e.Data)) { @@ -72,10 +72,10 @@ internal class SystemStatements : StatementRuntimeInformation } outputStack.Push(e.Data.ToSafeString()); - Console.Write("Error: " + e.Data); + RuntimeInfo.Write("Error: " + e.Data); } - private static void Process_OutputDataReceived(Utilities.DataReceivedEventArgs e, Stack outputStack) + private void Process_OutputDataReceived(Utilities.DataReceivedEventArgs e, Stack outputStack) { if (string.IsNullOrWhiteSpace(e.Data)) { @@ -83,7 +83,7 @@ internal class SystemStatements : StatementRuntimeInformation } outputStack.Push(e.Data.ToSafeString()); - Console.Write(e.Data); + RuntimeInfo.Write(e.Data); } private void StartProcess(string name, string args)