Merge pull request #3058 from icsharpcode/switch-on-readonlyspan-char

icsharpcode · Aug 24, 2023 · a60b92e · a60b92e
2 parents 7c8b497 + 70616b3
commit a60b92e
Show file tree

Hide file tree

Showing 10 changed files with 232 additions and 81 deletions.
diff --git a/ICSharpCode.Decompiler.Tests/Helpers/Tester.VB.cs b/ICSharpCode.Decompiler.Tests/Helpers/Tester.VB.cs
@@ -60,13 +60,16 @@ public static async Task<CompilerResults> CompileVB(string sourceFileName, Compi
 				var vbcPath = roslynToolset.GetVBCompiler(roslynVersion);
 
 				IEnumerable<string> references;
+				string libPath;
 				if ((flags & CompilerOptions.UseRoslynMask) != 0 && (flags & CompilerOptions.TargetNet40) == 0)
 				{
 					references = coreDefaultReferences.Select(r => "-r:\"" + r + "\"");
+					libPath = coreRefAsmPath;
 				}
 				else
 				{
 					references = defaultReferences.Select(r => "-r:\"" + r + "\"");
+					libPath = RefAsmPath;
 				}
 				if (flags.HasFlag(CompilerOptions.ReferenceVisualBasic))
 				{
@@ -116,7 +119,7 @@ public static async Task<CompilerResults> CompileVB(string sourceFileName, Compi
 				}
 
 				var command = Cli.Wrap(vbcPath)
-					.WithArguments($"{otherOptions}{string.Join(" ", references)} -out:\"{Path.GetFullPath(results.PathToAssembly)}\" {string.Join(" ", sourceFileNames.Select(fn => '"' + Path.GetFullPath(fn) + '"'))}")
+					.WithArguments($"{otherOptions}-libpath:\"{libPath}\" {string.Join(" ", references)} -out:\"{Path.GetFullPath(results.PathToAssembly)}\" {string.Join(" ", sourceFileNames.Select(fn => '"' + Path.GetFullPath(fn) + '"'))}")
 					.WithValidation(CommandResultValidation.None);
 				Console.WriteLine($"\"{command.TargetFilePath}\" {command.Arguments}");
 

diff --git a/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs b/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs
@@ -295,6 +295,7 @@ private static string ReplacePrivImplDetails(string il)
 				"System.Linq.Expressions.dll",
 				"System.Linq.Queryable.dll",
 				"System.IO.FileSystem.Watcher.dll",
+				"System.Memory.dll",
 				"System.Threading.dll",
 				"System.Threading.Thread.dll",
 				"System.Runtime.dll",

diff --git a/ICSharpCode.Decompiler.Tests/TestCases/Pretty/Switch.cs b/ICSharpCode.Decompiler.Tests/TestCases/Pretty/Switch.cs
@@ -1509,5 +1509,54 @@ public static void Issue2763(int value)
 					break;
 			}
 		}
+
+
+#if CS110 && NET70
+		public static string SwitchOverReadOnlySpanChar1(ReadOnlySpan<char> text)
+		{
+			Console.WriteLine("SwitchOverReadOnlySpanChar1:");
+			switch (text)
+			{
+				case "First case":
+					return "Text1";
+				case "Second case":
+				case "2nd case":
+					return "Text2";
+				case "Third case":
+					return "Text3";
+				case "Fourth case":
+					return "Text4";
+				case "Fifth case":
+					return "Text5";
+				case "Sixth case":
+					return "Text6";
+				default:
+					return "Default";
+			}
+		}
+
+		public static string SwitchOverSpanChar1(Span<char> text)
+		{
+			Console.WriteLine("SwitchOverSpanChar1:");
+			switch (text)
+			{
+				case "First case":
+					return "Text1";
+				case "Second case":
+				case "2nd case":
+					return "Text2";
+				case "Third case":
+					return "Text3";
+				case "Fourth case":
+					return "Text4";
+				case "Fifth case":
+					return "Text5";
+				case "Sixth case":
+					return "Text6";
+				default:
+					return "Default";
+			}
+		}
+#endif
 	}
 }
