Misc cleanups/Fixes

This commit is contained in:
hondacrx
2020-12-07 10:07:26 -05:00
parent 5aa1c08ca1
commit 7e2df34250
39 changed files with 513 additions and 245 deletions
@@ -89,7 +89,7 @@ namespace Framework.Collections
Exchange(1, Size--);
Sink(1);
_qp[min] = -1;
_keys[_pq[Size + 1]] = default(T);
_keys[_pq[Size + 1]] = default;
_pq[Size + 1] = -1;
return min;
}
@@ -143,7 +143,7 @@ namespace Framework.Collections
Exchange(i, Size--);
Swim(i);
Sink(i);
_keys[index] = default(T);
_keys[index] = default;
_qp[index] = -1;
}
private bool Greater(int i, int j)
+2 -2
View File
@@ -137,7 +137,7 @@ namespace System.Collections.Generic
{
if (!_interalStorage.ContainsKey(key))
{
value = default(TValue);
value = default;
return false;
}
value = _interalStorage[key].Last();
@@ -381,7 +381,7 @@ namespace System.Collections.Generic
{
if (!_interalStorage.ContainsKey(key))
{
value = default(TValue);
value = default;
return false;
}
value = _interalStorage[key].Last();
+2 -2
View File
@@ -42,7 +42,7 @@ namespace Framework.Database
var value = _reader[column];
if (value == DBNull.Value)
return default(T);
return default;
if (value.GetType() != typeof(T))
return (T)Convert.ChangeType(value, typeof(T));//todo remove me when all fields are the right type this is super slow
@@ -105,7 +105,7 @@ namespace Framework.Database
var value = _currentRow[column];
if (value == DBNull.Value)
return default(T);
return default;
if (value.GetType() != typeof(T))
return (T)Convert.ChangeType(value, typeof(T));//todo remove me when all fields are the right type this is super slow
+2 -2
View File
@@ -317,7 +317,7 @@ namespace Framework.Dynamic
/// Cancel events belonging to specified group.
/// </summary>
/// <param name="group">Group to cancel.</param>
void CancelEventGroup(uint group)
public void CancelEventGroup(uint group)
{
if (group == 0 || group > 8 || Empty())
return;
@@ -334,7 +334,7 @@ namespace Framework.Dynamic
/// </summary>
/// <param name="eventId">Wanted event id.</param>
/// <returns>Time of found event.</returns>
uint GetNextEventTime(uint eventId)
public uint GetNextEventTime(uint eventId)
{
if (Empty())
return 0;
+24 -24
View File
@@ -64,145 +64,145 @@ namespace Framework.IO
public char NextChar(string delimiters = " ")
{
if (!MoveNext(delimiters))
return default(char);
return default;
char value;
if (char.TryParse(Current, out value))
return value;
return default(char);
return default;
}
public byte NextByte(string delimiters = " ")
{
if (!MoveNext(delimiters))
return default(byte);
return default;
byte value;
if (byte.TryParse(Current, out value))
return value;
return default(byte);
return default;
}
public sbyte NextSByte(string delimiters = " ")
{
if (!MoveNext(delimiters))
return default(sbyte);
return default;
sbyte value;
if (sbyte.TryParse(Current, out value))
return value;
return default(sbyte);
return default;
}
public ushort NextUInt16(string delimiters = " ")
{
if (!MoveNext(delimiters))
return default(ushort);
return default;
ushort value;
if (ushort.TryParse(Current, out value))
return value;
return default(ushort);
return default;
}
public short NextInt16(string delimiters = " ")
{
if (!MoveNext(delimiters))
return default(short);
return default;
short value;
if (short.TryParse(Current, out value))
return value;
return default(short);
return default;
}
public uint NextUInt32(string delimiters = " ")
{
if (!MoveNext(delimiters))
return default(uint);
return default;
uint value;
if (uint.TryParse(Current, out value))
return value;
return default(uint);
return default;
}
public int NextInt32(string delimiters = " ")
{
if (!MoveNext(delimiters))
return default(int);
return default;
int value;
if (int.TryParse(Current, out value))
return value;
return default(int);
return default;
}
public ulong NextUInt64(string delimiters = " ")
{
if (!MoveNext(delimiters))
return default(ulong);
return default;
ulong value;
if (ulong.TryParse(Current, out value))
return value;
return default(ulong);
return default;
}
public long NextInt64(string delimiters = " ")
{
if (!MoveNext(delimiters))
return default(long);
return default;
long value;
if (long.TryParse(Current, out value))
return value;
return default(long);
return default;
}
public float NextSingle(string delimiters = " ")
{
if (!MoveNext(delimiters))
return default(float);
return default;
float value;
if (float.TryParse(Current, out value))
return value;
return default(float);
return default;
}
public double NextDouble(string delimiters = " ")
{
if (!MoveNext(delimiters))
return default(double);
return default;
double value;
if (double.TryParse(Current, out value))
return value;
return default(double);
return default;
}
public decimal NextDecimal(string delimiters = " ")
{
if (!MoveNext(delimiters))
return default(decimal);
return default;
decimal value;
if (decimal.TryParse(Current, out value))
return value;
return default(decimal);
return default;
}
public void AlignToNextChar()
@@ -48,7 +48,7 @@ namespace Framework.Threading
public bool Pop(out T value)
{
value = default(T);
value = default;
lock (_queueLock)
{
if (_queue.Count == 0 || _shutdown)
@@ -61,7 +61,7 @@ namespace Framework.Threading
public void WaitAndPop(out T value)
{
value = default(T);
value = default;
lock (_queueLock)
{
while (_queue.Count == 0 && !_shutdown)
@@ -41,7 +41,7 @@ namespace System.Collections.Generic
/// <returns>The value, or the default value of the element type.</returns>
public static T LookupByIndex<T>(this IList<T> list, int index)
{
return index >= list.Count ? default(T) : list[index];
return index >= list.Count ? default : list[index];
}
/// <summary>
@@ -57,17 +57,17 @@ namespace System.Collections.Generic
{
TValue val;
TKey newkey = (TKey)Convert.ChangeType(key, typeof(TKey));
return dict.TryGetValue(newkey, out val) ? val : default(TValue);
return dict.TryGetValue(newkey, out val) ? val : default;
}
public static TValue LookupByKey<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key)
{
TValue val;
return dict.TryGetValue(key, out val) ? val : default(TValue);
return dict.TryGetValue(key, out val) ? val : default;
}
public static KeyValuePair<TKey, TValue> Find<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key)
{
if (!dict.ContainsKey(key))
return default(KeyValuePair<TKey, TValue>);
return default;
return new KeyValuePair<TKey, TValue>(key, dict[key]);
}
@@ -106,7 +106,7 @@ namespace System.Collections.Generic
else
{
for (var i = list.Count; i < size; ++i)
list.Add(default(T));
list.Add(default);
}
}
@@ -161,7 +161,7 @@ namespace System.Collections.Generic
}
return default(T);
return default;
}
public static IEnumerable<TSource> Intersect<TSource>(this IEnumerable<TSource> first, IEnumerable<TSource> second, Func<TSource, TSource, bool> comparer)
+1 -1
View File
@@ -216,7 +216,7 @@ namespace System
{
T value;
if (!Enum.TryParse(str, out value))
return default(T);
return default;
return value;
}