constants project

Stepami · Stepami · commit b78d0b7f865c · 2025-03-06T00:52:34.000+03:00
diff --git a/ExtendedJavaScriptSubset.sln b/ExtendedJavaScriptSubset.sln
@@ -100,6 +100,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HydraScript.Infrastructure.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HydraScript.Infrastructure.LexerRegexGenerator.UnitTests", "tests\HydraScript.Infrastructure.LexerRegexGenerator.UnitTests\HydraScript.Infrastructure.LexerRegexGenerator.UnitTests.csproj", "{829111AD-4A5C-4B3D-AC28-208309CE10D6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HydraScript.Domain.Constants", "src\Domain\HydraScript.Domain.Constants\HydraScript.Domain.Constants.csproj", "{E3E558A3-1999-48F9-B53D-2E583C18F000}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -150,6 +152,10 @@ Global
 		{829111AD-4A5C-4B3D-AC28-208309CE10D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{829111AD-4A5C-4B3D-AC28-208309CE10D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{829111AD-4A5C-4B3D-AC28-208309CE10D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3E558A3-1999-48F9-B53D-2E583C18F000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3E558A3-1999-48F9-B53D-2E583C18F000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3E558A3-1999-48F9-B53D-2E583C18F000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3E558A3-1999-48F9-B53D-2E583C18F000}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{54CBE5A7-3C3E-44ED-B877-7B08A818083B} = {86CF2A2F-4DFE-48E7-B062-EF824730916A}
@@ -169,5 +175,6 @@ Global
 		{1CE98127-3027-4BD4-AAA3-63A589B09E73} = {3F131901-A9EC-451A-B7E9-726887CFE5FB}
 		{74D1495B-12A4-4E1A-ABE0-93029ECDC5FE} = {B7DDF6C9-B67C-430A-948A-A380EF68DEF1}
 		{829111AD-4A5C-4B3D-AC28-208309CE10D6} = {3F131901-A9EC-451A-B7E9-726887CFE5FB}
+		{E3E558A3-1999-48F9-B53D-2E583C18F000} = {F0FC6D23-F932-4C11-8D0F-07894FC61511}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Application/HydraScript.Application.CodeGeneration/Visitors/InstructionProvider.cs b/src/Application/HydraScript.Application.CodeGeneration/Visitors/InstructionProvider.cs
@@ -4,6 +4,7 @@
 using HydraScript.Domain.BackEnd.Impl.Instructions.WithAssignment;
 using HydraScript.Domain.BackEnd.Impl.Instructions.WithJump;
 using HydraScript.Domain.BackEnd.Impl.Values;
+using HydraScript.Domain.Constants;
 using HydraScript.Domain.FrontEnd.Parser;
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes;
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Declarations.AfterTypesAreLoaded;
@@ -82,8 +83,8 @@ public AddressedInstructions Visit(InsideStatementJump visitable)
     {
         var jumpType = visitable.Keyword switch
         {
-            InsideStatementJump.Break => InsideStatementJumpType.Break,
-            InsideStatementJump.Continue => InsideStatementJumpType.Continue,
+            InsideStatementJumpKeyword.Break => InsideStatementJumpType.Break,
+            InsideStatementJumpKeyword.Continue => InsideStatementJumpType.Continue,
             _ => throw new ArgumentOutOfRangeException(
                 nameof(visitable.Keyword), visitable.Keyword,
                 "Unsupported keyword inside loop")
diff --git a/src/Application/HydraScript.Application.StaticAnalysis/Visitors/SemanticChecker.cs b/src/Application/HydraScript.Application.StaticAnalysis/Visitors/SemanticChecker.cs
@@ -1,4 +1,5 @@
 using HydraScript.Application.StaticAnalysis.Exceptions;
+using HydraScript.Domain.Constants;
 using HydraScript.Domain.FrontEnd.Parser;
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes;
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Declarations;
@@ -105,18 +106,18 @@ public Type Visit(InsideStatementJump visitable)
     {
         switch (visitable.Keyword)
         {
-            case InsideStatementJump.Break:
+            case InsideStatementJumpKeyword.Break:
                 if (!(visitable.ChildOf<IfStatement>() || visitable.ChildOf<WhileStatement>()))
                     throw new OutsideOfStatement(
                         visitable.Segment,
-                        keyword: InsideStatementJump.Break,
+                        visitable.Keyword,
                         statement: "if|while");
                 break;
-            case InsideStatementJump.Continue:
+            case InsideStatementJumpKeyword.Continue:
                 if (!visitable.ChildOf<WhileStatement>())
                     throw new OutsideOfStatement(
                         visitable.Segment,
-                        keyword: InsideStatementJump.Continue,
+                        visitable.Keyword,
                         statement: "while");
                 break;
         }
diff --git a/src/Domain/HydraScript.Domain.Constants/Eop.cs b/src/Domain/HydraScript.Domain.Constants/Eop.cs
@@ -0,0 +1,6 @@
+namespace HydraScript.Domain.Constants;
+
+public static class Eop
+{
+    public const string Tag = "EOP";
+}
diff --git a/src/Domain/HydraScript.Domain.Constants/HydraScript.Domain.Constants.csproj b/src/Domain/HydraScript.Domain.Constants/HydraScript.Domain.Constants.csproj
@@ -0,0 +1,7 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+    </PropertyGroup>
+
+</Project>
diff --git a/src/Domain/HydraScript.Domain.Constants/InsideStatementJumpKeyword.cs b/src/Domain/HydraScript.Domain.Constants/InsideStatementJumpKeyword.cs
@@ -0,0 +1,8 @@
+namespace HydraScript.Domain.Constants;
+
+public static class InsideStatementJumpKeyword
+{
+    public const string Break = "break";
+
+    public const string Continue = "continue";
+}
diff --git a/src/Domain/HydraScript.Domain.Constants/StringSyntaxAttribute.cs b/src/Domain/HydraScript.Domain.Constants/StringSyntaxAttribute.cs
@@ -0,0 +1,9 @@
+namespace HydraScript.Domain.Constants;
+
+internal class StringSyntaxAttribute(string syntax) : Attribute
+{
+    public const string Json = nameof(Json);
+
+    public override string ToString() =>
+        nameof(StringSyntaxAttribute) + "." + syntax;
+}
diff --git a/src/Domain/HydraScript.Domain.Constants/TokenTypesJson.cs b/src/Domain/HydraScript.Domain.Constants/TokenTypesJson.cs
@@ -1,6 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace HydraScript.Domain.FrontEnd.Lexer;
+namespace HydraScript.Domain.Constants;
 
 public static class TokenTypesJson
 {
diff --git a/src/Domain/HydraScript.Domain.FrontEnd/HydraScript.Domain.FrontEnd.csproj b/src/Domain/HydraScript.Domain.FrontEnd/HydraScript.Domain.FrontEnd.csproj
@@ -5,4 +5,8 @@
         <PackageReference Include="Visitor.NET.AutoVisitableGen" PrivateAssets="all" />
     </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\HydraScript.Domain.Constants\HydraScript.Domain.Constants.csproj" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/Domain/HydraScript.Domain.FrontEnd/Lexer/TokenTypes/EndOfProgramType.cs b/src/Domain/HydraScript.Domain.FrontEnd/Lexer/TokenTypes/EndOfProgramType.cs
@@ -1,6 +1,5 @@
+using HydraScript.Domain.Constants;
+
 namespace HydraScript.Domain.FrontEnd.Lexer.TokenTypes;
 
-internal record EndOfProgramType() : TokenType(EopTag)
-{
-    public const string EopTag = "EOP";
-}
+internal record EndOfProgramType() : TokenType(Eop.Tag);
diff --git a/src/Domain/HydraScript.Domain.FrontEnd/Parser/Impl/Ast/Nodes/Statements/InsideStatementJump.cs b/src/Domain/HydraScript.Domain.FrontEnd/Parser/Impl/Ast/Nodes/Statements/InsideStatementJump.cs
@@ -3,9 +3,6 @@ namespace HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Statements;
 [AutoVisitable<IAbstractSyntaxTreeNode>]
 public partial class InsideStatementJump(string keyword) : Statement
 {
-    public const string Break = "break";
-    public const string Continue = "continue";
-
     public string Keyword { get; } = keyword;
 
     protected override string NodeRepresentation() => Keyword;
diff --git a/src/Domain/HydraScript.Domain.FrontEnd/Parser/Impl/TopDownParser.cs b/src/Domain/HydraScript.Domain.FrontEnd/Parser/Impl/TopDownParser.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
 using System.Text.RegularExpressions;
+using HydraScript.Domain.Constants;
 using HydraScript.Domain.FrontEnd.Lexer;
-using HydraScript.Domain.FrontEnd.Lexer.TokenTypes;
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast;
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes;
 using HydraScript.Domain.FrontEnd.Parser.Impl.Ast.Nodes.Declarations;
@@ -27,7 +27,7 @@ public IAbstractSyntaxTree Parse(string text)
         _tokens = _lexer.GetTokens(text);
 
         var root = Script();
-        Expect(EndOfProgramType.EopTag);
+        Expect(Eop.Tag);
         return new AbstractSyntaxTree(root);
     }
 
@@ -108,13 +108,13 @@ private Statement Statement()
             return ReturnStatement();
 
         if (CurrentIsKeyword("break"))
-            return new InsideStatementJump(InsideStatementJump.Break)
+            return new InsideStatementJump(InsideStatementJumpKeyword.Break)
             {
                 Segment = Expect("Keyword", "break").Segment
             };
 
         if (CurrentIsKeyword("continue"))
-            return new InsideStatementJump(InsideStatementJump.Continue)
+            return new InsideStatementJump(InsideStatementJumpKeyword.Continue)
             {
                 Segment = Expect("Keyword", "continue").Segment
             };
diff --git a/src/Infrastructure/HydraScript.Infrastructure.LexerRegexGenerator/DefaultTokenTypesJsonStringProvider.cs b/src/Infrastructure/HydraScript.Infrastructure.LexerRegexGenerator/DefaultTokenTypesJsonStringProvider.cs
@@ -1,4 +1,4 @@
-using HydraScript.Domain.FrontEnd.Lexer;
+using HydraScript.Domain.Constants;
 
 namespace HydraScript.Infrastructure.LexerRegexGenerator;
 
diff --git a/src/Infrastructure/HydraScript.Infrastructure.LexerRegexGenerator/HydraScript.Infrastructure.LexerRegexGenerator.csproj b/src/Infrastructure/HydraScript.Infrastructure.LexerRegexGenerator/HydraScript.Infrastructure.LexerRegexGenerator.csproj
@@ -15,7 +15,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\Domain\HydraScript.Domain.FrontEnd\HydraScript.Domain.FrontEnd.csproj" />
+      <ProjectReference Include="..\..\Domain\HydraScript.Domain.Constants\HydraScript.Domain.Constants.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Infrastructure/HydraScript.Infrastructure/TokenTypesProvider.cs b/src/Infrastructure/HydraScript.Infrastructure/TokenTypesProvider.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using HydraScript.Domain.Constants;
 using HydraScript.Domain.FrontEnd.Lexer;
 using HydraScript.Domain.FrontEnd.Lexer.TokenTypes;
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using System.Diagnostics.CodeAnalysis;`
`2`		`-`
`3`		`-namespace HydraScript.Domain.FrontEnd.Lexer;`
	`1`	`+namespace HydraScript.Domain.Constants;`
`4`	`2`
`5`	`3`	`public static class TokenTypesJson`
`6`	`4`	`{`