diff --git a/ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs b/ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs
@@ -3898,7 +3898,7 @@ protected internal override TranslatedExpression VisitSwitchInstruction(SwitchIn
 			{
 				value = Translate(strToInt.Argument)
 					.ConvertTo(
-						typeSystem.FindType(KnownTypeCode.String),
+						strToInt.ExpectedType,
 						this,
 						allowImplicitConversion: false // switch-expression does not support implicit conversions
 					);

diff --git a/ICSharpCode.Decompiler/CSharp/StatementBuilder.cs b/ICSharpCode.Decompiler/CSharp/StatementBuilder.cs
@@ -214,7 +214,7 @@ SwitchStatement TranslateSwitch(BlockContainer switchContainer, SwitchInstructio
 			{
 				value = exprBuilder.Translate(strToInt.Argument)
 					.ConvertTo(
-						typeSystem.FindType(KnownTypeCode.String),
+						strToInt.ExpectedType,
 						exprBuilder,
 						// switch statement does support implicit conversions in general, however, the rules are
 						// not very intuitive and in order to prevent bugs, we emit an explicit cast.

diff --git a/ICSharpCode.Decompiler/DecompilerSettings.cs b/ICSharpCode.Decompiler/DecompilerSettings.cs
@@ -1206,6 +1206,24 @@ public bool Utf8StringLiterals {
 			}
 		}
 
+		bool switchOnReadOnlySpanChar = true;
+
+		/// <summary>
+		/// Gets/Sets whether to use C# 11.0 switch on (ReadOnly)Span&lt;char&gt;
+		/// </summary>
+		[Category("C# 11.0 / VS 2022.4")]
+		[Description("DecompilerSettings.SwitchOnReadOnlySpanChar")]
+		public bool SwitchOnReadOnlySpanChar {
+			get { return switchOnReadOnlySpanChar; }
+			set {
+				if (switchOnReadOnlySpanChar != value)
+				{
+					switchOnReadOnlySpanChar = value;
+					OnPropertyChanged();
+				}
+			}
+		}
+
 		bool unsignedRightShift = true;
 
 		/// <summary>

diff --git a/ICSharpCode.Decompiler/IL/Instructions/StringToInt.cs b/ICSharpCode.Decompiler/IL/Instructions/StringToInt.cs
@@ -20,21 +20,26 @@
 
 using System.Collections.Generic;
 
+using ICSharpCode.Decompiler.TypeSystem;
+
 namespace ICSharpCode.Decompiler.IL
 {
 	partial class StringToInt
 	{
 		public List<(string? Key, int Value)> Map { get; }
 
-		public StringToInt(ILInstruction argument, List<(string? Key, int Value)> map)
+		public IType ExpectedType { get; }
+
+		public StringToInt(ILInstruction argument, List<(string? Key, int Value)> map, IType expectedType)
 			: base(OpCode.StringToInt)
 		{
 			this.Argument = argument;
 			this.Map = map;
+			this.ExpectedType = expectedType;
 		}
 
-		public StringToInt(ILInstruction argument, string?[] map)
-			: this(argument, ArrayToDictionary(map))
+		public StringToInt(ILInstruction argument, string?[] map, IType expectedType)
+			: this(argument, ArrayToDictionary(map), expectedType)
 		{
 		}
 
@@ -51,7 +56,9 @@ public StringToInt(ILInstruction argument, string?[] map)
 		public override void WriteTo(ITextOutput output, ILAstWritingOptions options)
 		{
 			WriteILRange(output, options);
-			output.Write("string.to.int (");
+			output.Write("string.to.int ");
+			ExpectedType.WriteTo(output);
+			output.Write('(');
 			Argument.WriteTo(output, options);
 			output.Write(", { ");
 			int i = 0;