Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-21 09:27:59 +02:00
Code Activity

Added ability to enumerate values by reference

Browse source
This commit is contained in:
Brian Fiete 2020-02-08 06:11:11 -08:00
parent 2b2bb7c960
commit ca668bf0fe
1 changed files with 8 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

121
BeefLibs/corlib/src/Collections/Generic/Dictionary.bf
View file

@ -53,34 +53,6 @@ namespace System.Collections.Generic
get { return mCount - mFreeCount == 0; } get { return mCount - mFreeCount == 0; }
} }
/*public KeyCollection Keys
{
get
{
//Contract.Ensures(Contract.Result<KeyCollection>() != null);
if (keys == null) keys = new KeyCollection(this);
return keys;
}
}*/
/*ICollection<TKey> IDictionary<TKey, TValue>.Keys
{
get
{
if (keys == null) keys = new KeyCollection(this);
return keys;
}
}
IEnumerable<TKey> IReadOnlyDictionary<TKey, TValue>.Keys
{
get
{
if (keys == null) keys = new KeyCollection(this);
return keys;
}
}*/
public ValueEnumerator Values public ValueEnumerator Values
{ {
get get
@ -737,7 +709,7 @@ namespace System.Collections.Generic
} }
} }
public struct ValueEnumerator : IEnumerator<TValue>, IResettable public struct ValueEnumerator : IRefEnumerator<TValue>, IResettable
{ {
private Dictionary<TKey, TValue> mDictionary; private Dictionary<TKey, TValue> mDictionary;
#if VERSION_DICTIONARY #if VERSION_DICTIONARY
@ -788,6 +760,11 @@ namespace System.Collections.Generic
get { return mCurrent; } get { return mCurrent; }
} }
public ref TValue CurrentRef
{
get mut { return ref mCurrent; }
}
public ref TKey Key public ref TKey Key
{ {
get get
@ -824,94 +801,12 @@ namespace System.Collections.Generic
return .Err; return .Err;
return Current; return Current;
} }
}
public struct RefValueEnumerator : IEnumerator<TValue>, IResettable public Result<TValue*> GetNextRef() mut
{
private Dictionary<TKey, TValue> mDictionary;
#if VERSION_DICTIONARY
private int_cosize mVersion;
#endif
private int_cosize mIndex;
private TValue* mCurrent;
internal const int_cosize DictEntry = 1;
internal const int_cosize KeyValuePair = 2;
internal this(Dictionary<TKey, TValue> dictionary)
{
mDictionary = dictionary;
#if VERSION_DICTIONARY
mVersion = dictionary.mVersion;
#endif
mIndex = 0;
mCurrent = null;
}
#if VERSION_DICTIONARY
void CheckVersion()
{
if (mVersion != mDictionary.mVersion)
Runtime.FatalError(cVersionError);
}
#endif
public bool MoveNext() mut
{
#if VERSION_DICTIONARY
CheckVersion();
#endif
// Use unsigned comparison since we set index to dictionary.count+1 when the enumeration ends.
// dictionary.count+1 could be negative if dictionary.count is Int32.MaxValue
while ((uint32)mIndex < (uint32)mDictionary.mCount)
{
if (mDictionary.mEntries[mIndex].mHashCode >= 0)
{
mCurrent = &mDictionary.mEntries[mIndex].mValue;
mIndex++;
return true;
}
mIndex++;
}
mIndex = mDictionary.mCount + 1;
mCurrent = null;
return false;
}
public TValue Current
{
get { return *mCurrent; }
}
public ref TKey Key
{
get
{
return ref mDictionary.mEntries[mIndex - 1].mKey;
}
}
public void Dispose()
{
}
public void Reset() mut
{
#if VERSION_DICTIONARY
CheckVersion();
#endif
mIndex = 0;
mCurrent = null;
}
public Result<TValue> GetNext() mut
{ {
if (!MoveNext()) if (!MoveNext())
return .Err; return .Err;
return Current; return &CurrentRef;
} }
} }