#57 - абстракция IStructure.cs

Stepami · Aug 2, 2024 · 95d2b06 · 95d2b06
1 parent 8d2d18f
commit 95d2b06
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/src/Domain/HydraScript.Domain.FrontEnd/Lexer/ILexer.cs b/src/Domain/HydraScript.Domain.FrontEnd/Lexer/ILexer.cs
@@ -2,7 +2,7 @@ namespace HydraScript.Domain.FrontEnd.Lexer;
 
 public interface ILexer
 {
-    public Structure Structure { get; }
+    public IStructure Structure { get; }
 
     public List<Token> GetTokens(string text);
 }
diff --git a/src/Domain/HydraScript.Domain.FrontEnd/Lexer/IStructure.cs b/src/Domain/HydraScript.Domain.FrontEnd/Lexer/IStructure.cs
@@ -0,0 +1,11 @@
+using System.Text.RegularExpressions;
+using HydraScript.Domain.FrontEnd.Lexer.TokenTypes;
+
+namespace HydraScript.Domain.FrontEnd.Lexer;
+
+public interface IStructure : IEnumerable<TokenType>
+{
+    public Regex Regex { get; }
+
+    public TokenType FindByTag(string tag);
+}
diff --git a/src/Domain/HydraScript.Domain.FrontEnd/Lexer/Impl/RegexLexer.cs b/src/Domain/HydraScript.Domain.FrontEnd/Lexer/Impl/RegexLexer.cs
@@ -4,12 +4,12 @@
 
 namespace HydraScript.Domain.FrontEnd.Lexer.Impl;
 
-public class RegexLexer(Structure structure, ITextCoordinateSystemComputer computer) : ILexer, IEnumerable<Token>
+public class RegexLexer(IStructure structure, ITextCoordinateSystemComputer computer) : ILexer, IEnumerable<Token>
 {
     private IReadOnlyList<int> _lines = [];
     private string _text = "";
 
-    public Structure Structure { get; } = structure;
+    public IStructure Structure { get; } = structure;
 
     public List<Token> GetTokens(string text)
     {

diff --git a/...Script.Domain.FrontEnd/Lexer/Structure.cs → ...t.Domain.FrontEnd/Lexer/Impl/Structure.cs b/...Script.Domain.FrontEnd/Lexer/Structure.cs → ...t.Domain.FrontEnd/Lexer/Impl/Structure.cs
@@ -4,9 +4,9 @@
 using System.Text.RegularExpressions;
 using HydraScript.Domain.FrontEnd.Lexer.TokenTypes;
 
-namespace HydraScript.Domain.FrontEnd.Lexer;
+namespace HydraScript.Domain.FrontEnd.Lexer.Impl;
 
-public class Structure : IEnumerable<TokenType>
+public class Structure : IStructure
 {
     public Structure(List<TokenType> types)
     {

diff --git a/src/Infrastructure/HydraScript.Infrastructure/Logging/LoggingLexer.cs b/src/Infrastructure/HydraScript.Infrastructure/Logging/LoggingLexer.cs
@@ -13,7 +13,7 @@ internal class LoggingLexer(
     private readonly InputFile _inputFile = inputFile.Value;
 
     [ExcludeFromCodeCoverage]
-    public Structure Structure => lexer.Structure;
+    public IStructure Structure => lexer.Structure;
 
     public List<Token> GetTokens(string text)
     {

diff --git a/src/Infrastructure/HydraScript.Infrastructure/StructureInstance.cs b/src/Infrastructure/HydraScript.Infrastructure/StructureInstance.cs
@@ -2,6 +2,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using HydraScript.Domain.FrontEnd.Lexer;
+using HydraScript.Domain.FrontEnd.Lexer.Impl;
 using HydraScript.Domain.FrontEnd.Lexer.TokenTypes;
 
 namespace HydraScript.Infrastructure;
@@ -14,7 +15,7 @@ internal static class StructureInstance
     };
 
     private static Structure? _instance;
-    public static Structure Get
+    public static IStructure Get
     {
         get
         {

diff --git a/tests/HydraScript.Tests/Unit/FrontEnd/StructureTests.cs b/tests/HydraScript.Tests/Unit/FrontEnd/StructureTests.cs
@@ -1,4 +1,4 @@
-using HydraScript.Domain.FrontEnd.Lexer;
+using HydraScript.Domain.FrontEnd.Lexer.Impl;
 using HydraScript.Domain.FrontEnd.Lexer.TokenTypes;
 using Xunit;