CLJCLR-191: PersistentVector.TransientVector should implement IFn.invoke(object arg1)

Author: dmiller

Clojure/Clojure/Lib/PersistentVector.cs

@@ -14,16 +14,16 @@
 
 using System;
 using System.Collections;
-using System.Threading;
 using System.Collections.Generic;
+using System.Threading;
 
 namespace clojure.lang
 {
     /// <summary>
     /// Implements a persistent vector using a specialized form of array-mapped hash trie.
     /// </summary>
     [Serializable]
-    public class PersistentVector: APersistentVector, IObj, IEditableCollection, IEnumerable, IReduce, IKVReduce, IDrop
+    public class PersistentVector : APersistentVector, IObj, IEditableCollection, IEnumerable, IReduce, IKVReduce, IDrop
     {
         #region Node class
 
@@ -38,16 +38,16 @@ public sealed class Node
             public AtomicReference<Thread> Edit
             {
                 get { return _edit; }
-            } 
+            }
 
             readonly object[] _array;
 
             public object[] Array
             {
                 get { return _array; }
-            } 
+            }
+
 
-            
             #endregion
 
             #region C-tors
@@ -63,16 +63,16 @@ public Node(AtomicReference<Thread> edit)
                 _edit = edit;
                 _array = new object[32];
             }
-        
+
             #endregion
         }
 
         #endregion
 
         #region Data
 
-        static readonly AtomicReference<Thread> NoEdit = new AtomicReference<Thread>();
-        internal static readonly Node EmptyNode = new Node(NoEdit, new object[32]);
+        static readonly AtomicReference<Thread> NoEdit = new();
+        internal static readonly Node EmptyNode = new(NoEdit, new object[32]);
 
         readonly int _cnt;
         readonly int _shift;
@@ -81,14 +81,14 @@ public Node(AtomicReference<Thread> edit)
 
         public int Shift { get { return _shift; } }
         public Node Root { get { return _root; } }
-        public object[] Tail() { return _tail; } 
+        public object[] Tail() { return _tail; }
 
         readonly IPersistentMap _meta;
 
         /// <summary>
         /// An empty <see cref="PersistentVector">PersistentVector</see>.
         /// </summary>
-        static public readonly PersistentVector EMPTY = new PersistentVector(0,5,EmptyNode, new object[0]);
+        static public readonly PersistentVector EMPTY = new(0, 5, EmptyNode, new object[0]);
 
         #endregion
 
@@ -148,7 +148,7 @@ static public PersistentVector create(ISeq items)
             if (items != null)
             {
                 // >32, construct with array directly
-                PersistentVector start = new PersistentVector(32, 5, EmptyNode, arr);
+                PersistentVector start = new(32, 5, EmptyNode, arr);
                 TransientVector ret = (TransientVector)start.asTransient();
                 for (; items != null; items = items.next())
                     ret = (TransientVector)ret.conj(items.first());
@@ -300,7 +300,7 @@ public override Object nth(int i, Object notFound)
             return notFound;
         }
 
-        object[] ArrayFor(int i) 
+        object[] ArrayFor(int i)
         {
             if (i >= 0 && i < _cnt)
             {
@@ -344,13 +344,13 @@ public override IPersistentVector assocN(int i, Object val)
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "ClojureJVM name match")]
         static private Node doAssoc(int level, Node node, int i, object val)
         {
-            Node ret = new Node(node.Edit, (object[])node.Array.Clone());
+            Node ret = new(node.Edit, (object[])node.Array.Clone());
             if (level == 0)
                 ret.Array[i & 0x01f] = val;
             else
             {
-                int subidx = ( i >> level ) & 0x01f;
-                ret.Array[subidx] = doAssoc(level-5,(Node) node.Array[subidx], i, val);
+                int subidx = (i >> level) & 0x01f;
+                ret.Array[subidx] = doAssoc(level - 5, (Node)node.Array[subidx], i, val);
             }
             return ret;
         }
