Skip to content
This repository was archived by the owner on Aug 24, 2022. It is now read-only.

Commit 38b8dfa

Browse files
committed
Merge pull request #909 from iskiselev/Arrays
GetEnumerator for multidimensional arrays fixed.
2 parents 472dabf + 53ebf95 commit 38b8dfa

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

JSIL.Libraries/Includes/Bootstrap/Core/Helpers/JSIL.GetEnumerator.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ JSIL.GetEnumerator = function (enumerable, elementType, fallbackMethodInvoke) {
3030
var result = null;
3131
if (JSIL.IsArray(enumerable))
3232
result = JSIL.MakeArrayEnumerator(enumerable, elementType);
33+
else if (enumerable.__IsArray__)
34+
result = JSIL.MakeArrayEnumerator(enumerable.Items, elementType);
3335
else if (typeof (enumerable) === "string")
3436
result = JSIL.MakeArrayEnumerator(enumerable, elementType);
3537
else if ((fallbackMethodInvoke !== true) && tIEnumerable$b1 && tIEnumerable$b1.$Is(enumerable))
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
using System;
2+
3+
public static class Program {
4+
public static void Main (string[] args) {
5+
var SquareArray = new int[2, 2] { { 1, 2 }, { 3, 4 } };
6+
var SquareEnumerator = SquareArray.GetEnumerator();
7+
while (SquareEnumerator.MoveNext())
8+
Console.WriteLine(SquareEnumerator.Current);
9+
}
10+
}

Tests/SimpleTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@
191191
<None Include="SimpleTestCases\Issue247.cs" />
192192
<None Include="SimpleTestCases\Issue248.cs" />
193193
<None Include="SimpleTestCases\Issue249.cs" />
194+
<None Include="SimpleTestCases\Array2DGetEnumerator_Issue895.cs" />
194195
<None Include="SimpleTestCases\NullableGetType.cs" />
195196
<None Include="SimpleTestCases\IEEERemainder.cs" />
196197
<None Include="SimpleTestCases\StringFormatAlignment.cs" />

0 commit comments

Comments
 (0)