a few edit
This commit is contained in:
Nitload
@@ -1,27 +1,30 @@
|
||||
//-----------------------------------------------------------------------
|
||||
// -----------------------------------------------------------------------
|
||||
// file="RegexInterpreter.IREmit"
|
||||
// file="RegexInterpreter.IRGenerate.cs"
|
||||
// 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.
|
||||
// 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.
|
||||
//
|
||||
// -----------------------------------------------------------------------
|
||||
// -----------------------------------------------------------------------
|
||||
@@ -55,34 +58,29 @@ namespace StgSharp.RegularAnalysis.Text
|
||||
int min,
|
||||
int max,
|
||||
bool isGreedy,
|
||||
<<<<<<<< HEAD:StgSharp.RegularAnalysis/Text/RegexInterpreter.IREmit.cs
|
||||
RegexAstNode right)
|
||||
========
|
||||
RegexAstNode body
|
||||
)
|
||||
>>>>>>>> 359dd6728716c1c0014d64b72ba70c6c65bb8cf8:StgSharp.RegularAnalysis/Text/RegexInterpreter.IRGenerate.cs
|
||||
{
|
||||
bool is_operator = !RegexAstNode.IsNullOrEmpty(body) &&
|
||||
(body.Source.Flag & RegexElementLabel.OPERATOR) != 0;
|
||||
bool is_operator = !RegexAstNode.IsNullOrEmpty(right) &&
|
||||
(right.Source.Flag & RegexElementLabel.OPERATOR) != 0;
|
||||
|
||||
if (is_operator) // seq to be count is complex
|
||||
{
|
||||
RegexIRGenerator body_ir = GenerateIRRecursion(body, curDepth + 1);
|
||||
ir.EmitCountComplex(min, max, isGreedy, body_ir.Count);
|
||||
ir.EmitIRStream(body_ir);
|
||||
RegexIRGenerator right_ir = GenerateIRRecursion(right, curDepth + 1);
|
||||
ir.EmitCountComplex(min, max, isGreedy, right_ir.Count);
|
||||
ir.EmitIRStream(right_ir);
|
||||
} else
|
||||
{
|
||||
RegexElementLabel count_source_mask = body.Source.Flag;
|
||||
RegexElementLabel count_source_mask = right.Source.Flag;
|
||||
switch (count_source_mask)
|
||||
{
|
||||
case RegexElementLabel.UNIT:
|
||||
ir.EmitCountSeq(min, max, isGreedy, body.Source.Value);
|
||||
ir.EmitCountSeq(min, max, isGreedy, right.Source.Value);
|
||||
break;
|
||||
case RegexElementLabel.UNIT_SET:
|
||||
ir.EmitCountSet(min, max, isGreedy, body.Source.Value);
|
||||
ir.EmitCountSet(min, max, isGreedy, right.Source.Value);
|
||||
break;
|
||||
case RegexElementLabel.UNIT_SPAN:
|
||||
ir.EmitCountSeq(min, max, isGreedy, body.Source.Value);
|
||||
ir.EmitCountSeq(min, max, isGreedy, right.Source.Value);
|
||||
break;
|
||||
default:
|
||||
throw new InvalidOperationException($"Unexpected regex element type for count operator: {count_source_mask}");
|
||||
|
||||
@@ -1,27 +1,30 @@
|
||||
//-----------------------------------------------------------------------
|
||||
// -----------------------------------------------------------------------
|
||||
// file="RegexInterpreter.IROptimize"
|
||||
// file="RegexInterpreter.IROptimize.cs"
|
||||
// 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.
|
||||
// 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.
|
||||
//
|
||||
// -----------------------------------------------------------------------
|
||||
// -----------------------------------------------------------------------
|
||||
@@ -41,17 +44,13 @@ namespace StgSharp.RegularAnalysis.Text
|
||||
{
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
|
||||
internal static RegexInfo ScanAndOptimizeIR(
|
||||
List<RegexIR> baseIR,
|
||||
out List<RegexIR> optIR
|
||||
)
|
||||
internal static RegexInfo ScanAndOptimizeIR(List<RegexIR> baseIR, out List<RegexIR> optIR)
|
||||
{
|
||||
int index = 0;
|
||||
Span<RegexIR> origin_span = CollectionsMarshal.AsSpan(baseIR);
|
||||
List<RegexIR> opt_ir = new(baseIR.Count);
|
||||
CapacityFixedList<RegexIR> opt_window = new(8);
|
||||
Span<RegexIR> opt_win_sp = [.. opt_window];
|
||||
Span<RegexIR> opt_win_sp = [ .. opt_window ];
|
||||
RegexInfo info = new();
|
||||
do
|
||||
{
|
||||
@@ -61,33 +60,7 @@ namespace StgSharp.RegularAnalysis.Text
|
||||
|
||||
do
|
||||
{
|
||||
// plus_expand:
|
||||
int expand_result = TryExpandPlus(opt_win_sp, opt_ir);
|
||||
if (expand_result == 0)
|
||||
{
|
||||
opt_win_sp[0] = opt_ir[^1];
|
||||
process_count++;
|
||||
|
||||
// goto dot_count_count:
|
||||
} else if (expand_result > 0)
|
||||
{
|
||||
// meets a count-complex
|
||||
RegexCountComplexIR cnt_cmp_ir = Unsafe.As<RegexCountComplexIR>(opt_win_sp[0]);
|
||||
if (TryExpandComplexPlus(cnt_cmp_ir.IsGreedy, origin_span[(index + 1)..(index + expand_result)], opt_ir))
|
||||
{
|
||||
process_count += expand_result + 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// dot_count_count:
|
||||
if (TryOptDotCountCount(opt_win_sp, opt_ir))
|
||||
{
|
||||
process_count += expand_result == 0 ? 1 : 2;
|
||||
break;
|
||||
}
|
||||
|
||||
if (TryFlattenCount(opt_win_sp, opt_ir)) { }
|
||||
if (true) { }
|
||||
} while (false);
|
||||
|
||||
index += process_count;
|
||||
@@ -96,11 +69,9 @@ namespace StgSharp.RegularAnalysis.Text
|
||||
return info;
|
||||
}
|
||||
|
||||
private static bool TryExpandComplexPlus(
|
||||
bool is_greedy,
|
||||
Span<RegexIR> complex,
|
||||
List<RegexIR> opt
|
||||
)
|
||||
private void OptimizeRange(List<RegexIR> origin, List<RegexIR> target, int begin, int end) { }
|
||||
|
||||
private static bool TryExpandComplexPlus(bool is_greedy, Span<RegexIR> complex, List<RegexIR> opt)
|
||||
{
|
||||
int count = complex.Length;
|
||||
opt.AddRange(complex);
|
||||
@@ -110,10 +81,7 @@ namespace StgSharp.RegularAnalysis.Text
|
||||
|
||||
#region expand plus
|
||||
|
||||
private static int TryExpandPlus(
|
||||
Span<RegexIR> window,
|
||||
List<RegexIR> opt
|
||||
)
|
||||
private static int TryExpandPlus(Span<RegexIR> window, List<RegexIR> opt)
|
||||
{
|
||||
/* a+
|
||||
* convert to
|
||||
@@ -150,10 +118,7 @@ namespace StgSharp.RegularAnalysis.Text
|
||||
|
||||
#endregion
|
||||
|
||||
private static bool TryFlattenCount(
|
||||
Span<RegexIR> window,
|
||||
List<RegexIR> opt
|
||||
)
|
||||
private static bool TryFlattenCount(Span<RegexIR> window, List<RegexIR> opt)
|
||||
{
|
||||
RegexIR ir = window[0];
|
||||
if (ir is not RegexCountSeqIR seq) {
|
||||
@@ -164,10 +129,7 @@ namespace StgSharp.RegularAnalysis.Text
|
||||
|
||||
#region dot count count
|
||||
|
||||
private static int TryOptDotCountCount(
|
||||
Span<RegexIR> window,
|
||||
List<RegexIR> opt
|
||||
)
|
||||
private static int TryOptDotCountCount(Span<RegexIR> window, List<RegexIR> opt)
|
||||
{
|
||||
/* .* <any>*
|
||||
* convert to
|
||||
|
||||
Reference in New Issue
Block a user