add RemoveAll

Sonic853 · Sonic853 · commit 53e0f52c8002 · 2024-12-15T03:22:07.000+08:00
diff --git a/Scripts/UdonArrayPlus.cs b/Scripts/UdonArrayPlus.cs
@@ -25,10 +25,7 @@ public static T[] Add<T>(T[] _array, T _value, bool duplicates = true)
             _newArray.SetValue(_value, length);
             return _newArray;
         }
-        public static T[] Add<T>(ref T[] _array, T _value, bool duplicates = true)
-        {
-            return _array = Add(_array, _value, duplicates);
-        }
+        public static T[] Add<T>(ref T[] _array, T _value, bool duplicates = true) => _array = Add(_array, _value, duplicates);
         public static T[] Insert<T>(T[] array, int index, T item, bool duplicates = true)
         {
             if (!duplicates)
@@ -60,10 +57,7 @@ public static T[] Insert<T>(T[] array, int index, T item, bool duplicates = true
 
             return newArray;
         }
-        public static T[] Insert<T>(ref T[] array, int index, T item, bool duplicates = true)
-        {
-            return array = Insert(array, index, item, duplicates);
-        }
+        public static T[] Insert<T>(ref T[] array, int index, T item, bool duplicates = true) => array = Insert(array, index, item, duplicates);
         public static bool Contains<T>(T[] array, T item)
         {
             return IndexOf(array, item) >= 0;
@@ -126,21 +120,28 @@ public static T[] RemoveAt<T>(T[] array, int index)
 
             return newArray;
         }
-        public static T[] RemoveAt<T>(ref T[] array, int index)
-        {
-            return array = RemoveAt(array, index);
-        }
+        public static T[] RemoveAt<T>(ref T[] array, int index) => array = RemoveAt(array, index);
         public static T[] Remove<T>(T[] _array, T _value)
         {
             var index = IndexOf(_array, _value);
             if (index == -1)
                 return _array;
             return RemoveAt(_array, index);
         }
-        public static T[] Remove<T>(ref T[] _array, T _value)
+        public static T[] Remove<T>(ref T[] _array, T _value) => _array = Remove(_array, _value);
+        public static T[] RemoveAll<T>(T[] _array, T _value)
         {
-            return _array = Remove(_array, _value);
+            var index = IndexOf(_array, _value);
+            if (index == -1)
+                return _array;
+            while (index != -1)
+            {
+                _array = RemoveAt(_array, index);
+                index = IndexOf(_array, _value);
+            }
+            return _array;
         }
+        public static T[] RemoveAll<T>(ref T[] _array, T _value) => _array = RemoveAll(_array, _value);
         public static T[] AddRange<T>(T[] _array, T[] collection)
         {
             var length = _array.Length;
@@ -155,10 +156,7 @@ public static T[] AddRange<T>(T[] _array, T[] collection)
 
             return newArray;
         }
-        public static T[] AddRange<T>(ref T[] _array, T[] collection)
-        {
-            return _array = AddRange(_array, collection);
-        }
+        public static T[] AddRange<T>(ref T[] _array, T[] collection) => _array = AddRange(_array, collection);
         // String
         public static string[] StringsFindLikeAll(string[] _array, string _value)
         {
@@ -206,10 +204,7 @@ public static int[] IntsSort(int[] _array, bool reverse = false)
             }
             return _newArray;
         }
-        public static int[] IntsSort(ref int[] _array, bool reverse = false)
-        {
-            return _array = IntsSort(_array, reverse);
-        }
+        public static int[] IntsSort(ref int[] _array, bool reverse = false) => _array = IntsSort(_array, reverse);
         // Float
         public static float[] FloatsSort(float[] _array, bool reverse)
         {
@@ -231,10 +226,7 @@ public static float[] FloatsSort(float[] _array, bool reverse)
             }
             return _newArray;
         }
