CLJCLR-175: Fix aset throwing an exception when arg is typeArray by inference (say by aclone)

Author: dmiller

Clojure/Clojure.Source/clojure/gvec.clj

@@ -454,7 +454,7 @@ Object
   System.Collections.ICollection
   (CopyTo [this arr offset]
      (dotimes [i cnt]
-       (aset arr (+ i offset) (.nth this i))))
+       (.SetValue ^Array arr (.nth this i) (int (+ i offset)))))
 
   (get_Count [_] cnt)
   (get_IsSynchronized [_] true)

Clojure/Clojure/Lib/RT.cs

@@ -52,7 +52,8 @@ static Dictionary<Symbol, Type> CreateDefaultImportDictionary()
 
         static IEnumerable<Type> GetAllTypesInNamespace(string nspace)
         {
-            Func<Assembly, IEnumerable<Type>> getTypes = (Assembly a) => {
+            Func<Assembly, IEnumerable<Type>> getTypes = (Assembly a) =>
+            {
                 try { return a.GetTypes(); } catch (Exception) { return new Type[0]; }
             };
             var q = AppDomain.CurrentDomain.GetAssemblies()
@@ -74,7 +75,7 @@ static IEnumerable<Type> GetAllTypesInNamespace(string nspace)
 
         public static readonly object[] EmptyObjectArray = new Object[] { };
 
-        static readonly RTProperties _versionProperties = new RTProperties();
+        static readonly RTProperties _versionProperties = new();
 
         public static RTProperties GetVersionProperties() { return _versionProperties; }
 
@@ -83,7 +84,7 @@ static IEnumerable<Type> GetAllTypesInNamespace(string nspace)
         // for folks using Cygwin and its ilk.
         public const string ClojureLoadPathString = "CLOJURE_LOAD_PATH";
 
-        static public readonly Object REQUIRE_LOCK = new Object();
+        static public readonly Object REQUIRE_LOCK = new();
 
         #endregion
 
@@ -123,7 +124,7 @@ public static readonly Namespace ClojureNamespace
         public static readonly Keyword TagKey
             = Keyword.intern(null, "tag");
 
-        public static readonly Keyword ParamTagsKey 
+        public static readonly Keyword ParamTagsKey
             = Keyword.intern(null, "param-tags");
 
         public static readonly Keyword ConstKey
@@ -336,7 +337,7 @@ public override object invoke(object arg1)
 
         static Assembly ResolveAssembly(object sender, ResolveEventArgs args)
         {
-            AssemblyName asmName = new AssemblyName(args.Name);
+            AssemblyName asmName = new(args.Name);
             var name = asmName.Name;
             var stream = GetEmbeddedResourceStream(name, out _);
             if (stream == null)
@@ -371,16 +372,16 @@ static RT()
 
             // TODO: Check for existence of ClojureContext.Default before doing this?
 
-            ScriptRuntimeSetup setup = new ScriptRuntimeSetup();
-            LanguageSetup lsetup = new LanguageSetup(
+            ScriptRuntimeSetup setup = new();
+            LanguageSetup lsetup = new(
                 typeof(ClojureContext).AssemblyQualifiedName,
                 ClojureContext.ClojureDisplayName,
                 ClojureContext.ClojureNames.Split(new Char[] { ';' }),
                 ClojureContext.ClojureFileExtensions.Split(new Char[] { ';' }));
 
 
             setup.LanguageSetups.Add(lsetup);
-            ScriptRuntime env = new ScriptRuntime(setup);
+            ScriptRuntime env = new(setup);
             env.GetEngine("clj");
 
 
@@ -2375,7 +2376,7 @@ public static object[] toArray(object coll)
 
         private static object[] IEnumToArray(IEnumerable e)
         {
-            List<object> list = new List<object>();
+            List<object> list = new();
             foreach (object o in e)
                 list.Add(o);
 
@@ -2503,7 +2504,7 @@ public static bool suppressRead()
 
         static public string printString(object x)
         {
-            using (StringWriter sw = new StringWriter())
+            using (StringWriter sw = new())
             {
                 print(x, sw);
                 return sw.ToString();
@@ -2519,7 +2520,7 @@ static public Object readString(String s)
 
         static public Object readString(String s, Object opts)
         {
-            using (PushbackTextReader r = new PushbackTextReader(new StringReader(s)))
+            using (PushbackTextReader r = new(new StringReader(s)))
                 return LispReader.read(r, opts);
         }
 
@@ -2784,7 +2785,7 @@ public static Type classForName(string p)
 
             AppDomain domain = AppDomain.CurrentDomain;
             Assembly[] assys = domain.GetAssemblies();
-            List<Type> candidateTypes = new List<Type>();
+            List<Type> candidateTypes = new();
 
             // fast path, will succeed for namespace qualified names (returned by Type.FullName)
             // e.g. "UnityEngine.Transform"
@@ -2864,11 +2865,83 @@ public static int alength(Array a)
         }
 
 
-        public static Array aclone(Array a)
+        //public static Array aclone(Array a)
+        //{
+        //    return (Array)a.Clone();
+        //}
+
+        public static object[] aclone(Object[] a)
+        {
+            return (Object[])a.Clone();
+        }
+
+        public static bool[] aclone(bool[] a)
+        {
+            return (bool[])a.Clone();
+        }
+
+        public static byte[] aclone(byte[] a)
+        {
+            return (byte[])a.Clone();
+        }
+
+        public static sbyte[] aclone(sbyte[] a)
+        {
+            return (sbyte[])a.Clone();
+        }
+
+        public static char[] aclone(char[] a)
         {
-            return (Array)a.Clone();
+            return (char[])a.Clone();
         }
 
+        public static short[] aclone(short[] a)
+        {
+            return (short[])a.Clone();
+        }
+
+        public static ushort[] aclone(ushort[] a)
+        {
+            return (ushort[])a.Clone();
+        }
+
+        public static int[] aclone(int[] a)
+        {
+            return (int[])a.Clone();
+        }
+
+        public static uint[] aclone(uint[] a)
+        {
+            return (uint[])a.Clone();
+        }
+
+        public static long[] aclone(long[] a)
+        {
+            return (long[])a.Clone();
+        }
+
+        public static ulong[] aclone(ulong[] a)
+        {
+            return (ulong[])a.Clone();
+        }
+
+        public static float[] aclone(float[] a)
+        {
+            return (float[])a.Clone();
+        }
+
+        public static double[] aclone(double[] a)
+        {
+            return (double[])a.Clone();
+        }
+
+        public static decimal[] aclone(decimal[] a)
+        {
+            return (decimal[])a.Clone();
+        }
+
+
+
 
         public static object aget(Array a, int idx)
         {
@@ -2883,11 +2956,11 @@ public static object agetOnArray(Array a, int idx)
             return a.GetValue(idx);
         }
 
-        public static object aset(Array a, int idx, object val)
-        {
-            a.SetValue(val, idx);
-            return val;
-        }
+        //public static object aset(Array a, int idx, object val)
+        //{
+        //    a.SetValue(val, idx);
+        //    return val;
+        //}
 
 
 
@@ -3141,7 +3214,7 @@ public static long nanoTime()
             return DateTime.Now.Ticks * 100;
         }
 
-        private static readonly Stopwatch _stopwatch = new Stopwatch();
+        private static readonly Stopwatch _stopwatch = new();
 
         public static object StartStopwatch()
         {
@@ -3209,7 +3282,7 @@ public static void SortArray(Array a, IFn fn)
 
 
 
-        static readonly Random _random = new Random();
+        static readonly Random _random = new();
 
 
         public static double random()
@@ -3363,7 +3436,7 @@ private static bool TryLoadFromEmbeddedResource(string relativePath, string asse
 
             var embeddedCljName = relativePath.Replace("/", ".") + ".cljr";
             var stream = GetEmbeddedResourceStream(embeddedCljName, out Assembly containingAssembly);
-            if ( stream == null )
+            if (stream == null)
             {
                 embeddedCljName = relativePath.Replace("/", ".") + ".cljc";
                 stream = GetEmbeddedResourceStream(embeddedCljName, out containingAssembly);
@@ -3401,12 +3474,12 @@ public static void LoadCljScript(string cljname, bool failIfNotFound)
         {
             FileInfo cljInfo = FindFile(cljname);
             if (cljInfo != null)
-                LoadScript(cljInfo,cljname);
+                LoadScript(cljInfo, cljname);
             else if (failIfNotFound)
                 throw new FileNotFoundException(String.Format("Could not locate Clojure resource on {0}", ClojureLoadPathString));
         }
 
-        public  static void LoadScript(FileInfo cljInfo, string relativePath)
+        public static void LoadScript(FileInfo cljInfo, string relativePath)
         {
             using (TextReader rdr = cljInfo.OpenText())
                 LoadScript(cljInfo.FullName, cljInfo.Name, rdr, relativePath);
@@ -3419,7 +3492,7 @@ private static void LoadScript(string fullName, string name, TextReader rdr, str
 
         private static void Compile(FileInfo cljInfo, string relativePath)
         {
-            using ( TextReader rdr = cljInfo.OpenText() )
+            using (TextReader rdr = cljInfo.OpenText())
                 Compile(cljInfo.Directory.FullName, cljInfo.Name, rdr, relativePath);
         }
 
@@ -3450,7 +3523,7 @@ static IEnumerable<string> GetFindFilePathsRaw()
             yield return Path.GetDirectoryName(typeof(RT).Assembly.Location);
 
             Assembly assy = Assembly.GetEntryAssembly();
-            if ( assy != null )
+            if (assy != null)
                 yield return Path.GetDirectoryName(assy.Location);
 
             string rawpaths = (string)System.Environment.GetEnvironmentVariable(ClojureLoadPathString);
@@ -3470,7 +3543,7 @@ public static FileInfo FindFile(string fileName)
             foreach (string path in GetFindFilePaths())
             {
                 fi = FindFile(path, fileName);
-                if (fi is not null ) return fi;
+                if (fi is not null) return fi;
             }
 
             return FindRemappedFile(fileName);
@@ -3490,11 +3563,11 @@ public static FileInfo FindRemappedFile(string fileName)
                 if (!(x is PersistentVector mapping) || mapping.length() < 2) continue;
                 if (!(mapping[0] is string nsRoot)) continue;
                 nsRoot = nsRoot.Replace('.', '/');
-                if(fileName.StartsWith(nsRoot))
+                if (fileName.StartsWith(nsRoot))
                 {
                     var fsRoot = mapping[1] as string;
                     var probePath = ConvertPath(fsRoot) + ConvertPath(fileName.Substring(nsRoot.Length));
-                    if(File.Exists(probePath))
+                    if (File.Exists(probePath))
                         return new FileInfo(probePath);
                 }
             }
@@ -3621,7 +3694,7 @@ public static string[] TrimTrailingEmptyStrings(string[] arr)
                     break;
                 i--;
             }
-            Array.Resize(ref arr,i + 1);
+            Array.Resize(ref arr, i + 1);
             return arr;
         }