ninemine/RScript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复NamedSpaceRunner的遗漏

Browse Source
This commit is contained in:
LiuBai095
2025-10-16 17:23:37 +08:00
parent 15bdb6f8db
commit 97a6e4d76b
4 changed files with 84 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
DoRunner/EnterNamedSpaceRunner.cs Normal file
View File

@@ -0,0 +1,15 @@
using Convention.RScript.Parser;
using System.Diagnostics.CodeAnalysis;
namespace Convention.RScript.Runner
{
public class EnterNamedSpaceRunner : IRSentenceRunner
{
[return: MaybeNull]
public object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
{
context.CurrentRuntimePointer = context.NamespaceLayer[context.NamespaceLabels[sentence.content]];
return null;
}
}
}

43
DoRunner/JumpRuntimePointerRunner.cs
View File

@@ -5,29 +5,56 @@ namespace Convention.RScript.Runner
{
public abstract class JumpRuntimePointerRunner : IRSentenceRunner
{
protected void DoJumpRuntimePointer(ExpressionParser parser, int target, RScriptContext context)
protected static void DoJumpRuntimePointer(ExpressionParser parser, int target, RScriptContext context)
{
bool isForwardMove = target > context.CurrentRuntimePointer;
int step = isForwardMove ? 1 : -1;
int insLayer = 0;
for (; context.CurrentRuntimePointer != target; context.CurrentRuntimePointer += step)
{
if (context.CurrentSentence.mode == RScriptSentence.Mode.ExitNamespace)
{
if (isForwardMove)
//DoExitNamespace(parser);
context.SentenceRunners[RScriptSentence.Mode.ExitNamespace].Run(parser, context.CurrentSentence, context);
{
if (insLayer > 0)
insLayer--;
else
{
for (int disLayer = -insLayer; disLayer > 0; disLayer--)
context.SentenceRunners[RScriptSentence.Mode.ExitNamespace].Run(parser, context.CurrentSentence, context);
}
}
else
//DoEnterNamespace(parser);
context.SentenceRunners[RScriptSentence.Mode.EnterNamespace].Run(parser, context.CurrentSentence, context);
insLayer++;
}
else if (context.CurrentSentence.mode == RScriptSentence.Mode.EnterNamespace)
{
if (isForwardMove)
//DoEnterNamespace(parser);
context.SentenceRunners[RScriptSentence.Mode.EnterNamespace].Run(parser, context.CurrentSentence, context);
insLayer++;
else
//DoExitNamespace(parser);
{
if (insLayer > 0)
insLayer--;
else
{
for (int disLayer = -insLayer; disLayer > 0; disLayer--)
context.SentenceRunners[RScriptSentence.Mode.ExitNamespace].Run(parser, context.CurrentSentence, context);
}
}
}
if (insLayer > 0)
{
for (; insLayer > 0; insLayer--)
{
context.SentenceRunners[RScriptSentence.Mode.EnterNamespace].Run(parser, context.CurrentSentence, context);
}
}
else if (insLayer < 0)
{
for (; insLayer < 0; insLayer++)
{
context.SentenceRunners[RScriptSentence.Mode.ExitNamespace].Run(parser, context.CurrentSentence, context);
}
}
}
}