Merge pull request CosmosOS#2657 from Project-Prism/master

Refactoring
cjdastudentdev · May 3, 2023 · 1862545 · 1862545
2 parents deed775 + ad589b6
commit 1862545
Show file tree

Hide file tree

Showing 51 changed files with 1,483 additions and 1,779 deletions.
diff --git a/Tests/Cosmos.TestRunner.TestController/Assert.cs b/Tests/Cosmos.TestRunner.TestController/Assert.cs
@@ -44,12 +44,14 @@ public static void AreEqual(int expected, int actual, string message, [CallerFil
             if (!xResult)
             {
                 TestController.Debugger.Send("Expected value");
-                TestController.Debugger.SendNumber((uint) expected);
+                TestController.Debugger.SendNumber(expected);
                 TestController.Debugger.Send("Actual value");
-                TestController.Debugger.SendNumber((uint)actual);
+                TestController.Debugger.SendNumber(actual);
 
-                TestController.Debugger.SendNumber("TestAssertion", "Expected", (uint)expected, 32);
-                TestController.Debugger.SendNumber("TestAssertion", "Actual", (uint)actual, 32);
+                TestController.Debugger.Send("Expected value");
+                TestController.Debugger.SendNumber(expected);
+                TestController.Debugger.Send("Actual value");
+                TestController.Debugger.SendNumber(actual);
 
                 TestController.Debugger.Send("Numbers sent!");
             }
@@ -130,8 +132,10 @@ public static void AreNotEqual(uint expected, uint actual, string message, [Call
                 TestController.Debugger.Send("Actual value");
                 TestController.Debugger.SendNumber((uint)actual);
 
-                TestController.Debugger.SendNumber("TestAssertion", "Expected", (uint)expected, 32);
-                TestController.Debugger.SendNumber("TestAssertion", "Actual", (uint)actual, 32);
+                TestController.Debugger.Send("Expected value");
+                TestController.Debugger.SendNumber(expected);
+                TestController.Debugger.Send("Actual value");
+                TestController.Debugger.SendNumber(actual);
 
                 TestController.Debugger.Send("Numbers sent!");
             }

diff --git a/Tests/Kernels/ConsoleTest/Kernel.cs b/Tests/Kernels/ConsoleTest/Kernel.cs
@@ -66,7 +66,7 @@ public void TestConsoleEncoding()
             Console.WriteLine("Let's write some accented characters: èòàùì");
             Console.WriteLine("Let's print all the CP437 codepage");
 
-            Sys.Global.mDebugger.SendInternal("");
+            Sys.Global.Debugger.SendInternal("");
 
             Console.Write("Ç ü é â ä à å ç ê ë è ï î ì Ä Å\n" +
                           "É æ Æ ô ö ò û ù ÿ Ö Ü ¢ £ ¥ ₧ ƒ\n" +
@@ -168,4 +168,4 @@ public void TestVariousConsoleFunctions()
             Console.SetCursorPosition(cursor.Left, cursor.Top - 1);
         }
     }
-}
+}
diff --git a/source/Cosmos.Core_Plugs/System/StringImpl.cs b/source/Cosmos.Core_Plugs/System/StringImpl.cs
@@ -1,6 +1,7 @@
 //#define COSMOSDEBUG
 using System;
 using System.Globalization;
+using System.Text;
 using Cosmos.Common;
 using IL2CPU.API;
 using IL2CPU.API.Attribs;
@@ -473,7 +474,7 @@ private static int boyerMooreHorsepool(string pattern, string text)
 
         public static int IndexOf(string aThis, string aSubstring, int aIdx, int aLength, StringComparison aComparison)
         {
-            if (aSubstring == String.Empty)
+            if (aSubstring == string.Empty)
             {
                 return aIdx;
             }
@@ -760,7 +761,7 @@ public static string TrimStart(string aThis, string aSubStr)
             throw new ArgumentNullException();
         }
 
-        internal static unsafe char *GetFirstChar(string aThis, [FieldAccess(Name = "System.Char System.String.m_firstChar")] char* aFirstChar)
+        internal static unsafe char* GetFirstChar(string aThis, [FieldAccess(Name = "System.Char System.String.m_firstChar")] char* aFirstChar)
         {
             return aFirstChar;
         }
@@ -880,16 +881,23 @@ private static unsafe int FastCompareStringHelper(uint* strAChars, int countA, u
                         char* ptr1 = (char*)((byte*)strBChars + diff);
                         char* ptr2 = (char*)strBChars;
                         if (*ptr1 != *ptr2)
-                            return (int)*ptr1 - (int)*ptr2;
-                        return (int)*(ptr1 + 1) - (int)*(ptr2 + 1);
+                        {
+                            return *ptr1 - *ptr2;
+                        }
+
+                        return *(ptr1 + 1) - *(ptr2 + 1);
                     }
                     ++strBChars;
                 }
 
                 int c;
                 if (count == -1)
+                {
                     if ((c = *(char*)((byte*)strBChars + diff) - *(char*)strBChars) != 0)
+                    {
                         return c;
+                    }
+                }
             }
 
             return countA - countB;
@@ -960,17 +968,12 @@ public static int Compare(string strA, int indexA, string strB, int indexB, int
             int lengthA = Math.Min(length, strA.Length - indexA);
             int lengthB = Math.Min(length, strB.Length - indexB);
 
-            switch (comparisonType)
+            return comparisonType switch
             {
-                case StringComparison.Ordinal:
-                    return CompareOrdinalHelper(strA, indexA, lengthA, strB, indexB, lengthB);
-
-                case StringComparison.OrdinalIgnoreCase:
-                    return CompareOrdinalHelperIgnoreCase(strA, indexA, lengthA, strB, indexB, lengthB);
-
-                default:
-                    throw new ArgumentException("Not Supported StringComparison");
-            }
+                StringComparison.Ordinal => CompareOrdinalHelper(strA, indexA, lengthA, strB, indexB, lengthB),
+                StringComparison.OrdinalIgnoreCase => CompareOrdinalHelperIgnoreCase(strA, indexA, lengthA, strB, indexB, lengthB),
+                _ => throw new ArgumentException("String comparison not supported!"),
+            };
         }
 
         public static unsafe int GetNonRandomizedHashCode(string aString)