Stone_Red/YesNt-Interpreter
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/YesNt-Interpreter.git synced 2026-09-04 09:06:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve code formatting

Browse Source
This commit is contained in:
Stone_Red
2022-11-17 11:40:51 +01:00
parent 533ad23c4d
commit 1ced6f393c
11 changed files with 39 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YesNt.CodeEditor/Editor.cs
+2 -9
View File
@@ -23,7 +23,7 @@ namespace YesNt.CodeEditor
{ {
if (File.Exists(path)) if (File.Exists(path))
{ {
Load(path); _ = Load(path);
} }
} }
@@ -131,14 +131,7 @@ namespace YesNt.CodeEditor
if (CurrentPath.Trim() != path.Trim() && loadIfExists) if (CurrentPath.Trim() != path.Trim() && loadIfExists)
{ {
if (Load(path)) return Load(path);
{
return true;
}
else
{
return false;
}
} }
if (string.IsNullOrEmpty(Path.GetExtension(path))) if (string.IsNullOrEmpty(Path.GetExtension(path)))
{ {
YesNt.CodeEditor/InputHandler.cs
+9 -16
View File
@@ -16,7 +16,7 @@ namespace YesNt.CodeEditor
{ {
while (Console.KeyAvailable) while (Console.KeyAvailable)
{ {
Console.ReadKey(true); _ = Console.ReadKey(true);
} }
if (textEditor.EditMode == Mode.Edit) if (textEditor.EditMode == Mode.Edit)
{ {
@@ -50,14 +50,7 @@ namespace YesNt.CodeEditor
return true; return true;
case ConsoleKey.E: case ConsoleKey.E:
if (textEditor.Lines.Count > textEditor.CursorPosition.Y) textEditor.CursorPosition.X = textEditor.Lines.Count > textEditor.CursorPosition.Y ? textEditor.Lines[textEditor.CursorPosition.Y].TrimEnd().Length : 0;
{
textEditor.CursorPosition.X = textEditor.Lines[textEditor.CursorPosition.Y].TrimEnd().Length;
}
else
{
textEditor.CursorPosition.X = 0;
}
return true; return true;
} }
} }
@@ -128,7 +121,7 @@ namespace YesNt.CodeEditor
StringBuilder lineBuilder = new StringBuilder(textEditor.Lines[textEditor.CursorPosition.Y]); StringBuilder lineBuilder = new StringBuilder(textEditor.Lines[textEditor.CursorPosition.Y]);
while (lineBuilder.Length <= textEditor.CursorPosition.X) while (lineBuilder.Length <= textEditor.CursorPosition.X)
{ {
lineBuilder.Append(' '); _ = lineBuilder.Append(' ');
} }
textEditor.Lines[textEditor.CursorPosition.Y] = lineBuilder.ToString(); textEditor.Lines[textEditor.CursorPosition.Y] = lineBuilder.ToString();
@@ -228,7 +221,7 @@ namespace YesNt.CodeEditor
break; break;
case "save": case "save":
textEditor.Save(input, false); _ = textEditor.Save(input, false);
break; break;
case "run": case "run":
@@ -240,9 +233,9 @@ namespace YesNt.CodeEditor
textEditor.YesNtInterpreter.Execute(textEditor.CurrentPath); textEditor.YesNtInterpreter.Execute(textEditor.CurrentPath);
while (Console.KeyAvailable) while (Console.KeyAvailable)
{ {
Console.ReadKey(true); _ = Console.ReadKey(true);
} }
Console.ReadKey(); _ = Console.ReadKey();
WriteStatus(string.Empty); WriteStatus(string.Empty);
textEditor.EditMode = Mode.Command; textEditor.EditMode = Mode.Command;
} }
@@ -257,9 +250,9 @@ namespace YesNt.CodeEditor
textEditor.YesNtInterpreter.Execute(textEditor.CurrentPath, true); textEditor.YesNtInterpreter.Execute(textEditor.CurrentPath, true);
while (Console.KeyAvailable) while (Console.KeyAvailable)
{ {
Console.ReadKey(true); _ = Console.ReadKey(true);
} }
Console.ReadKey(); _ = Console.ReadKey();
WriteStatus(string.Empty); WriteStatus(string.Empty);
textEditor.EditMode = Mode.Command; textEditor.EditMode = Mode.Command;
} }
@@ -278,7 +271,7 @@ namespace YesNt.CodeEditor
try try
{ {
textEditor.Load(path); _ = textEditor.Load(path);
} }
catch (Exception ex) catch (Exception ex)
{ {
YesNt.CodeEditor/Program.cs
+1 -11
View File
@@ -4,17 +4,7 @@
{ {
private static void Main(string[] args) private static void Main(string[] args)
{ {
TextEditor textEditor; TextEditor textEditor = args.Length > 0 ? new TextEditor(args[0]) : new TextEditor();
if (args.Length > 0)
{
textEditor = new TextEditor(args[0]);
}
else
{
textEditor = new TextEditor();
}
textEditor.Run(); textEditor.Run();
} }
} }
YesNt.Interpreter.Tests/CodeFowTests.cs
+1 -1
View File
@@ -39,6 +39,6 @@ public class CodeFlowTests
public void CalculationsTest() public void CalculationsTest()
{ {
Assert.Inconclusive(); Assert.Inconclusive();
YesNtAssert.IsLineEqual("10 * 10 !calc", (20).ToString()); YesNtAssert.IsLineEqual("10 * 10 !calc", 20.ToString());
} }
} }
YesNt.Interpreter.Tests/YesNtAssert.cs
+2 -2
View File
@@ -28,7 +28,7 @@ internal static class YesNtAssert
if (er is null) if (er is null)
{ {
onDone.Set(); _ = onDone.Set();
} }
}; };
@@ -51,7 +51,7 @@ internal static class YesNtAssert
yesNtInterpreter.OnLineExecuted += (er) => yesNtInterpreter.OnLineExecuted += (er) =>
{ {
debugEventArgs = er ?? debugEventArgs; debugEventArgs = er ?? debugEventArgs;
onDone.Set(); _ = onDone.Set();
}; };
yesNtInterpreter.Execute(lines, true); yesNtInterpreter.Execute(lines, true);
YesNt.Interpreter/Runtime/RuntimeInformation.cs
+7 -33
View File
@@ -28,7 +28,7 @@ namespace YesNt.Interpreter.Runtime
public bool Stop { get; private set; } = false; public bool Stop { get; private set; } = false;
public bool StopAllTasks { get; private set; } = false; public bool StopAllTasks { get; private set; } = false;
public bool IsDebugMode { get; set; } = false; public bool IsDebugMode { get; set; } = false;
public string CurrentFilePath { get; set; } = string.Empty; public string WorkingDirectory { get; set; } = string.Empty;
public bool IsTask => ParentRuntimeInformation is not null; public bool IsTask => ParentRuntimeInformation is not null;
public int TaskId => IsTask ? taskId : 0; public int TaskId => IsTask ? taskId : 0;
public bool InternalIsInFunction { get; set; } public bool InternalIsInFunction { get; set; }
@@ -39,35 +39,9 @@ namespace YesNt.Interpreter.Runtime
set => InternalIsInFunction = value; set => InternalIsInFunction = value;
} }
public Dictionary<string, string> Variables public Dictionary<string, string> Variables => FunctionCallStack.Count == 0 ? topVariables : FunctionCallStack.Peek().Variables;
{
get
{
if (FunctionCallStack.Count == 0)
{
return topVariables;
}
else
{
return FunctionCallStack.Peek().Variables;
}
}
}
public Dictionary<string, int> Labels public Dictionary<string, int> Labels => FunctionCallStack.Count == 0 ? topLabels : FunctionCallStack.Peek().Labels;
{
get
{
if (FunctionCallStack.Count == 0)
{
return topLabels;
}
else
{
return FunctionCallStack.Peek().Labels;
}
}
}
public RuntimeInformation ParentRuntimeInformation public RuntimeInformation ParentRuntimeInformation
{ {
@@ -82,7 +56,7 @@ namespace YesNt.Interpreter.Runtime
} }
} }
public bool IsSearching => !string.IsNullOrWhiteSpace(SearchLabel + SearchFunction) || IsInFunction && FunctionCallStack.Count == 0; public bool IsSearching => !string.IsNullOrWhiteSpace(SearchLabel + SearchFunction) || (IsInFunction && FunctionCallStack.Count == 0);
public bool IsLocalSearch { get; set; } public bool IsLocalSearch { get; set; }
private event Action<string, bool> OnExit; private event Action<string, bool> OnExit;
@@ -98,7 +72,7 @@ namespace YesNt.Interpreter.Runtime
public void WriteLine(string output, bool forceWrite = false) public void WriteLine(string output, bool forceWrite = false)
{ {
if (Stop && !forceWrite || parentRuntimeInformation?.StopAllTasks == true && !forceWrite) if ((Stop && !forceWrite) || (parentRuntimeInformation?.StopAllTasks == true && !forceWrite))
{ {
return; return;
} }
@@ -122,7 +96,7 @@ namespace YesNt.Interpreter.Runtime
public void Write(string output, bool forceWrite = false) public void Write(string output, bool forceWrite = false)
{ {
if (Stop && !forceWrite || parentRuntimeInformation?.StopAllTasks == true && !forceWrite) if ((Stop && !forceWrite) || (parentRuntimeInformation?.StopAllTasks == true && !forceWrite))
{ {
return; return;
} }
@@ -190,7 +164,7 @@ namespace YesNt.Interpreter.Runtime
ParentRuntimeInformation = null; ParentRuntimeInformation = null;
SearchLabel = string.Empty; SearchLabel = string.Empty;
SearchFunction = string.Empty; SearchFunction = string.Empty;
CurrentFilePath = string.Empty; WorkingDirectory = string.Empty;
CurrentLine = string.Empty; CurrentLine = string.Empty;
Stop = false; Stop = false;
StopAllTasks = false; StopAllTasks = false;
YesNt.Interpreter/Statements/SystemStatements.cs
+1 -1
View File
@@ -76,7 +76,7 @@ namespace YesNt.Interpreter.Statements
process.OutputDataReceived += Process_OutputDataReceived; process.OutputDataReceived += Process_OutputDataReceived;
process.ErrorDataReceived += Process_ErrorDataReceived; process.ErrorDataReceived += Process_ErrorDataReceived;
process.Start(); _ = process.Start();
process.BeginOutputReadLine(); process.BeginOutputReadLine();
process.BeginErrorReadLine(); process.BeginErrorReadLine();
process.WaitForExit(); process.WaitForExit();
YesNt.Interpreter/Statements/VariableStatements.cs
+2 -2
View File
@@ -72,11 +72,11 @@ namespace YesNt.Interpreter.Statements
if (RuntimeInfo.Variables.ContainsKey(key)) if (RuntimeInfo.Variables.ContainsKey(key))
{ {
RuntimeInfo.Variables.Remove(key); _ = RuntimeInfo.Variables.Remove(key);
} }
else if (RuntimeInfo.GloablVariables.ContainsKey(key)) else if (RuntimeInfo.GloablVariables.ContainsKey(key))
{ {
RuntimeInfo.GloablVariables.Remove(key); _ = RuntimeInfo.GloablVariables.Remove(key);
} }
else else
{ {
YesNt.Interpreter/Utilities/Evaluator.cs
+4 -24
View File
@@ -38,12 +38,7 @@ namespace YesNt.Interpreter.Utilities
{ {
bool succ1 = parts[0].ToStandardizedNumber(out double part1); bool succ1 = parts[0].ToStandardizedNumber(out double part1);
bool succ2 = parts[1].ToStandardizedNumber(out double part2); bool succ2 = parts[1].ToStandardizedNumber(out double part2);
if (!succ1 || !succ2) return succ1 && succ2 && part1 >= part2;
{
return false;
}
return part1 >= part2;
} }
parts = input.Split("<="); parts = input.Split("<=");
@@ -51,12 +46,7 @@ namespace YesNt.Interpreter.Utilities
{ {
bool succ1 = parts[0].ToStandardizedNumber(out double part1); bool succ1 = parts[0].ToStandardizedNumber(out double part1);
bool succ2 = parts[1].ToStandardizedNumber(out double part2); bool succ2 = parts[1].ToStandardizedNumber(out double part2);
if (!succ1 || !succ2) return succ1 && succ2 && part1 <= part2;
{
return false;
}
return part1 <= part2;
} }
parts = input.Split(">"); parts = input.Split(">");
@@ -64,12 +54,7 @@ namespace YesNt.Interpreter.Utilities
{ {
bool succ1 = parts[0].ToStandardizedNumber(out double part1); bool succ1 = parts[0].ToStandardizedNumber(out double part1);
bool succ2 = parts[1].ToStandardizedNumber(out double part2); bool succ2 = parts[1].ToStandardizedNumber(out double part2);
if (!succ1 || !succ2) return succ1 && succ2 && part1 > part2;
{
return false;
}
return part1 > part2;
} }
parts = input.Split("<"); parts = input.Split("<");
@@ -77,12 +62,7 @@ namespace YesNt.Interpreter.Utilities
{ {
bool succ1 = parts[0].ToStandardizedNumber(out double part1); bool succ1 = parts[0].ToStandardizedNumber(out double part1);
bool succ2 = parts[1].ToStandardizedNumber(out double part2); bool succ2 = parts[1].ToStandardizedNumber(out double part2);
if (!succ1 || !succ2) return succ1 && succ2 && part1 < part2;
{
return false;
}
return part1 < part2;
} }
return null; return null;
YesNt.Interpreter/Utilities/FixedProcess.cs
+9 -9
View File
@@ -42,7 +42,7 @@ namespace YesNt.Interpreter.Utilities
DataReceivedEventArgs dataReceivedEventArgs = new DataReceivedEventArgs(data); DataReceivedEventArgs dataReceivedEventArgs = new DataReceivedEventArgs(data);
if (SynchronizingObject != null && SynchronizingObject.InvokeRequired) if (SynchronizingObject != null && SynchronizingObject.InvokeRequired)
{ {
SynchronizingObject.Invoke(outputDataReceived, new object[] _ = SynchronizingObject.Invoke(outputDataReceived, new object[]
{ {
this, this,
dataReceivedEventArgs dataReceivedEventArgs
@@ -61,7 +61,7 @@ namespace YesNt.Interpreter.Utilities
DataReceivedEventArgs dataReceivedEventArgs = new DataReceivedEventArgs(data); DataReceivedEventArgs dataReceivedEventArgs = new DataReceivedEventArgs(data);
if (SynchronizingObject != null && SynchronizingObject.InvokeRequired) if (SynchronizingObject != null && SynchronizingObject.InvokeRequired)
{ {
SynchronizingObject.Invoke(errorDataReceived, new object[] _ = SynchronizingObject.Invoke(errorDataReceived, new object[]
{ {
this, this,
dataReceivedEventArgs dataReceivedEventArgs
@@ -160,7 +160,7 @@ namespace YesNt.Interpreter.Utilities
if (sb == null) if (sb == null)
{ {
sb = new StringBuilder(1024); sb = new StringBuilder(1024);
stream.BeginRead(byteBuffer, 0, byteBuffer.Length, new AsyncCallback(ReadBuffer), null); _ = stream.BeginRead(byteBuffer, 0, byteBuffer.Length, new AsyncCallback(ReadBuffer), null);
return; return;
} }
FlushMessageQueue(); FlushMessageQueue();
@@ -204,13 +204,13 @@ namespace YesNt.Interpreter.Utilities
} }
finally finally
{ {
eofEvent.Set(); _ = eofEvent.Set();
} }
} }
int chars = decoder.GetChars(byteBuffer, 0, num, charBuffer, 0); int chars = decoder.GetChars(byteBuffer, 0, num, charBuffer, 0);
sb.Append(charBuffer, 0, chars); _ = sb.Append(charBuffer, 0, chars);
GetLinesFromStringBuilder(); GetLinesFromStringBuilder();
stream.BeginRead(byteBuffer, 0, byteBuffer.Length, new AsyncCallback(ReadBuffer), null); _ = stream.BeginRead(byteBuffer, 0, byteBuffer.Length, new AsyncCallback(ReadBuffer), null);
} }
private void GetLinesFromStringBuilder() private void GetLinesFromStringBuilder()
@@ -227,7 +227,7 @@ namespace YesNt.Interpreter.Utilities
while (i < length) while (i < length)
{ {
char c = sb[i]; char c = sb[i];
if (c == '\r' || c == '\n') if (c is '\r' or '\n')
{ {
if (c == '\r' && i + 1 < length && sb[i + 1] == '\n') if (c == '\r' && i + 1 < length && sb[i + 1] == '\n')
{ {
@@ -261,7 +261,7 @@ namespace YesNt.Interpreter.Utilities
} }
if (num < length) if (num < length)
{ {
sb.Remove(0, num); _ = sb.Remove(0, num);
} }
else else
{ {
@@ -292,7 +292,7 @@ namespace YesNt.Interpreter.Utilities
{ {
if (eofEvent != null) if (eofEvent != null)
{ {
eofEvent.WaitOne(); _ = eofEvent.WaitOne();
eofEvent.Close(); eofEvent.Close();
eofEvent = null; eofEvent = null;
} }
YesNt.Interpreter/Utilities/StringExtentions.cs
+1 -1
View File
@@ -11,7 +11,7 @@ namespace YesNt.Interpreter.Utilities
StringBuilder output = new StringBuilder(); StringBuilder output = new StringBuilder();
foreach (char c in input) foreach (char c in input)
{ {
output.Append($"\v{c}\v"); _ = output.Append($"\v{c}\v");
} }
return output.ToString(); return output.ToString();
} }