Reworked ref enumerators to support non-pointer refs

BeefLibs/corlib/src/Collections/Dictionary.bf

@@ -13,9 +13,13 @@ namespace System.Collections
 	using System.Diagnostics;
 	using System.Diagnostics.Contracts;
 
-	public class Dictionary<TKey, TValue> : ICollection<(TKey key, TValue value)>, IEnumerable<(TKey key, TValue value)> where TKey : IHashable
+	public class Dictionary<TKey, TValue> :
+		ICollection<(TKey key, TValue value)>,
+		IEnumerable<(TKey key, TValue value)>,
+		IRefEnumerable<(TKey key, TValue* valueRef)> where TKey : IHashable
 	{
 		typealias KeyValuePair=(TKey key, TValue value);
+		typealias KeyRefValuePair=(TKey key, TValue* valueRef);
 
 		private struct Entry			
 		{
@@ -606,7 +610,7 @@ namespace System.Collections
 			return (key is TKey);
 		}
 
-		public struct Enumerator : IEnumerator<KeyValuePair>//, IDictionaryEnumerator
+		public struct Enumerator : IEnumerator<KeyValuePair>, IRefEnumerator<KeyRefValuePair>
 		{
 			private Dictionary<TKey, TValue>  mDictionary;
 #if VERSION_DICTIONARY
@@ -687,6 +691,11 @@ namespace System.Collections
 				get { return (mDictionary.mEntries[mCurrentIndex].mKey, mDictionary.mEntries[mCurrentIndex].mValue); }
 			}
 
+			public KeyRefValuePair CurrentRef
+			{
+				get { return (mDictionary.mEntries[mCurrentIndex].mKey, &mDictionary.mEntries[mCurrentIndex].mValue); }
+			}
+
 			public void Dispose()
 			{
 
@@ -753,9 +762,16 @@ namespace System.Collections
 					return .Err;
 				return Current;
 			}
+
+			public Result<KeyRefValuePair> GetNextRef() mut
+			{
+				if (!MoveNext())
+					return .Err;
+				return CurrentRef;
+			}
 		}
 
-		public struct ValueEnumerator : IRefEnumerator<TValue>, IResettable
+		public struct ValueEnumerator : IRefEnumerator<TValue*>, IEnumerator<TValue>, IResettable
 		{
 			private Dictionary<TKey, TValue> mDictionary;
 #if VERSION_DICTIONARY

BeefLibs/corlib/src/Collections/IEnumerator.bf

@@ -12,13 +12,18 @@ namespace System.Collections
 		void Reset() mut;
 	}
     
-	interface IRefEnumerator<T> : IEnumerator<T>
+	interface IRefEnumerator<T>
 	{
-		Result<T*> GetNextRef() mut;
+		Result<T> GetNextRef() mut;
 	}
 
     concrete interface IEnumerable<T>
     {
         concrete IEnumerator<T> GetEnumerator();
     }
+
+	concrete interface IRefEnumerable<T>
+	{
+	    concrete IRefEnumerator<T> GetEnumerator();
+	}
 }

BeefLibs/corlib/src/Collections/List.bf

@@ -623,7 +623,7 @@ namespace System.Collections
 			}
 		}
 
-		public struct Enumerator : IRefEnumerator<T>, IResettable
+		public struct Enumerator : IRefEnumerator<T*>, IEnumerator<T>, IResettable
 		{
 	        private List<T> mList;
 	        private int mIndex;

BeefLibs/corlib/src/Collections/Queue.bf

@@ -351,7 +351,7 @@ namespace System.Collections
 		/// Implements an enumerator for a Queue.  The enumerator uses the
 		/// internal version number of the list to ensure that no modifications are
 		/// made to the list while an enumeration is in progress.
-		public struct Enumerator : IRefEnumerator<T>
+		public struct Enumerator : IRefEnumerator<T*>, IEnumerator<T>
 		{
 			private Queue<T> mQueue;
 			private int32 mIndex;   // -1 = not started, -2 = ended/disposed

BeefLibs/corlib/src/Span.bf

@@ -184,7 +184,7 @@ namespace System
 			return Enumerator(this);
 		}
 
-		public struct Enumerator : IEnumerator<T>, IRefEnumerator<T>
+		public struct Enumerator : IEnumerator<T>, IRefEnumerator<T*>
 		{
 		    private Span<T> mList;
 		    private int mIndex;

BeefLibs/corlib/src/String.bf

@@ -2360,7 +2360,7 @@ namespace System
 			}
 		}
 
