refact

RomanSoloweow · RomanSoloweow · commit 91f2d4bea3cb · 2022-03-13T23:31:50.000+03:00
diff --git a/src/SimpleStateMachine.StructuralSearch.Sandbox/ExprParser.cs b/src/SimpleStateMachine.StructuralSearch.Sandbox/ExprParser.cs
@@ -1,14 +1,7 @@
 ﻿using System;
-using System.Collections.Immutable;
-using Pidgin;
-using Pidgin.Expression;
-
-using System;
-using System.Collections.Immutable;
 using Pidgin;
 using Pidgin.Expression;
 using static Pidgin.Parser;
-using static Pidgin.Parser<char>;
 
 namespace SimpleStateMachine.StructuralSearch.Sandbox
 {
diff --git a/src/SimpleStateMachine.StructuralSearch.Sandbox/Program.cs b/src/SimpleStateMachine.StructuralSearch.Sandbox/Program.cs
@@ -1,8 +1,5 @@
-﻿using System;
-using Pidgin;
-using SimpleStateMachine.StructuralSearch.Extensions;
+﻿using Pidgin;
 using static Pidgin.Parser;
-using static Pidgin.Parser<char>;
 
 namespace SimpleStateMachine.StructuralSearch.Sandbox
 {
diff --git a/src/SimpleStateMachine.StructuralSearch.Tests/PlaceholderParserTests.cs b/src/SimpleStateMachine.StructuralSearch.Tests/PlaceholderParserTests.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using Pidgin;
+﻿using Pidgin;
 using Xunit;
 
 namespace SimpleStateMachine.StructuralSearch.Tests
diff --git a/src/SimpleStateMachine.StructuralSearch/Constant.cs b/src/SimpleStateMachine.StructuralSearch/Constant.cs
@@ -1,6 +1,4 @@
-﻿using System.Linq;
-
-namespace SimpleStateMachine.StructuralSearch
+﻿namespace SimpleStateMachine.StructuralSearch
 {
     public static partial class Constant
     {
diff --git a/src/SimpleStateMachine.StructuralSearch/Extensions/CharExtensions.cs b/src/SimpleStateMachine.StructuralSearch/Extensions/CharExtensions.cs
@@ -1,7 +1,4 @@
-﻿using Pidgin;
-using Pidgin.TokenStreams;
-
-namespace SimpleStateMachine.StructuralSearch.Extensions
+﻿namespace SimpleStateMachine.StructuralSearch.Extensions
 {
     public static class CharExtensions
     {
diff --git a/src/SimpleStateMachine.StructuralSearch/Extensions/CharParserExtensions.cs b/src/SimpleStateMachine.StructuralSearch/Extensions/CharParserExtensions.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
 using Pidgin;
 
 namespace SimpleStateMachine.StructuralSearch.Extensions
diff --git a/src/SimpleStateMachine.StructuralSearch/Extensions/EnumerableCharExtensions.cs b/src/SimpleStateMachine.StructuralSearch/Extensions/EnumerableCharExtensions.cs
@@ -1,8 +1,5 @@
-﻿using System.Collections;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.Linq;
-using static Pidgin.Parser;
-using static Pidgin.Parser<char>;
 using Pidgin;
 
 namespace SimpleStateMachine.StructuralSearch.Extensions
diff --git a/src/SimpleStateMachine.StructuralSearch/Extensions/EnumerableStringExtensions.cs b/src/SimpleStateMachine.StructuralSearch/Extensions/EnumerableStringExtensions.cs
@@ -1,5 +1,4 @@
 ﻿using System.Collections.Generic;
-using System.Linq;
 
 namespace SimpleStateMachine.StructuralSearch.Extensions
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/Extensions/IEnumerableSourceMatchExtensions.cs b/src/SimpleStateMachine.StructuralSearch/Extensions/IEnumerableSourceMatchExtensions.cs
@@ -1,6 +1,5 @@
 ﻿using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace SimpleStateMachine.StructuralSearch.Extensions
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/Extensions/ManyParserExtensions.cs b/src/SimpleStateMachine.StructuralSearch/Extensions/ManyParserExtensions.cs
@@ -1,6 +1,5 @@
 ﻿using System.Collections.Generic;
 using Pidgin;
-using static Pidgin.Parser;
 
 namespace SimpleStateMachine.StructuralSearch.Extensions
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/Extensions/ParserExtensions.cs b/src/SimpleStateMachine.StructuralSearch/Extensions/ParserExtensions.cs
@@ -1,16 +1,7 @@
 ﻿using System;
 using Pidgin;
-using Pidgin.Configuration;
-using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Pidgin;
-using Pidgin.Expression;
-using SimpleStateMachine.StructuralSearch.Extensions;
 using static Pidgin.Parser;
-using static Pidgin.Parser<char>;
-using String = System.String;
 
 namespace SimpleStateMachine.StructuralSearch.Extensions
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/Extensions/SourceMatchManyParserExtensions.cs b/src/SimpleStateMachine.StructuralSearch/Extensions/SourceMatchManyParserExtensions.cs
@@ -1,6 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
+﻿using System.Collections.Generic;
 using Pidgin;
 
 namespace SimpleStateMachine.StructuralSearch.Extensions
diff --git a/src/SimpleStateMachine.StructuralSearch/Extensions/StringParserExtensions.cs b/src/SimpleStateMachine.StructuralSearch/Extensions/StringParserExtensions.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
 using Pidgin;
-using static Pidgin.Parser<char>;
 using static Pidgin.Parser;
 
 namespace SimpleStateMachine.StructuralSearch.Extensions
diff --git a/src/SimpleStateMachine.StructuralSearch/FindTemplate/ParserToParser.cs b/src/SimpleStateMachine.StructuralSearch/FindTemplate/ParserToParser.cs
@@ -1,10 +1,5 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using Pidgin;
+﻿using Pidgin;
 using SimpleStateMachine.StructuralSearch.Extensions;
-using static Pidgin.Parser<char>;
-using static Pidgin.Parser;
 
 namespace SimpleStateMachine.StructuralSearch
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/Helper/CharHelper.cs b/src/SimpleStateMachine.StructuralSearch/Helper/CharHelper.cs
@@ -1,6 +1,4 @@
-﻿using System.Text.RegularExpressions;
-
-namespace SimpleStateMachine.StructuralSearch.Helper
+﻿namespace SimpleStateMachine.StructuralSearch.Helper
 {
     public static class CharHelper
     {
diff --git a/src/SimpleStateMachine.StructuralSearch/Helper/EnumHelper.cs b/src/SimpleStateMachine.StructuralSearch/Helper/EnumHelper.cs
@@ -1,8 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
-using System.Reflection;
 
 namespace SimpleStateMachine.StructuralSearch.Helper
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/Parsers/Parsers.cs b/src/SimpleStateMachine.StructuralSearch/Parsers/Parsers.cs
@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Pidgin;
-using Pidgin.TokenStreams;
 using SimpleStateMachine.StructuralSearch.Extensions;
-using SimpleStateMachine.StructuralSearch.Helper;
 using static Pidgin.Parser;
 
 namespace SimpleStateMachine.StructuralSearch
diff --git a/src/SimpleStateMachine.StructuralSearch/Parsers/PlaceholderParser.cs b/src/SimpleStateMachine.StructuralSearch/Parsers/PlaceholderParser.cs
@@ -1,6 +1,4 @@
 ﻿using System;
-using System.Collections;
-using System.Collections.Generic;
 using Pidgin;
 using SimpleStateMachine.StructuralSearch.Extensions;
 
diff --git a/src/SimpleStateMachine.StructuralSearch/ParsingConfiguration.cs b/src/SimpleStateMachine.StructuralSearch/ParsingConfiguration.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using Pidgin;
+﻿using Pidgin;
 
 namespace SimpleStateMachine.StructuralSearch
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/ReplaceTemplate/ReplaceBuilder.cs b/src/SimpleStateMachine.StructuralSearch/ReplaceTemplate/ReplaceBuilder.cs
@@ -1,6 +1,5 @@
 ﻿using System.Collections.Generic;
 using System.Text;
-using Pidgin;
 
 namespace SimpleStateMachine.StructuralSearch.ReplaceTemplate
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/Rules/InRule.cs b/src/SimpleStateMachine.StructuralSearch/Rules/InRule.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.Linq;
 
 namespace SimpleStateMachine.StructuralSearch.Rules
diff --git a/src/SimpleStateMachine.StructuralSearch/Rules/IsRule.cs b/src/SimpleStateMachine.StructuralSearch/Rules/IsRule.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using Pidgin;
 using SimpleStateMachine.StructuralSearch.Extensions;
 
 namespace SimpleStateMachine.StructuralSearch.Rules
diff --git a/src/SimpleStateMachine.StructuralSearch/Rules/SubRuleParser.cs b/src/SimpleStateMachine.StructuralSearch/Rules/SubRuleParser.cs
@@ -0,0 +1,60 @@
+﻿using System.Collections.Generic;
+using Pidgin;
+using SimpleStateMachine.StructuralSearch.Extensions;
+
+namespace SimpleStateMachine.StructuralSearch.Rules
+{
+    public static class SubRuleParser
+    {
+        public static readonly Parser<char, IRuleParameter> PlaceholderParameter =
+            CommonTemplateParser.Placeholder
+                .Trim()
+                .Try().Select(x => new PlaceholderParameter(x))
+                .As<char, PlaceholderParameter, IRuleParameter>()
+                .Try();
+
+
+        public static readonly Parser<char, IRuleParameter> StringParameter =
+            Parser.AnyCharExcept(Constant.DoubleQuotes)
+                .AtLeastOnceString()
+                .Between(CommonParser.DoubleQuotes)
+                .Select(x => new StringParameter(x))
+                .As<char, StringParameter, IRuleParameter>()
+                .Trim()
+                .Try();
+
+        public static readonly Parser<char, IRuleParameter> Parameter =
+            Parser.OneOf(PlaceholderParameter, StringParameter);
+
+        public static readonly Parser<char, IEnumerable<IRuleParameter>> Parameters =
+            Parameter.AtLeastOnce();
+
+        public static readonly Parser<char, SubRuleType> SubRuleType =
+            Parsers.EnumExcept(true, Rules.SubRuleType.Is, Rules.SubRuleType.In)
+                .Trim();
+
+        public static readonly Parser<char, IRule> UnarySubRule =
+            Parser.Map((type, param) => new UnarySubRule(type, param),
+                    SubRuleType, Parameter)
+                .As<char, UnarySubRule, IRule>()
+                .Try();
+
+        public static readonly Parser<char, PlaceholderType> PlaceholderType =
+            Parsers.Enum<PlaceholderType>(true)
+                .Trim();
+
+        public static readonly Parser<char, IRule> IsSubRule =
+            Parser.Map((type, param) => new IsRule(type, param),
+                    Parsers.EnumValue(Rules.SubRuleType.Is, true)
+                        .Trim(),
+                    PlaceholderType)
+                .As<char, IsRule, IRule>()
+                .Try();
+
+        public static readonly Parser<char, IRule> InSubRule =
+            Parser.Map((type, param) => new InRule(type, param),
+                    Parsers.EnumValue(Rules.SubRuleType.In, true), Parameters)
+                .As<char, InRule, IRule>()
+                .Try();
+    }
+}
diff --git a/src/SimpleStateMachine.StructuralSearch/StructuralSearch/CommonParser.cs b/src/SimpleStateMachine.StructuralSearch/StructuralSearch/CommonParser.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using Pidgin;
-using SimpleStateMachine.StructuralSearch.Extensions;
 using static Pidgin.Parser;
 namespace SimpleStateMachine.StructuralSearch
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/StructuralSearch/CommonTemplateParser.cs b/src/SimpleStateMachine.StructuralSearch/StructuralSearch/CommonTemplateParser.cs
@@ -1,9 +1,7 @@
-﻿using System.Collections.Generic;
-using Pidgin;
+﻿using Pidgin;
 using SimpleStateMachine.StructuralSearch.Extensions;
 using static Pidgin.Parser<char>;
 using static Pidgin.Parser;
-using static Pidgin.Parser<char>;
 
 namespace SimpleStateMachine.StructuralSearch
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/StructuralSearch/ReplaceTemplateParser.cs b/src/SimpleStateMachine.StructuralSearch/StructuralSearch/ReplaceTemplateParser.cs
@@ -1,5 +1,4 @@
 ﻿using System.Collections.Generic;
-using System.Linq;
 using Pidgin;
 using SimpleStateMachine.StructuralSearch.Extensions;
 using SimpleStateMachine.StructuralSearch.ReplaceTemplate;
diff --git a/src/SimpleStateMachine.StructuralSearch/StructuralSearch/RulesParser.cs b/src/SimpleStateMachine.StructuralSearch/StructuralSearch/RulesParser.cs

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,5 @@`
`1`		`-using System;`
`2`		`-using Pidgin;`
`3`		`-using SimpleStateMachine.StructuralSearch.Extensions;`
	`1`	`+using Pidgin;`
`4`	`2`	`using static Pidgin.Parser;`
`5`		`-using static Pidgin.Parser<char>;`
`6`	`3`
`7`	`4`	`namespace SimpleStateMachine.StructuralSearch.Sandbox`
`8`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using System.Linq;`
`2`		`-`
`3`		`-namespace SimpleStateMachine.StructuralSearch`
	`1`	`+namespace SimpleStateMachine.StructuralSearch`
`4`	`2`	`{`
`5`	`3`	`public static partial class Constant`
`6`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`		`-using Pidgin;`
`2`		`-using Pidgin.TokenStreams;`
`3`		`-`
`4`		`-namespace SimpleStateMachine.StructuralSearch.Extensions`
	`1`	`+namespace SimpleStateMachine.StructuralSearch.Extensions`
`5`	`2`	`{`
`6`	`3`	`public static class CharExtensions`
`7`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`	`2`	`using Pidgin;`
`4`	`3`
`5`	`4`	`namespace SimpleStateMachine.StructuralSearch.Extensions`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`		`-using System.Linq;`
`3`	`2`
`4`	`3`	`namespace SimpleStateMachine.StructuralSearch.Extensions`
`5`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using System.Linq;`
`3`		`-using System.Text;`
`4`	`3`
`5`	`4`	`namespace SimpleStateMachine.StructuralSearch.Extensions`
`6`	`5`	`{`