Simplify project

RomanSoloweow · RomanSoloweow · commit bbfcfc69b0cd · 2025-03-30T22:47:57.000+01:00
diff --git a/SimpleStateMachine.StructuralSearch.sln b/SimpleStateMachine.StructuralSearch.sln
@@ -11,10 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleStateMachine.Structur
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6CB879CC-E497-41C0-AEBD-864E9D3807A6}"
 	ProjectSection(SolutionItems) = preProject
-		.dockerignore = .dockerignore
 		.gitignore = .gitignore
-		action.yml = action.yml
-		Dockerfile = Dockerfile
 		global.json = global.json
 		LICENSE = LICENSE
 		README.md = README.md
diff --git a/src/SimpleStateMachine.StructuralSearch.Tests/ReplaceTemplateTests.cs b/src/SimpleStateMachine.StructuralSearch.Tests/ReplaceTemplateTests.cs
@@ -27,7 +27,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.CreateEmpty(keys[i], values[i]);
+            parsingContext[keys[i]] = Placeholder.Placeholder.CreateEmpty(keys[i], values[i]);
         }
 
         var result = replaceBuilder.Build(ref parsingContext);
diff --git a/src/SimpleStateMachine.StructuralSearch.Tests/Tests.cs b/src/SimpleStateMachine.StructuralSearch.Tests/Tests.cs
@@ -1,6 +1,6 @@
 ﻿using Pidgin;
 using SimpleStateMachine.StructuralSearch.Extensions;
-using SimpleStateMachine.StructuralSearch.Parsers;
+using SimpleStateMachine.StructuralSearch.Parsing;
 using Xunit;
 
 namespace SimpleStateMachine.StructuralSearch.Tests;
diff --git a/src/SimpleStateMachine.StructuralSearch/Parsing/FindParser.cs b/src/SimpleStateMachine.StructuralSearch/Parsing/FindParser.cs
@@ -7,7 +7,7 @@
 using SimpleStateMachine.StructuralSearch.Input;
 using SimpleStateMachine.StructuralSearch.Operator.Logical;
 
-namespace SimpleStateMachine.StructuralSearch.Parsers;
+namespace SimpleStateMachine.StructuralSearch.Parsing;
 
 internal class FindParser : IFindParser
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/Parsing/FindTemplate.cs b/src/SimpleStateMachine.StructuralSearch/Parsing/FindTemplate.cs
@@ -3,7 +3,7 @@
 using Pidgin;
 using SimpleStateMachine.StructuralSearch.Context;
 
-namespace SimpleStateMachine.StructuralSearch.Parsers;
+namespace SimpleStateMachine.StructuralSearch.Parsing;
 
 internal class FindTemplate : Parser<char, List<string>>, IContextDependent
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/Parsing/FindTemplateParser.cs b/src/SimpleStateMachine.StructuralSearch/Parsing/FindTemplateParser.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using Pidgin;
 using SimpleStateMachine.StructuralSearch.Extensions;
-using SimpleStateMachine.StructuralSearch.Parsers;
 
 namespace SimpleStateMachine.StructuralSearch.Parsing;
 
diff --git a/src/SimpleStateMachine.StructuralSearch/Parsing/IContextDependent.cs b/src/SimpleStateMachine.StructuralSearch/Parsing/IContextDependent.cs
@@ -1,6 +1,6 @@
 ﻿using SimpleStateMachine.StructuralSearch.Context;
 
-namespace SimpleStateMachine.StructuralSearch.Parsers;
+namespace SimpleStateMachine.StructuralSearch.Parsing;
 
 internal interface IContextDependent
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/Parsing/ParserWithLookahead.cs b/src/SimpleStateMachine.StructuralSearch/Parsing/ParserWithLookahead.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using Pidgin;
 
-namespace SimpleStateMachine.StructuralSearch.Parsers;
+namespace SimpleStateMachine.StructuralSearch.Parsing;
 
 internal abstract class ParserWithLookahead<TToken, T> : Parser<TToken, T>
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/Parsing/PlaceholderParser.cs b/src/SimpleStateMachine.StructuralSearch/Parsing/PlaceholderParser.cs
@@ -4,9 +4,8 @@
 using Pidgin;
 using SimpleStateMachine.StructuralSearch.Context;
 using SimpleStateMachine.StructuralSearch.Extensions;
-using SimpleStateMachine.StructuralSearch.Parsing;
 
