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

Make end_func the only func ending block

Browse Source
This commit is contained in:
Stone_Red
2026-08-07 01:03:00 +02:00
parent 6bc5d01a2e
commit a5f9c5a178
6 changed files with 93 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/YesNt.Interpreter/Runtime/ExitMessages.cs
+5
View File
@@ -36,6 +36,11 @@ internal static class ExitMessages
return $"Function \"{function}\" not found";
}
internal static string FunctionWithoutEndFunc(string function)
{
return $"Function \"{function}\" has no matching \"end_func\"";
}
internal static string VariableNotFound(string variable)
{
return $"Variable \"{variable}\" not found";
src/YesNt.Interpreter/Statements/FunctionStatements.cs
+22 -3
View File
@@ -10,7 +10,7 @@ namespace YesNt.Interpreter.Statements;
internal class FunctionStatements : StatementRuntimeInformation
{
[Statement("func", SearchMode.StartOfLine, SpaceAround.End, ConsoleColor.DarkYellow, ExecuteInSearchMode = true, Separator = ":")]
[Statement("func", SearchMode.StartOfLine, SpaceAround.End, ConsoleColor.DarkYellow, ExecuteInSearchMode = true, Separator = ":", BlockPair = "end_func")]
public void FindFunction(string args)
{
if (RuntimeInfo.InternalIsInFunction)
@@ -32,7 +32,26 @@ internal class FunctionStatements : StatementRuntimeInformation
RuntimeInfo.SearchFunction = string.Empty;
}
RuntimeInfo.IsInFunction = true;
bool isDefinitionScan = RuntimeInfo.FunctionCallStack.Count == 0
&& string.IsNullOrEmpty(RuntimeInfo.SearchFunction)
&& string.IsNullOrEmpty(RuntimeInfo.SearchLabel);
if (isDefinitionScan)
{
if (RuntimeInfo.BlockBoundaries.TryGetValue(RuntimeInfo.LineNumber, out int endLine) && endLine > RuntimeInfo.LineNumber)
{
RuntimeInfo.IsInFunction = false;
RuntimeInfo.LineNumber = endLine;
}
else
{
RuntimeInfo.Exit(ExitMessages.FunctionWithoutEndFunc(key), true);
}
}
else
{
RuntimeInfo.IsInFunction = true;
}
}
[Statement("push_in", SearchMode.StartOfLine, SpaceAround.End, ConsoleColor.Yellow)]
@@ -126,7 +145,7 @@ internal class FunctionStatements : StatementRuntimeInformation
RuntimeInfo.FunctionCallStack.Peek().Results.Push(args);
}
[Statement("end_func", SearchMode.Exact, SpaceAround.None, ConsoleColor.DarkYellow, ExecuteInSearchMode = true)]
[Statement("end_func", SearchMode.Exact, SpaceAround.None, ConsoleColor.DarkYellow, ExecuteInSearchMode = true, IsBlockEnd = true)]
public void EndFunction(string _)
{
HandleReturn(string.Empty);