Folder re-organisation to support a second language, interaction.

AutoStep.sln

@@ -14,6 +14,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B325ED87-DF44-45DE-97D7-0B3ECB33EBB8}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		.gitignore = .gitignore
 		Analysis.ruleset = Analysis.ruleset
 		.github\workflows\dotnetcore-pull.yml = .github\workflows\dotnetcore-pull.yml
 		.github\workflows\dotnetcore.yml = .github\workflows\dotnetcore.yml
@@ -24,12 +25,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoStep.Benchmarks", "tests\AutoStep.Benchmarks\AutoStep.Benchmarks.csproj", "{6E33D397-17E7-4FF7-BDD6-378FBBD7143E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoStep.Compiler.Tests.DefinedSteps", "tests\AutoStep.Compiler.Tests.DefinedSteps\AutoStep.Compiler.Tests.DefinedSteps.csproj", "{B8B3CB37-E75A-4DE2-A9C4-3B2AA47CBE7E}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{F99CA4C3-5280-4AD3-AA99-A19F5696E790}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExtensionMethodsGenerator", "tools\ExtensionMethodsGenerator\ExtensionMethodsGenerator.csproj", "{5D1155A0-148F-47BD-A520-4D7783D92CE5}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoStep.Language.Tests.DefinedSteps", "tests\AutoStep.Language.Tests.DefinedSteps\AutoStep.Language.Tests.DefinedSteps.csproj", "{C29287BC-F99F-4EDA-8931-13E0B9F2A4B8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -48,14 +49,14 @@ Global
 		{6E33D397-17E7-4FF7-BDD6-378FBBD7143E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6E33D397-17E7-4FF7-BDD6-378FBBD7143E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6E33D397-17E7-4FF7-BDD6-378FBBD7143E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B8B3CB37-E75A-4DE2-A9C4-3B2AA47CBE7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B8B3CB37-E75A-4DE2-A9C4-3B2AA47CBE7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B8B3CB37-E75A-4DE2-A9C4-3B2AA47CBE7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B8B3CB37-E75A-4DE2-A9C4-3B2AA47CBE7E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5D1155A0-148F-47BD-A520-4D7783D92CE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5D1155A0-148F-47BD-A520-4D7783D92CE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5D1155A0-148F-47BD-A520-4D7783D92CE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5D1155A0-148F-47BD-A520-4D7783D92CE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C29287BC-F99F-4EDA-8931-13E0B9F2A4B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C29287BC-F99F-4EDA-8931-13E0B9F2A4B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C29287BC-F99F-4EDA-8931-13E0B9F2A4B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C29287BC-F99F-4EDA-8931-13E0B9F2A4B8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -64,8 +65,8 @@ Global
 		{84C1FA95-86AC-4F62-AA4B-43CAE1E8872A} = {B7AB09B6-B6D6-45F8-A7ED-FF74186DD710}
 		{51675B89-B4D1-4177-8851-75A1C3AD14A9} = {379393AA-F9FE-4FC3-A078-9FC3086A948B}
 		{6E33D397-17E7-4FF7-BDD6-378FBBD7143E} = {379393AA-F9FE-4FC3-A078-9FC3086A948B}
-		{B8B3CB37-E75A-4DE2-A9C4-3B2AA47CBE7E} = {379393AA-F9FE-4FC3-A078-9FC3086A948B}
 		{5D1155A0-148F-47BD-A520-4D7783D92CE5} = {F99CA4C3-5280-4AD3-AA99-A19F5696E790}
+		{C29287BC-F99F-4EDA-8931-13E0B9F2A4B8} = {379393AA-F9FE-4FC3-A078-9FC3086A948B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {99035EAA-06A5-490D-9FEE-3EED01E71657}

src/AutoStep/AutoStep.csproj

@@ -21,9 +21,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="Compiler\Parser\.antlr\**" />
-    <EmbeddedResource Remove="Compiler\Parser\.antlr\**" />
-    <None Remove="Compiler\Parser\.antlr\**" />
+    <Compile Remove="Language\Test\Parser\.antlr\**" />
+    <EmbeddedResource Remove="Language\Test\Parser\.antlr\**" />
+    <None Remove="Language\Test\Parser\.antlr\**" />
     <None Include="..\..\build\nuget-icon.png">
       <Pack>True</Pack>
       <PackagePath></PackagePath>
@@ -47,17 +47,22 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Compiler\AutoStepLinkerMessages.Designer.cs">
+    <Compile Update="Language\Interaction\CompilerLogMessages.Designer.cs">
+      <DependentUpon>CompilerLogMessages.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+    </Compile>
+    <Compile Update="Language\Test\AutoStepLinkerMessages.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>AutoStepLinkerMessages.resx</DependentUpon>
     </Compile>
-    <Compile Update="Compiler\CompilerLogMessages.Designer.cs">
+    <Compile Update="Language\Test\CompilerLogMessages.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>CompilerLogMessages.resx</DependentUpon>
     </Compile>
-    <Compile Update="Compiler\CompilerMessageCodeText.Designer.cs">
+    <Compile Update="Language\CompilerMessageCodeText.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>CompilerMessageCodeText.resx</DependentUpon>
@@ -77,12 +82,12 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>LanguageEngineExceptionMessages.resx</DependentUpon>
     </Compile>
-    <Compile Update="Compiler\Matching\MatchingTreeMessages.Designer.cs">
+    <Compile Update="Language\Test\Matching\MatchingTreeMessages.Designer.cs">
       <DependentUpon>MatchingTreeMessages.resx</DependentUpon>
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
     </Compile>
-    <Compile Update="Compiler\TokenStreamExtensionsMessages.Designer.cs">
+    <Compile Update="Language\TokenStreamExtensionsMessages.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>TokenStreamExtensionsMessages.resx</DependentUpon>
@@ -95,15 +100,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Update="Compiler\AutoStepLinkerMessages.resx">
+    <EmbeddedResource Update="Language\Interaction\CompilerLogMessages.resx">
+      <LastGenOutput>CompilerLogMessages.Designer.cs</LastGenOutput>
+      <Generator>ResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Language\Test\AutoStepLinkerMessages.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>AutoStepLinkerMessages.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Update="Compiler\CompilerLogMessages.resx">
+    <EmbeddedResource Update="Language\Test\CompilerLogMessages.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>CompilerLogMessages.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Update="Compiler\CompilerMessageCodeText.resx">
+    <EmbeddedResource Update="Language\CompilerMessageCodeText.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>CompilerMessageCodeText.Designer.cs</LastGenOutput>
     </EmbeddedResource>
@@ -119,11 +128,11 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>LanguageEngineExceptionMessages.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Update="Compiler\Matching\MatchingTreeMessages.resx">
+    <EmbeddedResource Update="Language\Test\Matching\MatchingTreeMessages.resx">
       <LastGenOutput>MatchingTreeMessages.Designer.cs</LastGenOutput>
       <Generator>ResXFileCodeGenerator</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Compiler\TokenStreamExtensionsMessages.resx">
+    <EmbeddedResource Update="Language\TokenStreamExtensionsMessages.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>TokenStreamExtensionsMessages.Designer.cs</LastGenOutput>
     </EmbeddedResource>
@@ -133,4 +142,8 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Elements\Interaction\" />
+  </ItemGroup>
+
 </Project>

src/AutoStep/Elements/Parts/ArgumentPart.cs

@@ -1,5 +1,5 @@
 using System;
-using AutoStep.Compiler;
+using AutoStep.Language;
 using AutoStep.Elements.StepTokens;
 
 namespace AutoStep.Elements.Parts

src/AutoStep/Elements/Parts/WordDefinitionPart.cs

@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using AutoStep.Compiler;
-using AutoStep.Compiler.Matching;
-using AutoStep.Definitions;
 using AutoStep.Elements.StepTokens;
 
 namespace AutoStep.Elements.Parts

src/AutoStep/Elements/ReadOnly/IStepDefinitionInfo.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using AutoStep.Compiler;
+using AutoStep.Language;
 using AutoStep.Elements.StepTokens;
 
 namespace AutoStep.Elements.Metadata

src/AutoStep/Elements/ReadOnly/IStepReferenceInfo.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Text;
-using AutoStep.Compiler;
+using AutoStep.Language;
 using AutoStep.Elements.StepTokens;
 
 namespace AutoStep.Elements.Metadata

src/AutoStep/Elements/StepReferenceElement.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using AutoStep.Compiler;
-using AutoStep.Compiler.Matching;
-using AutoStep.Definitions;
+using AutoStep.Language;
 using AutoStep.Elements.Metadata;
 using AutoStep.Elements.StepTokens;
 

src/AutoStep/Elements/StepTokens/StepToken.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using AutoStep.Compiler.Matching;
-using AutoStep.Definitions;
-
-namespace AutoStep.Elements.StepTokens
+namespace AutoStep.Elements.StepTokens
 {
     /// <summary>
     /// Defines the notion of a step token; a range of characters within the defined step text. Similar to the internal Antlr tokens, but slightly simpler,

src/AutoStep/Execution/TokenBindingExtensions.cs

@@ -1,5 +1,5 @@
 using System;
-using AutoStep.Compiler;
+using AutoStep.Language;
 using AutoStep.Elements.Metadata;
 using AutoStep.Elements.StepTokens;
 using AutoStep.Execution.Dependency;

src/AutoStep/Compiler/BaseAutoStepErrorHandlingContext.cs → src/AutoStep/Language/BaseAutoStepErrorHandlingContext.cs

@@ -1,16 +1,15 @@
 using System;
-using System.Globalization;
 using Antlr4.Runtime;
 using Antlr4.Runtime.Misc;
-using AutoStep.Compiler.Parser;
 
-namespace AutoStep.Compiler
+namespace AutoStep.Language
 {
     /// <summary>
     /// Represents a base syntax error handling context, that allows for managed
     /// error matching based on the state of the parser and the position in the token stream.
     /// </summary>
-    internal abstract class BaseAutoStepErrorHandlingContext
+    internal abstract class BaseAutoStepErrorHandlingContext<TParser>
+        where TParser : Antlr4.Runtime.Parser
     {
         private Func<bool>[]? handlers;
 
@@ -24,7 +23,7 @@ internal abstract class BaseAutoStepErrorHandlingContext
         public BaseAutoStepErrorHandlingContext(ITokenStream tokenStream, IRecognizer recognizer, IToken offendingSymbol, RecognitionException? ex)
         {
             TokenStream = tokenStream;
-            Parser = (AutoStepParser)recognizer;
+            Parser = (TParser)recognizer;
             OffendingSymbol = offendingSymbol;
             Exception = ex;
             StartingSymbol = OffendingSymbol;
@@ -67,7 +66,7 @@ public BaseAutoStepErrorHandlingContext(ITokenStream tokenStream, IRecognizer re
         /// <summary>
         /// Gets the parser instance.
         /// </summary>
-        protected AutoStepParser Parser { get; }
+        protected TParser Parser { get; }
 
         /// <summary>
         /// Gets the offending token from the Antlr syntax error.

src/AutoStep/Compiler/CompilerDiagnosticException.cs → src/AutoStep/Language/CompilerDiagnosticException.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AutoStep.Compiler;
 
-namespace AutoStep
+namespace AutoStep.Language
 {
     /// <summary>
     /// Represents a compiler diagnostic exception, currently only thrown by the <see cref="AutoStepLineTokeniser"/>.

src/AutoStep/Compiler/CompilerMessage.cs → src/AutoStep/Language/CompilerMessage.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace AutoStep.Compiler
+namespace AutoStep.Language
 {
     /// <summary>
     /// Defines a compiler message.

src/AutoStep/Compiler/CompilerMessageCode.cs → src/AutoStep/Language/CompilerMessageCode.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace AutoStep.Compiler
+namespace AutoStep.Language
 {
 #pragma warning disable SA1025 // Code should not contain multiple whitespace in a row
 

src/AutoStep/Compiler/CompilerMessageFactory.cs → src/AutoStep/Language/CompilerMessageFactory.cs

@@ -1,10 +1,9 @@
 using System.Globalization;
 using Antlr4.Runtime;
-using AutoStep.Compiler.Matching;
 using AutoStep.Elements;
 using AutoStep.Elements.StepTokens;
 
-namespace AutoStep.Compiler
+namespace AutoStep.Language
 {
     /// <summary>
     /// Factory for creating compiler messages.

src/AutoStep/Compiler/CompilerMessageLevel.cs → src/AutoStep/Language/CompilerMessageLevel.cs

@@ -1,4 +1,4 @@
-namespace AutoStep.Compiler
+namespace AutoStep.Language
 {
     /// <summary>
     /// Defines the possible compiler message levels.

src/AutoStep/Compiler/CompilerResult.cs → src/AutoStep/Language/CompilerResult.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace AutoStep.Compiler
+namespace AutoStep.Language
 {
     /// <summary>
     /// Base class for all compilation/link results.

src/AutoStep/Compiler/IContentSource.cs → src/AutoStep/Language/IContentSource.cs

@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AutoStep.Compiler
+namespace AutoStep.Language
 {
     /// <summary>
     /// Defines an interface for anything that provides content for the autostep compiler.