Simplify

Author: RomanSoloweow

src/SimpleStateMachine.StructuralSearch.Tests/ReplaceTemplateTests.cs

@@ -26,7 +26,7 @@ public static void ReplaceBuildShouldBeSuccess(string templatePath, string resul
         IParsingContext parsingContext = new ParsingContext(Input.Input.Empty, []);
         for (int i = 0; i < keys.Length; i++)
         {
-            parsingContext[keys[i]] = Placeholder.Placeholder.CreateEmpty(keys[i], values[i]);
+            parsingContext[keys[i]] = Placeholder.CreateEmpty(keys[i], values[i]);
         }
 
         var result = replaceBuilder.Build(ref parsingContext);

src/SimpleStateMachine.StructuralSearch/Constant.cs

@@ -135,26 +135,6 @@ internal static class Constant
     /// </summary>
     public static readonly string Should = $"{Equals}{More}";
 
-    /// <summary>
-    /// Parenthesis chars: '(' and ')'
-    /// </summary>
-    public static readonly (char, char) Parentheses = (LeftParenthesis, RightParenthesis);
-
-    /// <summary>
-    /// Parenthesis chars: '[' and ']'
-    /// </summary>
-    public static readonly (char, char) SquareParentheses = (LeftSquareParenthesis, RightSquareParenthesis);
-
-    /// <summary>
-    /// Parenthesis chars: '{ and '}'
-    /// </summary>
-    public static readonly (char, char) CurlyParentheses = (LeftCurlyParenthesis, RightCurlyParenthesis);
-
-    /// <summary>
-    /// Parenthesis chars: '(' and ')', '{ and '}', '{ and '}'
-    /// </summary>
-    public static readonly (char, char)[] AllParentheses = [Parentheses, SquareParentheses, CurlyParentheses];
-
     /// <summary>
     /// Parenthesis chars: '(' and ')', '{ and '}', '{ and '}'
     /// </summary>

src/SimpleStateMachine.StructuralSearch/Context/IParsingContext.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using SimpleStateMachine.StructuralSearch.Input;
 using SimpleStateMachine.StructuralSearch.Operator.Logical;
-using SimpleStateMachine.StructuralSearch.Placeholder;
 
 namespace SimpleStateMachine.StructuralSearch.Context;
 

src/SimpleStateMachine.StructuralSearch/Context/ParsingContext.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using SimpleStateMachine.StructuralSearch.Input;
 using SimpleStateMachine.StructuralSearch.Operator.Logical;
-using SimpleStateMachine.StructuralSearch.Placeholder;
 
 namespace SimpleStateMachine.StructuralSearch.Context;
 

src/SimpleStateMachine.StructuralSearch/CustomParsers/Parsers.cs

@@ -60,11 +60,8 @@ protected override Parser<char, string> BuildParser(Func<Parser<char, string>?>
         var token = Parser.OneOf(simpleString, Grammar.WhiteSpaces).Try();
         Parser<char, string>? term = null;
 
-        var parenthesised = Parsers.BetweenParentheses
-        (
-            expr: Parser.Rec(() => term ?? throw new ArgumentNullException(nameof(term))),
-            mapFunc: (c1, s, c2) => $"{c1}{s}{c2}"
-        );
+        var parenthesised = Parser.Rec(() => term ?? throw new ArgumentNullException(nameof(term)))
+            .BetweenParentheses((c1, s, c2) => $"{c1}{s}{c2}");
 
         term = Parser.OneOf(parenthesised, token).Many().JoinToString();
 
@@ -94,7 +91,7 @@ public override bool TryParse(ref ParseState<char> state, ref PooledList<Expecte
             result = match.Value;
             if (res)
             {
-                var placeholderObj = new Placeholder.Placeholder
+                var placeholderObj = new Placeholder
                 (
                     name: _name,
                     match: match

src/SimpleStateMachine.StructuralSearch/CustomParsers/PlaceholderParser.cs

@@ -10,12 +10,6 @@ internal static class ParserExtensions
     public static Parser<TToken, T> Try<TToken, T>(this Parser<TToken, T> parser)
         => Parser.Try(parser ?? throw new ArgumentNullException(nameof(parser)));
 
-    public static Parser<TToken, IEnumerable<T>> AsMany<TToken, T>(this Parser<TToken, T> parser)
-        => parser.Select(IEnumerable<T> (x) => [x]);
-
-    public static Parser<TToken, T> AsLazy<TToken, T>(this Func<Parser<TToken, T>> parser)
-        => Parser.Rec(() => parser() ?? throw new ArgumentNullException(nameof(parser)));
-
     public static Parser<TToken, IEnumerable<T>> AtLeastOnceUntilNot<TToken, T, U>(this Parser<TToken, T> parser,
         Parser<TToken, U> terminator) =>
         parser != null
@@ -44,8 +38,8 @@ public static Parser<char, Match<T>> Match<T>(this Parser<char, T> parser)
                 var line = new LinePosition(oldPos.Line, newPos.Line);
                 var column = new ColumnPosition(oldPos.Col, newPos.Col);
                 var offset = new OffsetPosition(oldOffset, newOffset);
-                var Length = newOffset - oldOffset;
-                return new Match<T>(result, Length, column, line, offset);
+                var length = newOffset - oldOffset;
+                return new Match<T>(result, length, column, line, offset);
             },
             Parser<char>.CurrentPos, Parser<char>.CurrentOffset,
             parser,
@@ -80,4 +74,12 @@ public static Parser<char, T> ParenthesisedOptional<T, TResult>(this Parser<char
     public static Parser<TToken, Parser<TToken, T>> SelectToParser<TToken, T>(this Parser<TToken, T> parser,
         Func<T, Parser<TToken, T>, Parser<TToken, T>> selectFunc)
         => parser.Select(value => selectFunc(value, parser));
+    
+    public static Parser<char, TResult> BetweenParentheses<T, TResult>(this Parser<char, T> parser, Func<char, T, char, TResult> mapFunc)
+    {
+        var parentheses= Parser.Map(mapFunc, CommonParser.LeftParenthesis, parser, CommonParser.RightParenthesis);
+        var curlyParentheses= Parser.Map(mapFunc, CommonParser.LeftCurlyParenthesis, parser, CommonParser.RightCurlyParenthesis);
+        var squareParentheses= Parser.Map(mapFunc, CommonParser.LeftSquareParenthesis, parser, CommonParser.RightSquareParenthesis);
+        return Parser.OneOf(parentheses, curlyParentheses, squareParentheses);
+    }
 }

src/SimpleStateMachine.StructuralSearch/Extensions/ParserExtensions.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using SimpleStateMachine.StructuralSearch.Placeholder;
 
 namespace SimpleStateMachine.StructuralSearch;
 

src/SimpleStateMachine.StructuralSearch/FindParserResult.cs

@@ -1,4 +1,4 @@
-namespace SimpleStateMachine.StructuralSearch.Placeholder;
+namespace SimpleStateMachine.StructuralSearch;
 
 public interface IPlaceholder
 {

…cturalSearch/Placeholder/IPlaceholder.cs …Machine.StructuralSearch/IPlaceholder.cssrc/SimpleStateMachine.StructuralSearch/Placeholder/IPlaceholder.cs renamed to src/SimpleStateMachine.StructuralSearch/IPlaceholder.cs src/SimpleStateMachine.StructuralSearch/Placeholder/IPlaceholder.cs renamed to src/SimpleStateMachine.StructuralSearch/IPlaceholder.cs

@@ -1,5 +1,4 @@
 using SimpleStateMachine.StructuralSearch.Context;
-using SimpleStateMachine.StructuralSearch.Placeholder;
 
 namespace SimpleStateMachine.StructuralSearch.Parameters;