-        public static float[] FloatsSort(ref float[] _array, bool reverse)
-        {
-            return _array = FloatsSort(_array, reverse);
-        }
+        public static float[] FloatsSort(ref float[] _array, bool reverse) => _array = FloatsSort(_array, reverse);
         // VRCPlayerApi
         public static VRCPlayerApi[] Players()
         {
@@ -297,10 +289,7 @@ public static VRCPlayerApi[] PlayersAdd(VRCPlayerApi[] players, VRCPlayerApi _pl
             newPlayers[players.Length] = _player;
             return newPlayers;
         }
-        public static VRCPlayerApi[] PlayersAdd(ref VRCPlayerApi[] players, VRCPlayerApi _player, bool force = false)
-        {
-            return players = PlayersAdd(players, _player, force);
-        }
+        public static VRCPlayerApi[] PlayersAdd(ref VRCPlayerApi[] players, VRCPlayerApi _player, bool force = false) => players = PlayersAdd(players, _player, force);
         public static VRCPlayerApi[] PlayersAddIndex(VRCPlayerApi[] players, VRCPlayerApi _player, int index, bool force = false)
         {
             if (index < 0 || index > players.Length)
@@ -329,10 +318,7 @@ public static VRCPlayerApi[] PlayersAddIndex(VRCPlayerApi[] players, VRCPlayerAp
                 return newPlayers;
             }
         }
-        public static VRCPlayerApi[] PlayersAddIndex(ref VRCPlayerApi[] players, VRCPlayerApi _player, int index, bool force = false)
-        {
-            return players = PlayersAddIndex(players, _player, index, force);
-        }
+        public static VRCPlayerApi[] PlayersAddIndex(ref VRCPlayerApi[] players, VRCPlayerApi _player, int index, bool force = false) => players = PlayersAddIndex(players, _player, index, force);
         public static VRCPlayerApi[] PlayersRemove(VRCPlayerApi[] players, VRCPlayerApi _player)
         {
             var index = PlayersIndex(players, _player);
@@ -354,10 +340,7 @@ public static VRCPlayerApi[] PlayersRemove(VRCPlayerApi[] players, VRCPlayerApi
                 return newPlayers;
             }
         }
-        public static VRCPlayerApi[] PlayersRemove(ref VRCPlayerApi[] players, VRCPlayerApi _player)
-        {
-            return players = PlayersRemove(players, _player);
-        }
+        public static VRCPlayerApi[] PlayersRemove(ref VRCPlayerApi[] players, VRCPlayerApi _player) => players = PlayersRemove(players, _player);
         public static VRCPlayerApi PlayersFindID(int _id)
         {
             VRCPlayerApi[] players = Players();

Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,7 @@ public static T[] Add<T>(T[] _array, T _value, bool duplicates = true)`
`25`	`25`	`_newArray.SetValue(_value, length);`
`26`	`26`	`return _newArray;`
`27`	`27`	`}`
`28`		`- public static T[] Add<T>(ref T[] _array, T _value, bool duplicates = true)`
`29`		`- {`
`30`		`- return _array = Add(_array, _value, duplicates);`
`31`		`- }`
	`28`	`+ public static T[] Add<T>(ref T[] _array, T _value, bool duplicates = true) => _array = Add(_array, _value, duplicates);`
`32`	`29`	`public static T[] Insert<T>(T[] array, int index, T item, bool duplicates = true)`
`33`	`30`	`{`
`34`	`31`	`if (!duplicates)`
`@@ -60,10 +57,7 @@ public static T[] Insert<T>(T[] array, int index, T item, bool duplicates = true`
`60`	`57`
`61`	`58`	`return newArray;`
`62`	`59`	`}`
`63`		`- public static T[] Insert<T>(ref T[] array, int index, T item, bool duplicates = true)`
`64`		`- {`
`65`		`- return array = Insert(array, index, item, duplicates);`
`66`		`- }`
	`60`	`+ public static T[] Insert<T>(ref T[] array, int index, T item, bool duplicates = true) => array = Insert(array, index, item, duplicates);`
`67`	`61`	`public static bool Contains<T>(T[] array, T item)`
`68`	`62`	`{`
`69`	`63`	`return IndexOf(array, item) >= 0;`
`@@ -126,21 +120,28 @@ public static T[] RemoveAt<T>(T[] array, int index)`
`126`	`120`
`127`	`121`	`return newArray;`
`128`	`122`	`}`
`129`		`- public static T[] RemoveAt<T>(ref T[] array, int index)`
`130`		`- {`
`131`		`- return array = RemoveAt(array, index);`
`132`		`- }`
	`123`	`+ public static T[] RemoveAt<T>(ref T[] array, int index) => array = RemoveAt(array, index);`
`133`	`124`	`public static T[] Remove<T>(T[] _array, T _value)`
`134`	`125`	`{`
`135`	`126`	`var index = IndexOf(_array, _value);`
`136`	`127`	`if (index == -1)`
`137`	`128`	`return _array;`
`138`	`129`	`return RemoveAt(_array, index);`
`139`	`130`	`}`
`140`		`- public static T[] Remove<T>(ref T[] _array, T _value)`
	`131`	`+ public static T[] Remove<T>(ref T[] _array, T _value) => _array = Remove(_array, _value);`
	`132`	`+ public static T[] RemoveAll<T>(T[] _array, T _value)`
`141`	`133`	`{`
`142`		`- return _array = Remove(_array, _value);`
	`134`	`+ var index = IndexOf(_array, _value);`
	`135`	`+ if (index == -1)`
	`136`	`+ return _array;`
	`137`	`+ while (index != -1)`
	`138`	`+ {`
	`139`	`+ _array = RemoveAt(_array, index);`
	`140`	`+ index = IndexOf(_array, _value);`
	`141`	`+ }`
	`142`	`+ return _array;`
`143`	`143`	`}`
	`144`	`+ public static T[] RemoveAll<T>(ref T[] _array, T _value) => _array = RemoveAll(_array, _value);`
`144`	`145`	`public static T[] AddRange<T>(T[] _array, T[] collection)`
`145`	`146`	`{`
`146`	`147`	`var length = _array.Length;`
`@@ -155,10 +156,7 @@ public static T[] AddRange<T>(T[] _array, T[] collection)`
`155`	`156`
`156`	`157`	`return newArray;`
`157`	`158`	`}`
`158`		`- public static T[] AddRange<T>(ref T[] _array, T[] collection)`
`159`		`- {`
`160`		`- return _array = AddRange(_array, collection);`
`161`		`- }`
	`159`	`+ public static T[] AddRange<T>(ref T[] _array, T[] collection) => _array = AddRange(_array, collection);`
`162`	`160`	`// String`
`163`	`161`	`public static string[] StringsFindLikeAll(string[] _array, string _value)`
`164`	`162`	`{`
`@@ -206,10 +204,7 @@ public static int[] IntsSort(int[] _array, bool reverse = false)`
`206`	`204`	`}`
`207`	`205`	`return _newArray;`
`208`	`206`	`}`
`209`		`- public static int[] IntsSort(ref int[] _array, bool reverse = false)`
`210`		`- {`
`211`		`- return _array = IntsSort(_array, reverse);`
`212`		`- }`
	`207`	`+ public static int[] IntsSort(ref int[] _array, bool reverse = false) => _array = IntsSort(_array, reverse);`
`213`	`208`	`// Float`
`214`	`209`	`public static float[] FloatsSort(float[] _array, bool reverse)`
`215`	`210`	`{`
`@@ -231,10 +226,7 @@ public static float[] FloatsSort(float[] _array, bool reverse)`
`231`	`226`	`}`
`232`	`227`	`return _newArray;`
`233`	`228`	`}`
`234`		`- public static float[] FloatsSort(ref float[] _array, bool reverse)`
`235`		`- {`
`236`		`- return _array = FloatsSort(_array, reverse);`
`237`		`- }`
	`229`	`+ public static float[] FloatsSort(ref float[] _array, bool reverse) => _array = FloatsSort(_array, reverse);`
`238`	`230`	`// VRCPlayerApi`
`239`	`231`	`public static VRCPlayerApi[] Players()`
`240`	`232`	`{`
`@@ -297,10 +289,7 @@ public static VRCPlayerApi[] PlayersAdd(VRCPlayerApi[] players, VRCPlayerApi _pl`
`297`	`289`	`newPlayers[players.Length] = _player;`
`298`	`290`	`return newPlayers;`
`299`	`291`	`}`
`300`		`- public static VRCPlayerApi[] PlayersAdd(ref VRCPlayerApi[] players, VRCPlayerApi _player, bool force = false)`
`301`		`- {`
`302`		`- return players = PlayersAdd(players, _player, force);`
`303`		`- }`
	`292`	`+ public static VRCPlayerApi[] PlayersAdd(ref VRCPlayerApi[] players, VRCPlayerApi _player, bool force = false) => players = PlayersAdd(players, _player, force);`
`304`	`293`	`public static VRCPlayerApi[] PlayersAddIndex(VRCPlayerApi[] players, VRCPlayerApi _player, int index, bool force = false)`
`305`	`294`	`{`
`306`	`295`	`if (index < 0 \|\| index > players.Length)`
`@@ -329,10 +318,7 @@ public static VRCPlayerApi[] PlayersAddIndex(VRCPlayerApi[] players, VRCPlayerAp`
`329`	`318`	`return newPlayers;`
`330`	`319`	`}`
`331`	`320`	`}`
`332`		`- public static VRCPlayerApi[] PlayersAddIndex(ref VRCPlayerApi[] players, VRCPlayerApi _player, int index, bool force = false)`
`333`		`- {`
`334`		`- return players = PlayersAddIndex(players, _player, index, force);`
`335`		`- }`
	`321`	`+ public static VRCPlayerApi[] PlayersAddIndex(ref VRCPlayerApi[] players, VRCPlayerApi _player, int index, bool force = false) => players = PlayersAddIndex(players, _player, index, force);`
`336`	`322`	`public static VRCPlayerApi[] PlayersRemove(VRCPlayerApi[] players, VRCPlayerApi _player)`
`337`	`323`	`{`
`338`	`324`	`var index = PlayersIndex(players, _player);`
`@@ -354,10 +340,7 @@ public static VRCPlayerApi[] PlayersRemove(VRCPlayerApi[] players, VRCPlayerApi`
`354`	`340`	`return newPlayers;`
`355`	`341`	`}`
`356`	`342`	`}`
`357`		`- public static VRCPlayerApi[] PlayersRemove(ref VRCPlayerApi[] players, VRCPlayerApi _player)`
`358`		`- {`
`359`		`- return players = PlayersRemove(players, _player);`
`360`		`- }`
	`343`	`+ public static VRCPlayerApi[] PlayersRemove(ref VRCPlayerApi[] players, VRCPlayerApi _player) => players = PlayersRemove(players, _player);`
`361`	`344`	`public static VRCPlayerApi PlayersFindID(int _id)`
`362`	`345`	`{`
`363`	`346`	`VRCPlayerApi[] players = Players();`