-		public struct RawEnumerator : IRefEnumerator<char8>
+		public struct RawEnumerator : IRefEnumerator<char8*>, IEnumerator<char8>
 		{
 			char8* mPtr;
 			int_strsize mIdx;

IDEHelper/Compiler/BfExprEvaluator.cpp

@@ -12150,7 +12150,7 @@ BfModuleMethodInstance BfExprEvaluator::GetSelectedMethod(BfAstNode* targetSrc,
 			if ((invocationExpr != NULL) && (invocationExpr->mGenericArgs != NULL))
 			{
 				errorNode = invocationExpr->mGenericArgs->mGenericArgs[(int)methodDef->mGenericParams.size()];
-				if (errorNode == NULL)
+				if ((errorNode == NULL) && (!invocationExpr->mGenericArgs->mCommas.IsEmpty()))
 					errorNode = invocationExpr->mGenericArgs->mCommas[(int)methodDef->mGenericParams.size() - 1];
 			}
 			mModule->Fail(StrFormat("Too many generic arguments, expected %d fewer", genericArgCountDiff), errorNode);

IDEHelper/Compiler/BfModuleTypeUtils.cpp

@@ -906,9 +906,7 @@ bool BfModule::PopulateType(BfType* resolvedTypeRef, BfPopulateType populateType
 			if (typeAliasDecl->mAliasToType != NULL)
 				aliasToType = ResolveTypeRef(typeAliasDecl->mAliasToType, BfPopulateType_IdentityNoRemapAlias);
 		}
-		//typeAlias->mModule = mContext->mScratchModule;
+		
-		typeAlias->mTypeIncomplete = false;
-		typeAlias->mDefineState = BfTypeDefineState_DefinedAndMethodsSlotted;
 		if (aliasToType != NULL)
 		{
 			AddDependency(aliasToType, typeAlias, BfDependencyMap::DependencyFlag_DerivedFrom);
@@ -951,7 +949,7 @@ bool BfModule::PopulateType(BfType* resolvedTypeRef, BfPopulateType populateType
 		resolvedTypeRef->mRebuildFlags = BfTypeRebuildFlag_None;
 		typeAlias->mCustomAttributes = GetCustomAttributes(typeDef->mTypeDeclaration->mAttributes, BfAttributeTargets_Alias);
 
-		return true;
+		// Fall through so generic params are populated in DoPopulateType
 	}
 
 	if (resolvedTypeRef->IsSizedArray())
@@ -1159,6 +1157,7 @@ bool BfModule::PopulateType(BfType* resolvedTypeRef, BfPopulateType populateType
 		case BfTypeCode_Struct:
 		case BfTypeCode_Interface:
 		case BfTypeCode_Enum:		
+		case BfTypeCode_TypeAlias:
 			// Implemented below
 			break;
 		case BfTypeCode_Extension:
@@ -1518,6 +1517,13 @@ bool BfModule::DoPopulateType(BfType* resolvedTypeRef, BfPopulateType populateTy
 			BuildGenericParams(resolvedTypeRef);
 	}
 
+	if (resolvedTypeRef->IsTypeAlias())
+	{
+		typeInstance->mTypeIncomplete = false;
+		resolvedTypeRef->mDefineState = BfTypeDefineState_DefinedAndMethodsSlotted;
+		return true;
+	}
+
 	if (_CheckTypeDone())
 		return true;
 

IDEHelper/Compiler/BfResolvedTypeUtils.cpp

@@ -3768,7 +3768,28 @@ String BfTypeUtils::TypeToString(BfTypeReference* typeRef)
 	}
 	if (auto directStrTypeName = BfNodeDynCast<BfDirectStrTypeReference>(typeRef))
 		return directStrTypeName->mTypeName;
-	BF_FATAL("Not implemented");
+
+	if (auto tupleTypeRef = BfNodeDynCast<BfTupleTypeRef>(typeRef))
+	{
+		String name = "(";
+
+		for (int i = 0; i < tupleTypeRef->mFieldTypes.size(); i++)
+		{
+			if (i > 0)
+				name += ", ";
+			name += TypeToString(tupleTypeRef->mFieldTypes[i]);			
+			if ((i < tupleTypeRef->mFieldNames.size()) && (tupleTypeRef->mFieldNames[i] != NULL))
+			{
+				name += " ";
+				name += tupleTypeRef->mFieldNames[i]->ToString();
+			}
+		}
+
+		name += ")";
+		return name;
+	}
+
+	BF_DBG_FATAL("Not implemented");
 	return "???";
 }
 

IDEHelper/Compiler/BfStmtEvaluator.cpp

@@ -3696,6 +3696,7 @@ void BfModule::Visit(BfDeleteStatement* deleteStmt)
 	if (checkType->IsPointer())
 	{
 		auto innerType = checkType->GetUnderlyingType();
+		PopulateType(innerType);
 		if (innerType->IsValuelessType())
 			mayBeSentinel = true;
 	}
@@ -5715,7 +5716,6 @@ void BfModule::Visit(BfForEachStatement* forEachStmt)
 						if (genericItrInterface != NULL)
 						{							
 							Fail(StrFormat("Type '%s' implements multiple %s<T> interfaces", TypeToString(itr.mType).c_str(), isRefExpression ? "IRefEnumerator" : "IEnumerator"), forEachStmt->mCollectionExpression);														
-							return;
 						}
 
 						itrInterface = interface;
@@ -5724,7 +5724,11 @@ void BfModule::Visit(BfForEachStatement* forEachStmt)
 						{
 							varType = genericItrInterface->mTypeGenericArguments[0];
 							if (isRefExpression)
-								varType = CreateRefType(varType);
+							{
+								if (varType->IsPointer())
+									varType = CreateRefType(varType->GetUnderlyingType());
+							}							
+
 						}
 					}
 				}
