Revert "Added some globalization and culture plugs. Also added string…

… and struct tests."

This reverts commit 815f2f7.

Tests/Cosmos.Compiler.Tests.Bcl/System/StringTest.cs

@@ -1,28 +1,16 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-
-using Cosmos.Debug.Kernel;
 using Cosmos.TestRunner;
 
 namespace Cosmos.Compiler.Tests.Bcl.System
 {
     public static class StringTest
     {
-        static Debugger mDebugger = new Debugger("Tests", "String Tests");
-
         public static void Execute()
         {
-            Assert.IsTrue(string.Empty == "", "string.Empty == \"\"");
-            int xResult = string.Compare("a", "a");
-            mDebugger.Send(xResult.ToString());
-            Assert.IsTrue(xResult == 0, "string.Compare(\"a\", \"a\") == 0");
-
-            Assert.IsTrue(
-                string.Compare("abc", "abc") == 0, "string.Compare(\"abc\", \"abc\") == 0");
-            Assert.IsTrue(("a" + "b") == "ab", "(\"a\" + \"b\") == \"ab\"");
-            Assert.IsTrue(("a" + 'b') == "ab", "concatting 1 string and 1 character doesn\"t work");
-            Assert.IsTrue(string.Concat("a", "b") == "ab", "string.Concat(\"a\", \"b\") == \"ab\"");
+            Assert.IsTrue(("a" + "b") == "ab", "concatting 2 string using + doesn't work");
+            Assert.IsTrue(("a" + 'b') == "ab", "concatting 1 string and 1 character doesn't work");
         }
     }
 }

Tests/SimpleStructsAndArraysTest/Kernel.cs

@@ -7,7 +7,7 @@
 
 namespace SimpleStructsAndArraysTest
 {
-    public class Kernel : Sys.Kernel
+    public class Kernel: Sys.Kernel
     {
         protected override void BeforeRun()
         {
@@ -53,13 +53,13 @@ private static void TestStep1()
             //Console.Write("Char: ");
             //Console.WriteLine(xResult.KeyChar);
             var xItem = new MyStruct
-            {
-                A = 1,
-                B = 2,
-                C = 3,
-                D = 4,
-                E = 5
-            };
+                        {
+                            A = 1,
+                            B = 2,
+                            C = 3,
+                            D = 4,
+                            E = 5
+                        };
 
             var xArray = new MyStruct[1];
             xArray[0] = xItem;
@@ -216,20 +216,20 @@ protected static void TestOurList()
             var xListClasses = new OurList<KVPClass>();
             var xListStructs = new OurList<KVPStruct>();
 
-            xListClasses.Add(new KVPClass { Key = 1, Value = 2 });
-            xListClasses.Add(new KVPClass { Key = 2, Value = 5 });
+            xListClasses.Add(new KVPClass {Key = 1, Value = 2});
+            xListClasses.Add(new KVPClass {Key = 2, Value = 5});
 
             OurList<KVPClass>.ExpectedIndex = 0;
             var xListItem = xListClasses[0];
             Assert.AreEqual(1, xListItem.Key, "xListClasses[0].Key == 1");
             Assert.AreEqual(2, xListItem.Value, "xListClasses[0].Value == 2");
             OurList<KVPClass>.ExpectedIndex = 1;
             xListItem = xListClasses[1];
-            Assert.AreEqual(2, xListItem.Key, "xListClasses[1].Key == 2");
+            Assert.AreEqual(2, xListItem.Key,   "xListClasses[1].Key == 2");
             Assert.AreEqual(5, xListItem.Value, "xListClasses[1].Value == 5");
 
-            xListStructs.Add(new KVPStruct { Key = 1, Value = 2 });
-            xListStructs.Add(new KVPStruct { Key = 2, Value = 5 });
+            xListStructs.Add(new KVPStruct {Key = 1, Value = 2});
+            xListStructs.Add(new KVPStruct {Key = 2, Value = 5});
 
             OurList<KVPStruct>.ExpectedIndex = 0;
             var xStructItem = xListStructs[0];
@@ -268,41 +268,13 @@ protected static void TestStandardList()
             Assert.AreEqual(5, xStructItem.Value, "xListStructs[1].Value == 5");
         }
 
-        private interface ITestMutate
-        {
-            void Mutate();
-        }
-
-        private struct TestMutateStruct : ITestMutate
-        {
-            int a;
-
-            public void Mutate()
-            {
-                a++;
-            }
-        }
-
-        private void DoMutate<T>(ref T x) where T : ITestMutate
-        {
-            x.Mutate();
-        }
-
-        private void MutateStructTest()
-        {
-            TestMutateStruct a = new TestMutateStruct();
-            DoMutate(ref a);
-        }
-
         protected override void Run()
         {
             TestStep1();
             TestOurList();
             Assert.IsTrue(true, "After TestOurList");
             TestStandardList();
             Assert.IsTrue(true, "After TestStandardList");
-            MutateStructTest();
-            Assert.IsTrue(true, "After MutateTestStruct");
             TestController.Completed();
         }
     }

source/Cosmos.Common/StringHelper.cs

@@ -12,15 +12,6 @@ public static class StringHelper
     {
         internal static Debugger mDebugger = new Debugger("Common", "String Helpers");
 
-        internal enum StringComparisonResultEnum
-        {
-            Less = -1,
-
-            Equal = 0,
-
-            Greater = 1
-        }
-
         public static string GetCharArrayString(char[] aArray)
         {
             if (aArray == null)
@@ -140,36 +131,5 @@ public static int GetStringToNumber(string aString)
 
             return xNumber;
         }
-
-        public static int Compare(
-            string aString1,
-            int aIndex1,
-            string aString2,
-            int aIndex2,
-            int aLength1,
-            int aLength2)
-        {
-            if (aString1.Length < aString2.Length)
-            {
-                return (int)StringComparisonResultEnum.CSTR_LESS_THAN;
-            }
-            if (aString1.Length > aString2.Length)
-            {
-                return (int)StringComparisonResultEnum.CSTR_GREATER_THAN;
-            }
-
-            for (int i = aString1.Length; i < aString1.Length; i++)
-            {
-                if (aString1[i] < aString2[i])
-                {
-                    return (int)StringComparisonResultEnum.CSTR_LESS_THAN;
-                }
-                if (aString1[i] > aString2[i])
-                {
-                    return (int)StringComparisonResultEnum.CSTR_GREATER_THAN;
-                }
-            }
-            return (int)StringComparisonResultEnum.CSTR_EQUAL;
-        }
     }
 }

