Output errors BC30105 and BC30106 for incorrect accesses to elements of single and multi-dimensional arrays.

Author: lee-m

vbnc/vbnc/source/Expressions/InvocationOrIndexExpression.vb

@@ -368,8 +368,13 @@ Public Class InvocationOrIndexExpression
             Return False
         End If
 
-        If CecilHelper.GetArrayRank(ArrayType) <> m_ArgumentList.Count Then
-            Helper.AddError(Me, "Array dimensions are not correct.")
+        Dim arrayRank As Integer = CecilHelper.GetArrayRank(ArrayType)
+
+        If m_ArgumentList.Count > arrayRank Then
+            Compiler.Report.ShowMessage(Messages.VBNC30106, Location)
+            Return False
+        ElseIf m_ArgumentList.Count < arrayRank Then
+            Compiler.Report.ShowMessage(Messages.VBNC30105, Location)
             Return False
         End If
 

vbnc/vbnc/source/General/Messages.vb

@@ -695,14 +695,14 @@ Public Enum Messages
     <Message(MessageLevel.Error)> VBNC30103 = 30103
 
     ''' <summary>
-    ''' VBNC = "CHANGEME"
+    ''' VBNC = "Number of indices is less than the number of dimensions of the indexed array."
     ''' VB   = "Number of indices is less than the number of dimensions of the indexed array."
     ''' </summary>
     ''' <remarks></remarks>
     <Message(MessageLevel.Error)> VBNC30105 = 30105
 
     ''' <summary>
-    ''' VBNC = "CHANGEME"
+    ''' VBNC = "Number of indices exceeds the number of dimensions of the indexed array."
     ''' VB   = "Number of indices exceeds the number of dimensions of the indexed array."
     ''' </summary>
     ''' <remarks></remarks>

vbnc/vbnc/source/Resources/Errors.resx

@@ -413,10 +413,10 @@
     <value>CHANGEME</value>
   </data>
   <data name="30105" xml:space="preserve">
-    <value>CHANGEME</value>
+    <value>Number of indices is less than the number of dimensions of the indexed array.</value>
   </data>
   <data name="30106" xml:space="preserve">
-    <value>CHANGEME</value>
+    <value>Number of indices exceeds the number of dimensions of the indexed array.</value>
   </data>
   <data name="30107" xml:space="preserve">
     <value>CHANGEME</value>

vbnc/vbnc/source/Resources/Source.xml

@@ -489,12 +489,12 @@
 	</Message>
 	<Message id="30105" level="Error">
 		<Comment>NC</Comment>
-		<VBNCValue>CHANGEME</VBNCValue>
+		<VBNCValue>Number of indices is less than the number of dimensions of the indexed array.</VBNCValue>
 		<VBValue>Number of indices is less than the number of dimensions of the indexed array.</VBValue>
 	</Message>
 	<Message id="30106" level="Error">
 		<Comment>NC</Comment>
-		<VBNCValue>CHANGEME</VBNCValue>
+		<VBNCValue>Number of indices exceeds the number of dimensions of the indexed array.</VBNCValue>
 		<VBValue>Number of indices exceeds the number of dimensions of the indexed array.</VBValue>
 	</Message>
 	<Message id="30107" level="Error">

vbnc/vbnc/tests/Errors/30105.vb

@@ -0,0 +1,10 @@
+Module Main
+
+		Sub Foo
+	
+		Dim mdarr(,) As String
+		Dim var As String = mdarr(0)
+		
+	End Sub
+	
+End Module

vbnc/vbnc/tests/Errors/30106.vb

@@ -0,0 +1,10 @@
+Module Main
+
+	Sub Foo
+	
+		Dim arr() As String
+		Dim var As String = arr(0, 0)
+		
+	End Sub
+	
+End Module

vbnc/vbnc/tests/tests.xml

@@ -24277,4 +24277,12 @@
 		<file>Errors\30444.vb</file>
 		<error line="6" number="30444" message="'Set' is already declared." />
 	</test>
+	<test id="3146" name="30105" expectedexitcode="1" mytype="empty">
+		<file>Errors\30105.vb</file>
+		<error line="6" number="30105" message="Number of indices is less than the number of dimensions of the indexed array." />
+	</test>
+	<test id="3147" name="30106" expectedexitcode="1" mytype="empty">
+		<file>Errors\30106.vb</file>
+		<error line="6" number="30106" message="Number of indices exceeds the number of dimensions of the indexed array." />
+	</test>
 </rt>