@@ -5737,10 +5741,13 @@ void BfModule::Visit(BfForEachStatement* forEachStmt)
 					{
 						varType = genericItrInterface->mTypeGenericArguments[0];
 						if (isRefExpression)
+						{
+							if (varType->IsPointer())
 								varType = CreateRefType(varType);
 						}
 					}
 				}
+			}
 
 			if (genericItrInterface == NULL)
 			{
@@ -5761,9 +5768,9 @@ void BfModule::Visit(BfForEachStatement* forEachStmt)
 					refItrInterface = itrInterface;
 					PopulateType(refItrInterface);
 					// Must IRefEnumeratorf<T> must include only IEnumerator<T>
-					BF_ASSERT(refItrInterface->mInterfaces.size() == 1);
+// 					BF_ASSERT(refItrInterface->mInterfaces.size() == 1);
-					if (refItrInterface->mInterfaces.size() == 1)
+// 					if (refItrInterface->mInterfaces.size() == 1)
-						itrInterface = refItrInterface->mInterfaces[0].mInterfaceType;
+// 						itrInterface = refItrInterface->mInterfaces[0].mInterfaceType;
 				}
 				itr = MakeAddressable(itr);
 				itr = RemoveReadOnly(itr);
@@ -6220,7 +6227,10 @@ void BfModule::Visit(BfForEachStatement* forEachStmt)
 			{				
 				auto nextVal = BfTypedValue(mBfIRBuilder->CreateBitCast(nextResult.mValue, mBfIRBuilder->MapType(CreatePointerType(nextEmbeddedType))), nextEmbeddedType, true);
 				if (isRefExpression)
+				{
+					if (nextVal.mType->IsPointer())
 						nextVal = BfTypedValue(nextVal.mValue, CreateRefType(nextVal.mType->GetUnderlyingType()), true);
+				}
 				nextVal = Cast(forEachStmt->mCollectionExpression, nextVal, varType, BfCastFlags_Explicit);
 				nextVal = LoadValue(nextVal);
 				if (nextVal)