source/Cosmos.Core.Plugs/Cosmos.Core.Plugs.csproj

@@ -86,10 +86,6 @@
     <Compile Include="System\Assemblers\InvokeImplAssembler.cs" />
     <Compile Include="System\Buffer.cs" />
     <Compile Include="System\DelegateImpl.cs" />
-    <Compile Include="System\Globalization\CompareInfoImpl.cs" />
-    <Compile Include="System\Globalization\CultureInfoImpl.cs" />
-    <Compile Include="System\Globalization\NumberFormatInfoImpl.cs" />
-    <Compile Include="System\Globalization\TextInfoImpl.cs" />
     <Compile Include="System\IO\PathHelperImpl.cs" />
     <Compile Include="System\MulticastDelegateImpl.cs" />
     <Compile Include="System\NormalDelegateImpl.cs" />
@@ -134,7 +130,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Cosmos.snk" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

source/Cosmos.Core.Plugs/System/StringImpl.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Globalization;
+using System.Text;
 
 using Cosmos.Common;
 using Cosmos.IL2CPU.Plugs;
@@ -50,11 +51,11 @@ public static unsafe void Ctor(
         }
 
         public static unsafe void Ctor(
-            string aThis,
-            char[] aChars,
-            [FieldAccess(Name = "System.String System.String.Empty")] ref string aStringEmpty,
-            [FieldAccess(Name = "System.Int32 System.String.m_stringLength")] ref int aStringLength,
-            [FieldAccess(Name = "System.Char System.String.m_firstChar")] char* aFirstChar)
+                    string aThis,
+                    char[] aChars,
+                    [FieldAccess(Name = "System.String System.String.Empty")] ref string aStringEmpty,
+                    [FieldAccess(Name = "System.Int32 System.String.m_stringLength")] ref int aStringLength,
+                    [FieldAccess(Name = "System.Char System.String.m_firstChar")] char* aFirstChar)
         {
             aStringEmpty = "";
             aStringLength = aChars.Length;
@@ -594,6 +595,8 @@ public static bool EndsWith(string aThis, string aSubStr, StringComparison aComp
             }
         }
 
+        //        System.Int32  System.String.IndexOf(System.String, System.Int32, System.Int32, System.StringComparison)
+
         public static bool Equals(string aThis, string aThat, StringComparison aComparison)
         {
 #warning TODO: implement
@@ -606,23 +609,9 @@ public static bool Equals(string aThis, string aThat, StringComparison aComparis
             return EqualsHelper(aThis, aThat);
         }
 
-        public static bool EqualsHelper(string strA, string strB)
+        public static bool EqualsHelper(string aStrA, string aStrB)
         {
-            int xLength1 = strA.Length;
-            int xLength2 = strB.Length;
-
-            if (xLength1 != xLength2)
-            {
-                return false;
-            }
-            for (int i = 0; i < xLength1; i++)
-            {
-                if (strA[i] != strB[i])
-                {
-                    return false;
-                }
-            }
-            return true;
+            return aStrA.CompareTo(aStrB) == 0;
         }
 
         private static bool CharArrayContainsChar(char[] aArray, char aChar)