-namespace SimpleStateMachine.StructuralSearch.Parsers;
+namespace SimpleStateMachine.StructuralSearch.Parsing;
 
 internal class PlaceholderParser : ParserWithLookahead<char, string>, IContextDependent
 {
@@ -164,7 +163,7 @@ public override bool TryParse(ref ParseState<char> state, ref PooledList<Expecte
             result = match.Value;
             if (res)
             {
-                var placeholderObj = new Placeholder
+                var placeholderObj = new Placeholder.Placeholder
                 (
                     name: _name,
                     match: match
diff --git a/src/SimpleStateMachine.StructuralSearch/Parsing/StructuralSearch.cs b/src/SimpleStateMachine.StructuralSearch/Parsing/StructuralSearch.cs
@@ -2,7 +2,6 @@
 using SimpleStateMachine.StructuralSearch.Extensions;
 using SimpleStateMachine.StructuralSearch.Operator.Logical;
 using SimpleStateMachine.StructuralSearch.Parameters;
-using SimpleStateMachine.StructuralSearch.Parsers;
 using SimpleStateMachine.StructuralSearch.Replace;
 
 namespace SimpleStateMachine.StructuralSearch.Parsing;
@@ -15,7 +14,7 @@ public static IFindParser ParseFindTemplate(string? template)
             ? [] 
             : FindTemplateParser.Template.ParseToEnd(template).ToList();
 
-        var templateParser = new Parsers.FindTemplate(parsers);
+        var templateParser = new FindTemplate(parsers);
         return new FindParser(templateParser);
     }
 
diff --git a/src/SimpleStateMachine.StructuralSearch/Placeholder/Placeholder.cs b/src/SimpleStateMachine.StructuralSearch/Placeholder/Placeholder.cs
@@ -1,4 +1,4 @@
-﻿namespace SimpleStateMachine.StructuralSearch;
+﻿namespace SimpleStateMachine.StructuralSearch.Placeholder;
 
 internal readonly struct Placeholder : IPlaceholder
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/Placeholder/PlaceholderReplace.cs b/src/SimpleStateMachine.StructuralSearch/Placeholder/PlaceholderReplace.cs
@@ -1,4 +1,4 @@
-﻿namespace SimpleStateMachine.StructuralSearch;
+﻿namespace SimpleStateMachine.StructuralSearch.Placeholder;
 
 internal class PlaceholderReplace : IPlaceholder
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/SourceMatch.cs b/src/SimpleStateMachine.StructuralSearch/SourceMatch.cs
diff --git a/src/SimpleStateMachine.StructuralSearch/StructuralSearchParser.cs b/src/SimpleStateMachine.StructuralSearch/StructuralSearchParser.cs
@@ -4,6 +4,7 @@
 using SimpleStateMachine.StructuralSearch.Extensions;
 using SimpleStateMachine.StructuralSearch.Input;
 using SimpleStateMachine.StructuralSearch.Operator.Logical;
+using SimpleStateMachine.StructuralSearch.Placeholder;
 using SimpleStateMachine.StructuralSearch.Replace;
 
 namespace SimpleStateMachine.StructuralSearch;
@@ -39,7 +40,7 @@ public List<ReplaceResult> StructuralSearchAndReplace(IInput input)
         return results.Select(r => Replace(input, r)).ToList();
     }
 
-    public ReplaceResult Replace(IInput input, FindParserResult findResult)
+    private ReplaceResult Replace(IInput input, FindParserResult findResult)
     {
         IParsingContext context = new ParsingContext(input, []);
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public static void ReplaceBuildShouldBeSuccess(string templatePath, string resul`
`27`	`27`	`IParsingContext parsingContext = new ParsingContext(Input.Input.Empty, []);`
`28`	`28`	`for (int i = 0; i < keys.Length; i++)`
`29`	`29`	`{`
`30`		`- parsingContext[keys[i]] = Placeholder.CreateEmpty(keys[i], values[i]);`
	`30`	`+ parsingContext[keys[i]] = Placeholder.Placeholder.CreateEmpty(keys[i], values[i]);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`var result = replaceBuilder.Build(ref parsingContext);`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using SimpleStateMachine.StructuralSearch.Input;`
`8`	`8`	`using SimpleStateMachine.StructuralSearch.Operator.Logical;`
`9`	`9`
`10`		`-namespace SimpleStateMachine.StructuralSearch.Parsers;`
	`10`	`+namespace SimpleStateMachine.StructuralSearch.Parsing;`
`11`	`11`
`12`	`12`	`internal class FindParser : IFindParser`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using Pidgin;`
`4`	`4`	`using SimpleStateMachine.StructuralSearch.Context;`
`5`	`5`
`6`		`-namespace SimpleStateMachine.StructuralSearch.Parsers;`
	`6`	`+namespace SimpleStateMachine.StructuralSearch.Parsing;`
`7`	`7`
`8`	`8`	`internal class FindTemplate : Parser<char, List<string>>, IContextDependent`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using SimpleStateMachine.StructuralSearch.Context;`
`2`	`2`
`3`		`-namespace SimpleStateMachine.StructuralSearch.Parsers;`
	`3`	`+namespace SimpleStateMachine.StructuralSearch.Parsing;`
`4`	`4`
`5`	`5`	`internal interface IContextDependent`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using Pidgin;`
`4`	`4`
`5`		`-namespace SimpleStateMachine.StructuralSearch.Parsers;`
	`5`	`+namespace SimpleStateMachine.StructuralSearch.Parsing;`
`6`	`6`
`7`	`7`	`internal abstract class ParserWithLookahead<TToken, T> : Parser<TToken, T>`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,8 @@`
`4`	`4`	`using Pidgin;`
`5`	`5`	`using SimpleStateMachine.StructuralSearch.Context;`
`6`	`6`	`using SimpleStateMachine.StructuralSearch.Extensions;`
`7`		`-using SimpleStateMachine.StructuralSearch.Parsing;`
`8`	`7`
`9`		`-namespace SimpleStateMachine.StructuralSearch.Parsers;`
	`8`	`+namespace SimpleStateMachine.StructuralSearch.Parsing;`
`10`	`9`
`11`	`10`	`internal class PlaceholderParser : ParserWithLookahead<char, string>, IContextDependent`
`12`	`11`	`{`
`@@ -164,7 +163,7 @@ public override bool TryParse(ref ParseState<char> state, ref PooledList<Expecte`
`164`	`163`	`result = match.Value;`
`165`	`164`	`if (res)`
`166`	`165`	`{`
`167`		`- var placeholderObj = new Placeholder`
	`166`	`+ var placeholderObj = new Placeholder.Placeholder`
`168`	`167`	`(`
`169`	`168`	`name: _name,`
`170`	`169`	`match: match`