Improve ArrayList and NodeList

samples/Esprima.Benchmark/NodeListEnumerationBenchmark.cs

@@ -3,10 +3,8 @@
 
 namespace Esprima.Benchmark;
 
-[MemoryDiagnoser]
 [RankColumn]
-[CsvExporter]
-[MarkdownExporterAttribute.GitHub]
+[MemoryDiagnoser]
 public class NodeListEnumerationBenchmark
 {
     private const string FileName = "bundle";
@@ -30,7 +28,7 @@ public void Setup()
     }
 
     [Benchmark]
-    public object For_DirectIndexing()
+    public int For_DirectIndexing()
     {
         var nodeList = _nodeLists[NodeListIndex];
 
@@ -43,7 +41,7 @@ public object For_DirectIndexing()
     }
 
     [Benchmark]
-    public object For_SpanIndexing()
+    public int For_SpanIndexing()
     {
         var nodeList = _nodeLists[NodeListIndex].AsSpan();
 
@@ -56,7 +54,7 @@ public object For_SpanIndexing()
     }
 
     [Benchmark]
-    public object ForEach_Span()
+    public int ForEach_Span()
     {
         var nodeList = _nodeLists[NodeListIndex].AsSpan();
 

samples/Esprima.Benchmark/Program.cs

@@ -1,12 +1,4 @@
 using System.Reflection;
 using BenchmarkDotNet.Running;
 
-namespace Esprima.Benchmark;
-
-public class Program
-{
-    public static void Main(string[] args)
-    {
-        BenchmarkSwitcher.FromAssembly(typeof(Program).GetTypeInfo().Assembly).Run(args);
-    }
-}
+BenchmarkSwitcher.FromAssembly(typeof(Program).GetTypeInfo().Assembly).Run(args);

src/Esprima/ArrayList.cs

@@ -80,7 +80,7 @@ public ArrayList(int initialCapacity)
     {
         if (initialCapacity < 0)
         {
-            ThrowArgumentOutOfRangeException<T>(nameof(initialCapacity), initialCapacity, null);
+            ThrowInvalidInitialCapacity();
         }
 
         _items = initialCapacity > 0 ? new T[initialCapacity] : null;
@@ -90,6 +90,12 @@ public ArrayList(int initialCapacity)
         _localVersion = 0;
         _sharedVersion = null;
 #endif
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void ThrowInvalidInitialCapacity()
+        {
+            ThrowArgumentException("Invalid initial capacity", nameof(initialCapacity));
+        }
     }
 
     /// <remarks>
@@ -108,6 +114,7 @@ internal ArrayList(T[] items)
 
     public int Capacity
     {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         get
         {
             AssertUnchanged();
@@ -119,7 +126,7 @@ public int Capacity
 
             if (value < _count)
             {
-                ThrowArgumentOutOfRangeException<T>(nameof(value), value, null);
+                ThrowArgumentOutOfRangeException(nameof(value), value, null);
             }
             else if (value == (_items?.Length ?? 0))
             {
@@ -166,7 +173,7 @@ public T this[int index]
                 return _items![index];
             }
 
-            return ThrowArgumentOutOfRangeException<T>(nameof(index), index, null);
+            return ThrowIndexOutOfRangeException<T>();
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -181,7 +188,7 @@ public T this[int index]
                 return;
             }
 
-            ThrowArgumentOutOfRangeException<T>(nameof(index), index, null);
+            ThrowIndexOutOfRangeException<T>();
         }
     }
 
@@ -275,7 +282,7 @@ public void Insert(int index, T item)
 
         if ((uint) index > (uint) _count)
         {
-            ThrowArgumentOutOfRangeException<T>(nameof(index), index, null);
+            ThrowIndexOutOfRangeException<T>();
         }
 
         var capacity = Capacity;
@@ -299,7 +306,7 @@ public void RemoveAt(int index)
 
         if ((uint) index >= (uint) _count)
         {
-            ThrowArgumentOutOfRangeException<T>(nameof(index), index, null);
+            ThrowIndexOutOfRangeException<T>();
         }
 
         _count--;

src/Esprima/Ast/NodeList.cs

@@ -14,15 +14,20 @@ internal NodeList(ICollection<T> collection)
     {
         if (collection is null)
         {
-            throw new ArgumentNullException(nameof(collection));
+            ThrowArgumentNullException();
         }
 
-        _count = collection.Count;
+        _count = collection!.Count;
         if (_count > 0)
         {
             _items = new T[_count];
             collection.CopyTo(_items, 0);
         }
+
+        static void ThrowArgumentNullException()
+        {
+            ThrowArgumentNullException<T>(nameof(collection));
+        }
     }
 
     /// <remarks>
@@ -53,7 +58,7 @@ public T this[int index]
                 return _items![index];
             }
 
-            return ThrowArgumentOutOfRangeException<T>(nameof(index), index, null);
+            return ThrowIndexOutOfRangeException<T>();
         }
     }
 

src/Esprima/EsprimaExceptionHelper.cs

@@ -8,17 +8,29 @@ namespace Esprima;
 internal static class EsprimaExceptionHelper
 {
     [DoesNotReturn]
-    public static T ThrowArgumentNullException<T>(string message)
+    public static T ThrowArgumentNullException<T>(string paramName)
     {
-        throw new ArgumentNullException(message);
+        throw new ArgumentNullException(paramName);
     }
 
     [DoesNotReturn]
-    public static T ThrowArgumentOutOfRangeException<T>(string paramName, object actualValue, string? message = null)
+    public static void ThrowArgumentOutOfRangeException<T>(string paramName, T actualValue, string? message = null)
     {
         throw new ArgumentOutOfRangeException(paramName, actualValue, message);
     }
 
+    [DoesNotReturn]
+    public static void ThrowArgumentException(string message, string paramName)
+    {
+        throw new ArgumentException(message, paramName);
+    }
+
+    [DoesNotReturn]
+    public static T ThrowIndexOutOfRangeException<T>()
+    {
+        throw new ArgumentOutOfRangeException("index");
+    }
+
     [DoesNotReturn]
     public static T ThrowFormatException<T>(string message)
     {