@@ -365,7 +365,7 @@ static private Node doAssoc(int level, Node node, int i, object val)
         public override IPersistentVector cons(object o)
         {
             //if (_tail.Length < 32)
-            if ( _cnt - tailoff() < 32 )
+            if (_cnt - tailoff() < 32)
             {
                 object[] newTail = new object[_tail.Length + 1];
                 Array.Copy(_tail, newTail, _tail.Length);
@@ -375,9 +375,9 @@ public override IPersistentVector cons(object o)
 
             // full tail, push into tree
             Node newroot;
-            Node tailnode = new Node(_root.Edit, _tail);
+            Node tailnode = new(_root.Edit, _tail);
             int newshift = _shift;
-            
+
             // overflow root?
             if ((_cnt >> 5) > (1 << _shift))
             {
@@ -401,7 +401,7 @@ private Node pushTail(int level, Node parent, Node tailnode)
             // else alloc new path
             // return nodeToInsert placed in copy of parent
             int subidx = ((_cnt - 1) >> level) & 0x01f;
-            Node ret = new Node(parent.Edit, (object[])parent.Array.Clone());
+            Node ret = new(parent.Edit, (object[])parent.Array.Clone());
             Node nodeToInsert;
 
             if (level == 5)
@@ -423,7 +423,7 @@ static Node newPath(AtomicReference<Thread> edit, int level, Node node)
             if (level == 0)
                 return node;
 
-            Node ret = new Node(edit);
+            Node ret = new(edit);
             ret.Array[0] = newPath(edit, level - 5, node);
             return ret;
         }
@@ -449,7 +449,7 @@ public override IPersistentCollection empty()
         {
             return (IPersistentCollection)EMPTY.withMeta(meta());
         }
-        
+
         #endregion
 
         #region IPersistentStack members
@@ -460,24 +460,24 @@ public override IPersistentCollection empty()
         /// <returns>The new stack.</returns>
         public override IPersistentStack pop()
         {
-            if ( _cnt == 0 )
+            if (_cnt == 0)
                 throw new InvalidOperationException("Can't pop empty vector");
-            if ( _cnt == 1)
+            if (_cnt == 1)
                 return (IPersistentStack)EMPTY.withMeta(meta());
             //if ( _tail.Length > 1 )
             if (_cnt - tailoff() > 1)
             {
-                object[] newTail = new object[_tail.Length-1];
-                Array.Copy(_tail,newTail,newTail.Length);
-                return new PersistentVector(meta(),_cnt-1,_shift,_root,newTail);
+                object[] newTail = new object[_tail.Length - 1];
+                Array.Copy(_tail, newTail, newTail.Length);
+                return new PersistentVector(meta(), _cnt - 1, _shift, _root, newTail);
             }
             object[] newtail = ArrayFor(_cnt - 2);
 
-            Node newroot = popTail(_shift,_root);
+            Node newroot = popTail(_shift, _root);
             int newshift = _shift;
-            if ( newroot == null )
+            if (newroot == null)
                 newroot = EmptyNode;
-            if ( _shift > 5 && newroot.Array[1] == null )
+            if (_shift > 5 && newroot.Array[1] == null)
             {
                 newroot = (Node)newroot.Array[0];
                 newshift -= 5;
@@ -496,7 +496,7 @@ private Node popTail(int level, Node node)
                     return null;
                 else
                 {
-                    Node ret = new Node(_root.Edit, (object[])node.Array.Clone());
+                    Node ret = new(_root.Edit, (object[])node.Array.Clone());
                     ret.Array[subidx] = newchild;
                     return ret;
                 }
@@ -505,7 +505,7 @@ private Node popTail(int level, Node node)
                 return null;
             else
             {
-                Node ret = new Node(_root.Edit, (object[])node.Array.Clone());
+                Node ret = new(_root.Edit, (object[])node.Array.Clone());
                 ret.Array[subidx] = null;
                 return ret;
             }
@@ -693,7 +693,7 @@ public object reduce(IFn f)
 
                 return acc;
             }
-       
+
 
             public object reduce(IFn f, object start)
             {
@@ -751,7 +751,7 @@ public Sequential drop(int n)
 
             public override IEnumerator<object> GetEnumerator()
             {
-                return _vec.RangedIteratorT(_i+_offset,_vec._cnt );
+                return _vec.RangedIteratorT(_i + _offset, _vec._cnt);
             }
 
             IEnumerator IEnumerable.GetEnumerator()
@@ -851,7 +851,7 @@ Node PushTail(int level, Node parent, Node tailnode)
                 // else alloc new path
                 //return  nodeToInsert placed in copy of parent
                 int subidx = ((_cnt - 1) >> level) & 0x01f;
-                Node ret = new Node(parent.Edit, (object[])parent.Array.Clone());
+                Node ret = new(parent.Edit, (object[])parent.Array.Clone());
                 Node nodeToInsert;
                 if (level == 5)
                 {
@@ -944,7 +944,7 @@ public ITransientVector assocN(int i, object val)
             Node doAssoc(int level, Node node, int i, Object val)
             {
                 node = EnsureEditable(node);
-                Node ret = new Node(node.Edit, (object[])node.Array.Clone());
+                Node ret = new(node.Edit, (object[])node.Array.Clone());
                 if (level == 0)
                 {
                     ret.Array[i & 0x01f] = val;
@@ -1053,7 +1053,7 @@ public ITransientCollection conj(object val)
                 }
                 //full tail, push into tree
                 Node newroot;
-                Node tailnode = new Node(_root.Edit, _tail);
+                Node tailnode = new(_root.Edit, _tail);
                 _tail = new object[32];
                 _tail[0] = val;
                 int newshift = _shift;
@@ -1077,16 +1077,16 @@ public IPersistentCollection persistent()
             {
                 EnsureEditable();
                 _root.Edit.Set(null);
-                object[] trimmedTail = new object[_cnt-Tailoff()];
-                Array.Copy(_tail,trimmedTail,trimmedTail.Length);
+                object[] trimmedTail = new object[_cnt - Tailoff()];
+                Array.Copy(_tail, trimmedTail, trimmedTail.Length);
                 return new PersistentVector(_cnt, _shift, _root, trimmedTail);
             }
 
             #endregion
 
             #region ITransientAssociative2 methods
 
-            private static readonly Object NOT_FOUND = new object();
+            private static readonly Object NOT_FOUND = new();
 
             public bool containsKey(object key)
             {
@@ -1103,6 +1103,18 @@ public IMapEntry entryAt(object key)
 
             #endregion
 
+            #region IFn methods
+
+            public override object invoke(object arg1)
+            {
+                // note - relies on EnsureEditable in nth  (Comment in JVM version)
+                if (Util.IsInteger(arg1))
+                    return nth(Util.ConvertToInt(arg1));
+                throw new ArgumentException("Key must be integer");
+            }
+
+            #endregion
+
 
             #region ILookup Members
 
@@ -1127,7 +1139,7 @@ public object valAt(object key, object notFound)
 
             #endregion
         }
- 
+
         #endregion
 
         #region IReduce members and kvreduce
@@ -1210,7 +1222,7 @@ public Sequential drop(int n)
         public override IEnumerator RangedIterator(int start, int end)
         {
             int i = start;
-            int b = i - (i%32);
+            int b = i - (i % 32);
             object[] arr = (start < count()) ? ArrayFor(i) : null;
 
             while (i < end)
@@ -1245,7 +1257,7 @@ IEnumerator IEnumerable.GetEnumerator()
         {
             return RangedIterator(0, count());
         }
-        
+
         public override IEnumerator<object> GetEnumerator()
         {
             return RangedIteratorT(0, count());