ninemine/Convention-CSharp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EP RScript 修复因跳跃导致的变量层次混乱

Browse Source
This commit is contained in:
LiuBai095
2025-10-11 17:24:40 +08:00
parent f850030d10
commit bacfcd550f
8 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Convention/[RScript]/Matcher/BackMatcher.cs
View File

@@ -6,11 +6,11 @@ namespace Convention.RScript.Matcher
{
public bool Match(string expression, ref RScriptSentence sentence)
{
Regex LabelRegex = new(@"^back\s*\(\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*\)$");
Regex LabelRegex = new(@"back\s*\(\s*(.+)\s*\)");
var LabelMatch = LabelRegex.Match(expression);
if (LabelMatch.Success)
{
sentence.mode = RScriptSentence.Mode.Label;
sentence.mode = RScriptSentence.Mode.Backpoint;
sentence.content = LabelMatch.Groups[1].Value;
return true;
}

4
Convention/[RScript]/Matcher/BreakMatcher.cs
View File

@@ -6,11 +6,11 @@ namespace Convention.RScript.Matcher
{
public bool Match(string expression, ref RScriptSentence sentence)
{
Regex LabelRegex = new(@"^break\(\s*(.+)\s*\)$");
Regex LabelRegex = new(@"break\s*\(\s*(.+)\s*\)");
var LabelMatch = LabelRegex.Match(expression);
if (LabelMatch.Success)
{
sentence.mode = RScriptSentence.Mode.Label;
sentence.mode = RScriptSentence.Mode.Breakpoint;
sentence.content = LabelMatch.Groups[1].Value;
return true;
}

2
Convention/[RScript]/Matcher/DefineVariableMatcher.cs
View File

@@ -6,7 +6,7 @@ namespace Convention.RScript.Matcher
{
public bool Match(string expression, ref RScriptSentence sentence)
{
Regex DefineVariableRegex = new(@"^(string|int|double|float|bool|var)\s+([a-zA-Z_][a-zA-Z0-9_]*)$");
Regex DefineVariableRegex = new(@"(string|int|double|float|bool|var)\s+([a-zA-Z_][a-zA-Z0-9_]*)");
var DefineVariableMatch = DefineVariableRegex.Match(expression);
if (DefineVariableMatch.Success)
{

2
Convention/[RScript]/Matcher/GotoMatcher.cs
View File

@@ -7,7 +7,7 @@ namespace Convention.RScript.Matcher
public bool Match(string expression, ref RScriptSentence sentence)
{
Regex GotoRegex = new(@"^goto\s*\(\s*(.+)\s*,\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*\)$");
Regex GotoRegex = new(@"goto\s*\(\s*(.+)\s*,\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*\)");
var GotoMatch = GotoRegex.Match(expression);
if (GotoMatch.Success)
{

2
Convention/[RScript]/Matcher/LabelMatcher.cs
View File

@@ -6,7 +6,7 @@ namespace Convention.RScript.Matcher
{
public bool Match(string expression, ref RScriptSentence sentence)
{
Regex LabelRegex = new(@"^label\s*\(\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*\)$");
Regex LabelRegex = new(@"label\s*\(\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*\)");
var LabelMatch = LabelRegex.Match(expression);
if (LabelMatch.Success)
{