Stone_Red/YesNt-Interpreter
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/YesNt-Interpreter.git synced 2026-09-09 16:06:08 +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.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 StopAllTasks { get; private 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 int TaskId => IsTask ? taskId : 0;
public bool InternalIsInFunction { get; set; }
@@ -39,35 +39,9 @@ namespace YesNt.Interpreter.Runtime
set => InternalIsInFunction = value;
}
public Dictionary<string, string> Variables
{
get
{
if (FunctionCallStack.Count == 0)
{
return topVariables;
}
else
{
return FunctionCallStack.Peek().Variables;
}
}
}
public Dictionary<string, string> Variables => FunctionCallStack.Count == 0 ? topVariables : FunctionCallStack.Peek().Variables;
public Dictionary<string, int> Labels
{
get
{
if (FunctionCallStack.Count == 0)
{
return topLabels;
}
else
{
return FunctionCallStack.Peek().Labels;
}
}
}
public Dictionary<string, int> Labels => FunctionCallStack.Count == 0 ? topLabels : FunctionCallStack.Peek().Labels;
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; }
private event Action<string, bool> OnExit;
@@ -98,7 +72,7 @@ namespace YesNt.Interpreter.Runtime
public void WriteLine(string output, bool forceWrite = false)
{
if (Stop && !forceWrite || parentRuntimeInformation?.StopAllTasks == true && !forceWrite)
if ((Stop && !forceWrite) || (parentRuntimeInformation?.StopAllTasks == true && !forceWrite))
{
return;
}
@@ -122,7 +96,7 @@ namespace YesNt.Interpreter.Runtime
public void Write(string output, bool forceWrite = false)
{
if (Stop && !forceWrite || parentRuntimeInformation?.StopAllTasks == true && !forceWrite)
if ((Stop && !forceWrite) || (parentRuntimeInformation?.StopAllTasks == true && !forceWrite))
{
return;
}
@@ -190,7 +164,7 @@ namespace YesNt.Interpreter.Runtime
ParentRuntimeInformation = null;
SearchLabel = string.Empty;
SearchFunction = string.Empty;
CurrentFilePath = string.Empty;
WorkingDirectory = string.Empty;
CurrentLine = string.Empty;
Stop = 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.ErrorDataReceived += Process_ErrorDataReceived;
process.Start();
_ = process.Start();
process.BeginOutputReadLine();
process.BeginErrorReadLine();
process.WaitForExit();
YesNt.Interpreter/Statements/VariableStatements.cs
+2 -2
View File
@@ -72,11 +72,11 @@ namespace YesNt.Interpreter.Statements
if (RuntimeInfo.Variables.ContainsKey(key))
{
RuntimeInfo.Variables.Remove(key);
_ = RuntimeInfo.Variables.Remove(key);
}
else if (RuntimeInfo.GloablVariables.ContainsKey(key))
{
RuntimeInfo.GloablVariables.Remove(key);
_ = RuntimeInfo.GloablVariables.Remove(key);
}
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 succ2 = parts[1].ToStandardizedNumber(out double part2);
if (!succ1 || !succ2)
{
return false;
}
return part1 >= part2;
return succ1 && succ2 && part1 >= part2;
}
parts = input.Split("<=");
@@ -51,12 +46,7 @@ namespace YesNt.Interpreter.Utilities
{
bool succ1 = parts[0].ToStandardizedNumber(out double part1);
bool succ2 = parts[1].ToStandardizedNumber(out double part2);
if (!succ1 || !succ2)
{
return false;
}
return part1 <= part2;
return succ1 && succ2 && part1 <= part2;
}
parts = input.Split(">");
@@ -64,12 +54,7 @@ namespace YesNt.Interpreter.Utilities
{
bool succ1 = parts[0].ToStandardizedNumber(out double part1);
bool succ2 = parts[1].ToStandardizedNumber(out double part2);
if (!succ1 || !succ2)
{
return false;
}
return part1 > part2;
return succ1 && succ2 && part1 > part2;
}
parts = input.Split("<");
@@ -77,12 +62,7 @@ namespace YesNt.Interpreter.Utilities
{
bool succ1 = parts[0].ToStandardizedNumber(out double part1);
bool succ2 = parts[1].ToStandardizedNumber(out double part2);
if (!succ1 || !succ2)
{
return false;
}
return part1 < part2;
return succ1 && succ2 && part1 < part2;
}
return null;
YesNt.Interpreter/Utilities/FixedProcess.cs
+9 -9
View File
@@ -42,7 +42,7 @@ namespace YesNt.Interpreter.Utilities
DataReceivedEventArgs dataReceivedEventArgs = new DataReceivedEventArgs(data);
if (SynchronizingObject != null && SynchronizingObject.InvokeRequired)
{
SynchronizingObject.Invoke(outputDataReceived, new object[]
_ = SynchronizingObject.Invoke(outputDataReceived, new object[]
{
this,
dataReceivedEventArgs
@@ -61,7 +61,7 @@ namespace YesNt.Interpreter.Utilities
DataReceivedEventArgs dataReceivedEventArgs = new DataReceivedEventArgs(data);
if (SynchronizingObject != null && SynchronizingObject.InvokeRequired)
{
SynchronizingObject.Invoke(errorDataReceived, new object[]
_ = SynchronizingObject.Invoke(errorDataReceived, new object[]
{
this,
dataReceivedEventArgs
@@ -160,7 +160,7 @@ namespace YesNt.Interpreter.Utilities
if (sb == null)
{
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;
}
FlushMessageQueue();
@@ -204,13 +204,13 @@ namespace YesNt.Interpreter.Utilities
}
finally
{
eofEvent.Set();
_ = eofEvent.Set();
}
}
int chars = decoder.GetChars(byteBuffer, 0, num, charBuffer, 0);
sb.Append(charBuffer, 0, chars);
_ = sb.Append(charBuffer, 0, chars);
GetLinesFromStringBuilder();
stream.BeginRead(byteBuffer, 0, byteBuffer.Length, new AsyncCallback(ReadBuffer), null);
_ = stream.BeginRead(byteBuffer, 0, byteBuffer.Length, new AsyncCallback(ReadBuffer), null);
}
private void GetLinesFromStringBuilder()
@@ -227,7 +227,7 @@ namespace YesNt.Interpreter.Utilities
while (i < length)
{
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')
{
@@ -261,7 +261,7 @@ namespace YesNt.Interpreter.Utilities
}
if (num < length)
{
sb.Remove(0, num);
_ = sb.Remove(0, num);
}
else
{
@@ -292,7 +292,7 @@ namespace YesNt.Interpreter.Utilities
{
if (eofEvent != null)
{
eofEvent.WaitOne();
_ = eofEvent.WaitOne();
eofEvent.Close();
eofEvent = null;
}
YesNt.Interpreter/Utilities/StringExtentions.cs
+1 -1
View File
@@ -11,7 +11,7 @@ namespace YesNt.Interpreter.Utilities
StringBuilder output = new StringBuilder();
foreach (char c in input)
{
output.Append($"\v{c}\v");
_ = output.Append($"\v{c}\v");
}
return output.ToString();
}