Author: rolf
Date: 2006-11-10 11:40:14 -0500 (Fri, 10 Nov 2006)
New Revision: 67675
Modified:
trunk/vbnc/vbnc/source/Members/ArrayElementInitializer.vb
Log:
2006-11-10 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
* Fixed tests ArrayCreationExpression3, ArrayCreationExpression5,
ArrayInitializer2 (thanks to MrUnleaded)
Modified: trunk/vbnc/vbnc/source/Members/ArrayElementInitializer.vb
===================================================================
--- trunk/vbnc/vbnc/source/Members/ArrayElementInitializer.vb 2006-11-10
15:55:36 UTC (rev 67674)
+++ trunk/vbnc/vbnc/source/Members/ArrayElementInitializer.vb 2006-11-10
16:40:14 UTC (rev 67675)
@@ -61,18 +61,24 @@
Dim expInfo As ExpressionResolveInfo = TryCast(Info,
ExpressionResolveInfo)
Dim elementInfo As ResolveInfo
If expInfo IsNot Nothing Then
- elementInfo = New
ExpressionResolveInfo(expInfo.LHSType.GetElementType)
Helper.Assert(expInfo.LHSType.GetElementType IsNot Nothing)
Helper.Assert(expInfo.LHSType.IsArray)
+ If expInfo.LHSType isnot nothing andalso
expInfo.LHSType.GetArrayRank > 1 Then
+ Dim newArrayRank As Integer = expInfo.LHSType.GetArrayRank
- 1
+ Dim elementType As System.Type =
expInfo.LHSType.GetElementType.MakeArrayType(newArrayRank)
+ elementInfo = New ExpressionResolveInfo(elementType)
+ Else
+ elementInfo = New
ExpressionResolveInfo(expInfo.LHSType.GetElementType)
+ End If
Else
Helper.StopIfDebugging(True)
elementInfo = Info
End If
- Helper.Assert(expInfo Is Nothing OrElse DirectCast(elementInfo,
ExpressionResolveInfo).LHSType IsNot Nothing)
+ Helper.Assert(expInfo Is Nothing OrElse
DirectCast(elementInfo, ExpressionResolveInfo).LHSType IsNot Nothing)
- result = m_VariableInitializerList.ResolveCode(elementInfo)
AndAlso result
- End If
+ result = m_VariableInitializerList.ResolveCode(elementInfo)
AndAlso result
+ End If
result = SetElements() AndAlso result
Compiler.Helper.AddCheck("Array element initializers must all have the
same number of elements / ranks.")
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches