General code and project cleanup

rbergen · Mar 23, 2021 · 1e621ae · 1e621ae
1 parent 3ee292d
commit 1e621ae
Show file tree

Hide file tree

Showing 22 changed files with 77 additions and 482 deletions.
diff --git a/MixAssembler/Assembler.cs b/MixAssembler/Assembler.cs
@@ -51,10 +51,8 @@ public static InstructionInstanceBase[] Assemble(string[] sourceLines, out PreIn
 
 					list.Add(instructionInstance);
 
-					if (instructionInstance != null && instructionInstance.Instruction is LoaderInstruction)
+					if (instructionInstance != null && instructionInstance.Instruction is LoaderInstruction loaderInstruction)
 					{
-						var loaderInstruction = (LoaderInstruction)instructionInstance.Instruction;
-
 						if (loaderInstruction.Operation == LoaderInstruction.Operations.SetLocationCounter)
 						{
 							status.LocationCounter = (int)((LoaderInstruction.Instance)instructionInstance).Value.LongValue;

diff --git a/MixAssembler/Instruction/MixInstructionParameters.cs b/MixAssembler/Instruction/MixInstructionParameters.cs
@@ -171,14 +171,14 @@ public static IInstructionParameters ParseAddressField(InstructionBase instructi
 				return null;
 			}
 
-			var index = IPartValue.ParseValue(addressField.Substring(indexCharIndex, sectionCharIndex - indexCharIndex), indexCharIndex, status);
+			var index = IPartValue.ParseValue(addressField[indexCharIndex..sectionCharIndex], indexCharIndex, status);
 			if (index == null)
 			{
 				status.ReportParsingError(indexCharIndex, sectionCharIndex - indexCharIndex, "unable to parse index");
 				return null;
 			}
 
-			var field = FPartValue.ParseValue(addressField.Substring(sectionCharIndex), sectionCharIndex, status);
+			var field = FPartValue.ParseValue(addressField[sectionCharIndex..], sectionCharIndex, status);
 			if (field == null)
 			{
 				status.ReportParsingError(sectionCharIndex, addressField.Length - sectionCharIndex, "unable to parse field");

diff --git a/MixAssembler/MixAssembler.csproj b/MixAssembler/MixAssembler.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net5.0-windows</TargetFramework>
     <OutputType>Library</OutputType>
@@ -16,11 +16,6 @@
   <ItemGroup>
     <Content Include="MixFormIcon.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="Symbol\SymbolBase.cs" />
-    <Compile Remove="Symbol\SymbolCollection.cs" />
-    <Compile Remove="Value\IValue.cs" />
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.2.212405">
       <PrivateAssets>all</PrivateAssets>

diff --git a/MixAssembler/Parser.cs b/MixAssembler/Parser.cs
@@ -24,8 +24,8 @@ public static class Parser
 		const int addressFieldIndex = 2;
 		const int commentFieldIndex = 3;
 
-		static readonly InstructionSet mInstructionSet = new InstructionSet();
-		static readonly LoaderInstructions mLoaderInstructions = new LoaderInstructions();
+		static readonly InstructionSet mInstructionSet = new();
+		static readonly LoaderInstructions mLoaderInstructions = new();
 
 		static bool IsCommentLine(string sourceLine)
 		{
@@ -283,7 +283,7 @@ static string[] SplitLine(string sourceLine)
 			var opFieldEnd = FindFirstWhiteSpace(sourceLine, opFieldStart);
 			if (opFieldEnd == -1)
 			{
-				return new string[] { sourceLine.Substring(0, searchBeyondIndex), sourceLine.Substring(opFieldStart), "", "" };
+				return new string[] { sourceLine.Substring(0, searchBeyondIndex), sourceLine[opFieldStart..], "", "" };
 			}
 
 			int opFieldLength = opFieldEnd - opFieldStart;
@@ -312,7 +312,7 @@ static string[] SplitLine(string sourceLine)
 
 			if (addressFieldEnd == -1)
 			{
-				return new string[] { sourceLine.Substring(0, searchBeyondIndex), sourceLine.Substring(opFieldStart, opFieldLength), sourceLine.Substring(addressFieldStart), "" };
+				return new string[] { sourceLine.Substring(0, searchBeyondIndex), sourceLine.Substring(opFieldStart, opFieldLength), sourceLine[addressFieldStart..], "" };
 			}
 
 			int addressFieldLength = addressFieldEnd - addressFieldStart;
@@ -322,7 +322,7 @@ static string[] SplitLine(string sourceLine)
 				return new string[] { sourceLine.Substring(0, searchBeyondIndex), sourceLine.Substring(opFieldStart, opFieldLength), sourceLine.Substring(addressFieldStart, addressFieldLength), "" };
 			}
 
-			return new string[] { sourceLine.Substring(0, searchBeyondIndex), sourceLine.Substring(opFieldStart, opFieldLength), sourceLine.Substring(addressFieldStart, addressFieldLength), sourceLine.Substring(commentFieldStart) };
+			return new string[] { sourceLine.Substring(0, searchBeyondIndex), sourceLine.Substring(opFieldStart, opFieldLength), sourceLine.Substring(addressFieldStart, addressFieldLength), sourceLine[commentFieldStart..] };
 		}
 	}
 }
diff --git a/MixAssembler/Properties/launchSettings.json b/MixAssembler/Properties/launchSettings.json
@@ -8,13 +8,6 @@
     }
   },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
     "MixAssembler": {
       "commandName": "Project",
       "launchBrowser": true,

diff --git a/MixAssembler/Symbol/LiteralConstantSymbol.cs b/MixAssembler/Symbol/LiteralConstantSymbol.cs
@@ -55,12 +55,12 @@ static string GetName(Word.Signs literalSign, long literalMagnitude, int count)
 
 		public static IValue ParseValue(string text, int sectionCharIndex, ParsingStatus status)
 		{
-			if (text.Length < 2 || text[0] != '=' || text[text.Length - 1] != '=')
+			if (text.Length < 2 || text[0] != '=' || text[^1] != '=')
 			{
 				return null;
 			}
 
-			var expressionValue = WValue.ParseValue(text.Substring(1, text.Length - 2), sectionCharIndex + 1, status);
+			var expressionValue = WValue.ParseValue(text[1..^1], sectionCharIndex + 1, status);
 			if (expressionValue == null)
 			{
 				return null;

diff --git a/MixAssembler/Symbol/LocalSymbol.cs b/MixAssembler/Symbol/LocalSymbol.cs
@@ -31,11 +31,6 @@ public override void SetValue(long value)
 			mAddresses.Add(value);
 		}
 
-		static bool IsBackwardReferenceChar(char c)
-		{
-			return c == 'B';
-		}
-
 		static bool IsDefinitionChar(char c)
 		{
 			return c == 'H';
@@ -53,7 +48,7 @@ static bool IsLocalSymbol(string text)
 
 		static bool IsLocalSymbolChar(char c)
 		{
-			return "BHF".IndexOf(c) >= 0;
+			return "BHF".Contains(c);
 		}
 
 		public override bool IsValueDefined(int currentAddress)
@@ -181,11 +176,10 @@ public bool IsValueDefined(int currentAddress)
 			/// <returns></returns>
 			public long GetValue(int currentAddress)
 			{
-				long previousAddress = -1L;
 				long followingAddress = -1L;
 				foreach (long refereeAddress in mReferee.Addresses)
 				{
-					previousAddress = followingAddress;
+					long previousAddress = followingAddress;
 					followingAddress = refereeAddress;
 
 					if (mDirection == Directions.Backwards && followingAddress >= currentAddress)

diff --git a/MixAssembler/Symbol/SymbolBase.cs b/MixAssembler/Symbol/SymbolBase.cs
diff --git a/MixAssembler/Symbol/SymbolCollection.cs b/MixAssembler/Symbol/SymbolCollection.cs
diff --git a/MixAssembler/Value/IValue.cs b/MixAssembler/Value/IValue.cs
diff --git a/MixEmul/Components/INavigableWordEditor.cs b/MixEmul/Components/INavigableWordEditor.cs
diff --git a/MixEmul/Components/SourceAndFindingsForm.cs b/MixEmul/Components/SourceAndFindingsForm.cs
@@ -4,7 +4,6 @@
 using MixLib.Instruction;
 using MixLib.Misc;
 using System;
-using System.ComponentModel;
 using System.Windows.Forms;
 
 namespace MixGui.Components
@@ -54,7 +53,7 @@ void InitializeComponent()
 			// mStatusStrip
 			// 
 			this.mStatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.mToolStripStatusLabel});
+						this.mToolStripStatusLabel});
 			this.mStatusStrip.Location = new System.Drawing.Point(0, 383);
 			this.mStatusStrip.Name = "mStatusStrip";
 			this.mStatusStrip.Size = new System.Drawing.Size(568, 22);
@@ -111,9 +110,9 @@ void InitializeComponent()
 			// 
 			// mFindingListView
 			// 
-			this.mFindingListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+			this.mFindingListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
 			this.mFindingListView.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
 			this.mFindingListView.Location = new System.Drawing.Point(0, 0);
 			this.mFindingListView.Name = "mFindingListView";

diff --git a/MixEmul/Documentation/Changes.txt b/MixEmul/Documentation/Changes.txt
@@ -9,6 +9,11 @@ x: Bugfix
 
 =========================================
 
+0.4.7752.30280 (2021-03-23)
+* Migrated to .NET 5.0
+* Applied visual changes, of which enabling visual styles is the most noticeable
+x Multiple small bugfixes, mainly in project/solution structure and builds
+
 0.3.7512.22699
 * Applied flat-style visual appearance throughout MixEmul
 x Fixed regression in this change list