Merge branch 'develop'

lexected · Sep 26, 2020 · 6364807 · 6364807
2 parents 029785f + eb34f13
commit 6364807
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 15 deletions.
diff --git a/astir/astir.vcxproj b/astir/astir.vcxproj
@@ -73,9 +73,13 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
@@ -84,13 +88,16 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -105,6 +112,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -134,6 +142,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -174,9 +183,6 @@
     <ClCompile Include="Resources\RawStream.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="Resources\SpecimenFiniteAutomaton.scpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="SemanticAnalysisException.cpp" />
     <ClCompile Include="SyntacticTree.cpp" />
     <ClCompile Include="Token.cpp" />
@@ -233,9 +239,6 @@
     <ClInclude Include="Resources\RawStream.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="Resources\SpecimenFiniteAutomaton.sh">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClInclude>
     <ClInclude Include="Resources\Terminal.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
     </ClInclude>
@@ -246,9 +249,17 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Grammar.astir" />
-    <None Include="Resources\SpecimenLLkParser.scpp" />
+    <None Include="Resources\SpecimenFiniteAutomaton.scpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+    </None>
+    <None Include="Resources\SpecimenFiniteAutomaton.sh">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+    </None>
+    <None Include="Resources\SpecimenLLkParser.scpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+    </None>
     <None Include="Resources\SpecimenLLkParser.sh">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </None>
     <None Include="Tests\Test01\Test01.alex" />
     <None Include="Tests\Test02\Test02.alex" />

diff --git a/astir/astir.vcxproj.filters b/astir/astir.vcxproj.filters
@@ -117,9 +117,6 @@
     <ClCompile Include="Token.cpp">
       <Filter>Source Files\Lexical Analysis</Filter>
     </ClCompile>
-    <ClCompile Include="Resources\SpecimenFiniteAutomaton.scpp">
-      <Filter>Resource Files\Resources</Filter>
-    </ClCompile>
     <ClCompile Include="GenerationHelper.cpp">
       <Filter>Source Files\Generation</Filter>
     </ClCompile>
@@ -233,9 +230,6 @@
     <ClInclude Include="IActing.h">
       <Filter>Header Files\Semantic Analysis</Filter>
     </ClInclude>
-    <ClInclude Include="Resources\SpecimenFiniteAutomaton.sh">
-      <Filter>Resource Files\Resources</Filter>
-    </ClInclude>
     <ClInclude Include="GenerationException.h">
       <Filter>Header Files\Generation</Filter>
     </ClInclude>
@@ -388,11 +382,17 @@
     <None Include="Tests\Test08\Test08.astir">
       <Filter>Resource Files\Tests\Test08</Filter>
     </None>
-    <None Include="Resources\SpecimenLLkParser.sh">
+    <None Include="Resources\SpecimenFiniteAutomaton.scpp">
+      <Filter>Resource Files\Resources</Filter>
+    </None>
+    <None Include="Resources\SpecimenFiniteAutomaton.sh">
       <Filter>Resource Files\Resources</Filter>
     </None>
     <None Include="Resources\SpecimenLLkParser.scpp">
       <Filter>Resource Files\Resources</Filter>
     </None>
+    <None Include="Resources\SpecimenLLkParser.sh">
+      <Filter>Resource Files\Resources</Filter>
+    </None>
   </ItemGroup>
 </Project>
diff --git a/astir/main.cpp b/astir/main.cpp
@@ -15,6 +15,7 @@ void printTokenList(const std::list<Token>& tokenList);
 int main(int argc, char* argv[]) {
 #ifndef TESTING
 	Dim::Cli cli;
+	cli.versionOpt("1.0.0");
 	auto& grammarFilePath = cli.opt<std::string>("<grammarFilePath>").desc("The path to the containing the grammar specification that is to be processed");
 	auto& outputDirectoryPath = cli.opt<std::string>("outputDirectory", ".").desc("The directory where the generated files are meant to go.");
 	if (!cli.parse(std::cerr, argc, argv))

diff --git a/docs/command-line_interface.md b/docs/command-line_interface.md
@@ -14,4 +14,5 @@ Options:
                             to go. (default: .)
 
   --help                    Show this message and exit.
+  --version                 Show version and exit.
 ```
diff --git a/releases/astir-v1.0.0-Winx64.zip b/releases/astir-v1.0.0-Winx64.zip
diff --git a/releases/astir-v1.0.0-Winx86.zip b/releases/astir-v1.0.0-Winx86.zip