youmuliu/stgsharp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add COUNT and CONCAT ir emitter

Browse Source
This commit is contained in:
Youmu Liu
2026-06-17 18:32:55 +08:00
parent a7bb3209dd
commit 5570c6f338
6 changed files with 409 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
StgSharp.RegularAnalysis/TextRegex/RegexElementLabel.cs
+1
View File
@@ -49,6 +49,7 @@ namespace StgSharp.RegularAnalysis.TextRegex
SEQUENCE = UNIT | UNIT_SPAN | UNIT_SET,
SINGLE = UNIT | UNIT_SET,
OPERATOR = COUNT | ALT | CONCAT,
VAST_OPERATOR = OPERATOR | GROUP_BEGIN,
ATOM_BEGIN = SEQUENCE | GROUP_BEGIN ,
ATOM_END = SEQUENCE | GROUP_END | COUNT,
StgSharp.RegularAnalysis/TextRegex/RegexIR.cs
+66 -49
View File
@@ -28,6 +28,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
@@ -36,12 +37,16 @@ namespace StgSharp.RegularAnalysis.TextRegex
internal enum RegexIRCommand
{
Search = 0,
Jump = 1,
Condition = 2,
Count = 3,
Try = 4,
Pop = 5,
Search_Seq = 0,
Search_Set = 1,
SearchChar = 2,
Jump = 3,
Condition = 4,
Try = 5,
Pop = 6,
Count = 7,
Count_Seq = 8,
Count_Set = 9
}
@@ -50,28 +55,6 @@ namespace StgSharp.RegularAnalysis.TextRegex
internal abstract RegexIRCommand Command { get; }
public static RegexIR Condition(
int success,
int fail
)
{
return new RegexConditionIR(success, fail);
}
public static RegexIR PopLevel(
bool isSuccess
)
{
return new RegexPopIR(isSuccess);
}
public static RegexIR Try(
int count
)
{
return new RegexTryIR(count);
}
internal abstract void Execute();
}
@@ -95,14 +78,14 @@ namespace StgSharp.RegularAnalysis.TextRegex
/// <summary>
/// Searches for a certain string pattern or charset from current position.
/// </summary>
internal sealed class RegexSearchStringIR(
internal sealed class RegexSearchSeqIR(
string pattern
) : RegexIR
{
public string Pattern { get; } = pattern;
internal override RegexIRCommand Command => RegexIRCommand.Search;
internal override RegexIRCommand Command => RegexIRCommand.Search_Seq;
internal override void Execute()
{
@@ -111,30 +94,14 @@ namespace StgSharp.RegularAnalysis.TextRegex
}
internal sealed class RegexSearchCharsetIR(
internal sealed class RegexMatchSetIR(
string charset
) : RegexIR
{
public string Charset { get; } = charset;
internal override RegexIRCommand Command => RegexIRCommand.Search;
internal override void Execute()
{
throw new NotImplementedException();
}
}
internal sealed class RegexSearchCharSetIR(
string c
) : RegexIR
{
public string Target { get; } = c;
internal override RegexIRCommand Command => RegexIRCommand.Search;
internal override RegexIRCommand Command => RegexIRCommand.Search_Set;
internal override void Execute()
{
@@ -200,7 +167,57 @@ namespace StgSharp.RegularAnalysis.TextRegex
public int OperationIndex { get; } = operation;
internal override RegexIRCommand Command => throw new NotImplementedException();
internal override RegexIRCommand Command { get; } = RegexIRCommand.Count;
internal override void Execute()
{
throw new NotImplementedException();
}
}
internal sealed class RegexCountSeqIR(
int min,
int max,
bool isGreedy,
string seq
) : RegexIR
{
public bool IsGreedy { get; } = isGreedy;
public int Min { get; } = min;
public int Max { get; } = max;
public string Sequence { get; } = seq;
internal override RegexIRCommand Command { get; } = RegexIRCommand.Count_Seq;
internal override void Execute()
{
throw new NotImplementedException();
}
}
internal sealed class RegexCountSetIR(
int min,
int max,
bool isGreedy,
string set
) : RegexIR
{
public bool IsGreedy { get; } = isGreedy;
public int Min { get; } = min;
public int Max { get; } = max;
public string CharSet { get; } = set;
internal override RegexIRCommand Command => RegexIRCommand.Count_Set;
internal override void Execute()
{
StgSharp.RegularAnalysis/TextRegex/RegexIRGenerator.cs
+168
View File
@@ -0,0 +1,168 @@
//-----------------------------------------------------------------------
// -----------------------------------------------------------------------
// file="RegexIRGenerator"
// Project: StgSharp
// AuthorGroup: Nitload
// Copyright (c) Nitload. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
namespace StgSharp.RegularAnalysis.TextRegex
{
internal class RegexIRGenerator
{
private Node _head = new();
private Node _tail;
public RegexIRGenerator()
{
_tail = _head;
}
public int Count { get; private set; }
public void EmitCondition(
int success,
int fail
)
{
_tail.Add(new RegexConditionIR(success, fail));
Count++;
}
public void EmitCount(
int min,
int max,
bool isGreedy,
int operation
)
{
_tail.Add(new RegexCountIR(min, max, isGreedy, operation));
Count++;
}
public void EmitCountSeq(
int min,
int max,
bool isGreedy,
string seq
)
{
_tail.Add(new RegexCountSeqIR(min, max, isGreedy, seq));
Count++;
}
public void EmitCountSet(
int min,
int max,
bool isGreedy,
string set
)
{
_tail.Add(new RegexCountSetIR(min, max, isGreedy, set));
Count++;
}
public void EmitIRStream(
RegexIRGenerator stream
)
{
if (stream is null || stream.Count == 0) {
return;
}
_tail.Next = stream._head;
_tail = stream._tail;
Count += stream.Count;
}
public void EmitMatchSet(
string unit
)
{
_tail.Add(new RegexMatchSetIR(unit));
Count++;
}
public void EmitMatchSeq(
string unit
)
{
_tail.Add(new RegexMatchSeqIR(unit));
Count++;
}
public void EmitPopLevel(
bool isSuccess
)
{
_tail.Add(new RegexPopIR(isSuccess));
Count++;
}
public void EmitTry(
int count
)
{
_tail.Add(new RegexTryIR(count));
Count++;
}
public List<RegexIR> ToList()
{
List<RegexIR> result = new(Count);
Node current = _head;
while (current != null)
{
result.AddRange(current.IRList);
current = current.Next!;
}
return result;
}
private class Node
{
public Node? Next { get; set; }
public int Count => IRList.Count;
public List<RegexIR> IRList { get; } = [];
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Add(
RegexIR ir
)
{
IRList.Add(ir);
}
}
}
}
StgSharp.RegularAnalysis/TextRegex/RegexInterpreter.IRGenerate.cs
+172 -30
View File
@@ -28,8 +28,12 @@
using StgSharp.RegularAnalysis.Abstraction;
using System;
using System.Collections.Generic;
using System.ComponentModel.Design;
using System.Data;
using System.Diagnostics.Metrics;
using System.Linq;
using System.Reflection.Emit;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
using System.Xml;
@@ -45,27 +49,68 @@ namespace StgSharp.RegularAnalysis.TextRegex
AbstractSyntaxTree<RegexAstNode, RegexElementLabel> tree
)
{
return GenerateIRRecursion(tree.Root, 0);
return GenerateIRRecursion(tree.Root, 0).ToList();
}
private List<RegexIR> GenerateIRRecursion(
RegexAstNode node,
int depth
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private void EmitCount(
int curDepth,
RegexIRGenerator ir,
int min,
int max,
bool isGreedy,
RegexAstNode right
)
{
if (depth > 1024) {
bool isRightOperator = !RegexAstNode.IsNullOrEmpty(right) &&
(right.Source.Flag & RegexElementLabel.OPERATOR) != 0;
if (isRightOperator) // seq to be count is complex
{
ir.EmitCount(min, max, isGreedy, 1);
RegexIRGenerator rightIR = GenerateIRRecursion(right, curDepth + 1);
ir.EmitTry(rightIR.Count);
ir.EmitIRStream(rightIR);
} else
{
RegexElementLabel count_source_mask = right.Source.Flag;
switch (count_source_mask)
{
case RegexElementLabel.UNIT:
ir.EmitCountSeq(min, max, isGreedy, right.Source.Value);
break;
case RegexElementLabel.UNIT_SET:
ir.EmitCountSet(min, max, isGreedy, right.Source.Value);
break;
case RegexElementLabel.UNIT_SPAN:
ir.EmitCountSet(min, max, isGreedy, right.Source.Value);
break;
default:
throw new InvalidOperationException($"Unexpected regex element type for count operator: {count_source_mask}");
}
}
}
private RegexIRGenerator GenerateIRRecursion(
RegexAstNode node,
int depth
)
{
#pragma warning disable IDE0010
if (depth > 1024)
{
throw new OverflowException("Regex parse exceeds maximum recursion depth");
}
int curDepth = depth;
RegexAstNode left = node.Left;
RegexAstNode right = node.Right;
List<RegexIR> leftIR = EmptyIR;
List<RegexIR> rightIR = EmptyIR;
RegexIRGenerator leftIR;
RegexIRGenerator rightIR;
bool isLeftOperator = !RegexAstNode.IsNullOrEmpty(left) &&
(left.Source.Flag & RegexElementLabel.OPERATOR) != 0;
(left.Source.Flag & RegexElementLabel.VAST_OPERATOR) != 0;
bool isRightOperator = !RegexAstNode.IsNullOrEmpty(right) &&
(right.Source.Flag & RegexElementLabel.OPERATOR) != 0;
(right.Source.Flag & RegexElementLabel.VAST_OPERATOR) != 0;
Token<RegexElementLabel> token = node.Source;
@@ -73,30 +118,127 @@ namespace StgSharp.RegularAnalysis.TextRegex
{
case RegexElementLabel.GROUP_BEGIN:
string group_source = token.Value;
bool is_group = group_source.Length == 1;
string group_name = group_source.StartsWith(@"(?<", StringComparison.Ordinal) ?
group_source[3..^2] :
string.Empty;
List<RegexIR> groupIR = [];
// process group type
bool is_group = group_source.Length == 1; // simple group: (pattern)
string group_name =
group_source.StartsWith(@"(?<", StringComparison.Ordinal) ?
group_source[3..^2] : /* named group (?<name>) */
string.Empty; /* unnamed group (?:) */
RegexIRGenerator groupIR = new();
rightIR = GenerateIRRecursion(right, curDepth + 1);
groupIR.Add(RegexIR.Try(rightIR.Count));
groupIR.AddRange(rightIR);
groupIR.Add(RegexIR.Condition(2, 1));
groupIR.Add(RegexIR.PopLevel(false));
groupIR.Add(RegexIR.PopLevel(true));
break;
case RegexElementLabel.COUNT:
break;
case RegexElementLabel.CONCAT:
break;
case RegexElementLabel.ALT:
break;
default:
break;
}
groupIR.EmitTry(rightIR.Count);
groupIR.EmitIRStream(rightIR);
groupIR.EmitCondition(2, 1);
groupIR.EmitPopLevel(false);
return [];
// a grouping op needed here, before popping
groupIR.EmitPopLevel(true);
return groupIR;
case RegexElementLabel.COUNT:
string count_source = token.Value;
bool isGreedy = !(count_source.Length > 1 && !count_source.EndsWith('?'));
ReadOnlySpan<char> count_source_span = count_source;
RegexIRGenerator countIR = new();
if (count_source_span[0] == '*') // infinite count
{
EmitCount(curDepth, countIR, 0, int.MaxValue, isGreedy, right);
} else if (count_source_span[0] == '+') // at least one
{
EmitCount(curDepth, countIR, 1, int.MaxValue, isGreedy, right);
} else if (count_source_span[0] == '?') // zero or one
{
EmitCount(curDepth, countIR, 0, 1, isGreedy, right);
} else if (count_source_span[0] == '{') // zero or one, non-greedy
{
int comma_pos = count_source_span.IndexOf(',');
if (comma_pos == -1)
{
if (int.TryParse(count_source[1..(isGreedy ? ^3 : ^2)], out int count))
{
EmitCount(curDepth, countIR, count, count, isGreedy, right);
} else
{
throw new InvalidCastException($"Invalid count format: {count_source}");
}
} else
{
if (int.TryParse(count_source[1..comma_pos], out int min) &&
int.TryParse(count_source[(comma_pos + 1)..(isGreedy ? ^3 : ^2)], out int max))
{
EmitCount(curDepth, countIR, min, max, isGreedy, right);
} else
{
throw new InvalidCastException($"Invalid count format: {count_source}");
}
}
} else
{
throw new InvalidOperationException();
} // unknown count format
return countIR;
case RegexElementLabel.CONCAT:
RegexIRGenerator concat = new();
// process left node
if (RegexAstNode.IsNullOrEmpty(left))
{
// do nothing
} else if ((left.Source.Flag & RegexElementLabel.SEQUENCE) != 0)
{
switch (left.Source.Flag)
{
case RegexElementLabel.UNIT_SPAN:
goto case RegexElementLabel.UNIT_SPAN;
case RegexElementLabel.UNIT:
concat.EmitMatchSeq(left.Source.Value);
break;
case RegexElementLabel.UNIT_SET:
concat.EmitMatchSet(left.Source.Value);
break;
default:
break;
}
} else if ((left.Source.Flag & RegexElementLabel.VAST_OPERATOR) != 0)
{
leftIR = GenerateIRRecursion(left, curDepth + 1);
concat.EmitIRStream(leftIR);
}
// process right node
if (RegexAstNode.IsNullOrEmpty(right))
{
// do nothing
} else if ((right.Source.Flag & RegexElementLabel.SEQUENCE) != 0)
{
switch (right.Source.Flag)
{
case RegexElementLabel.UNIT_SPAN:
goto case RegexElementLabel.UNIT;
case RegexElementLabel.UNIT:
concat.EmitMatchSeq(right.Source.Value);
break;
case RegexElementLabel.UNIT_SET:
concat.EmitMatchSet(right.Source.Value);
break;
default:
break;
}
} else if ((right.Source.Flag & RegexElementLabel.VAST_OPERATOR) != 0)
{
rightIR = GenerateIRRecursion(right, curDepth + 1);
concat.EmitIRStream(rightIR);
}
return concat;
case RegexElementLabel.ALT:
return null!;
default:
return null!;
}
#pragma warning restore IDE0010
}
}