eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 16:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix creation of multi-dimensional arrays with zero dimensions. See https://github.com/konsoletyper/teavm/issues/239

Browse Source
This commit is contained in:
Alexey Andreev 2017-02-11 23:23:50 +03:00
parent 3402fd8ec9
commit 19e8e06446
2 changed files with 98 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
core/src/main/resources/org/teavm/backend/javascript/runtime.js
View File

@ -248,87 +248,129 @@ function $rt_exception(ex) {
return err; return err;
} }
function $rt_createMultiArray(cls, dimensions) { function $rt_createMultiArray(cls, dimensions) {
var arrays = new Array($rt_primitiveArrayCount(dimensions)); var first = 0;
var firstDim = dimensions[0] | 0; for (var i = dimensions.length - 1; i >= 0; i = (i - 1) | 0) {
for (var i = 0 | 0; i < arrays.length; i = (i + 1) | 0) { if (dimensions[i] == 0) {
first = i;
break;
}
}
if (first > 0) {
for (i = 0; i < first; i = (i + 1) | 0) {
cls = $rt_arraycls(cls);
}
if (first == dimensions.length - 1) {
return $rt_createArray(cls, dimensions[first]);
}
}
var arrays = new Array($rt_primitiveArrayCount(dimensions, first));
var firstDim = dimensions[first] | 0;
for (i = 0; i < arrays.length; i = (i + 1) | 0) {
arrays[i] = $rt_createArray(cls, firstDim); arrays[i] = $rt_createArray(cls, firstDim);
} }
return $rt_createMultiArrayImpl(cls, arrays, dimensions); return $rt_createMultiArrayImpl(cls, arrays, dimensions, first);
} }
function $rt_createByteMultiArray(dimensions) { function $rt_createByteMultiArray(dimensions) {
var arrays = new Array($rt_primitiveArrayCount(dimensions)); var arrays = new Array($rt_primitiveArrayCount(dimensions, 0));
if (arrays.length == 0) {
return $rt_createMultiArray($rt_bytecls(), dimensions);
}
var firstDim = dimensions[0] | 0; var firstDim = dimensions[0] | 0;
for (var i = 0 | 0; i < arrays.length; i = (i + 1) | 0) { for (var i = 0; i < arrays.length; i = (i + 1) | 0) {
arrays[i] = $rt_createByteArray(firstDim); arrays[i] = $rt_createByteArray(firstDim);
} }
return $rt_createMultiArrayImpl($rt_bytecls(), arrays, dimensions); return $rt_createMultiArrayImpl($rt_bytecls(), arrays, dimensions);
} }
function $rt_createCharMultiArray(dimensions) { function $rt_createCharMultiArray(dimensions) {
var arrays = new Array($rt_primitiveArrayCount(dimensions)); var arrays = new Array($rt_primitiveArrayCount(dimensions, 0));
if (arrays.length == 0) {
return $rt_createMultiArray($rt_charcls(), dimensions);
}
var firstDim = dimensions[0] | 0; var firstDim = dimensions[0] | 0;
for (var i = 0 | 0; i < arrays.length; i = (i + 1) | 0) { for (var i = 0; i < arrays.length; i = (i + 1) | 0) {
arrays[i] = $rt_createCharArray(firstDim); arrays[i] = $rt_createCharArray(firstDim);
} }
return $rt_createMultiArrayImpl($rt_charcls(), arrays, dimensions); return $rt_createMultiArrayImpl($rt_charcls(), arrays, dimensions, 0);
} }
function $rt_createBooleanMultiArray(dimensions) { function $rt_createBooleanMultiArray(dimensions) {
var arrays = new Array($rt_primitiveArrayCount(dimensions)); var arrays = new Array($rt_primitiveArrayCount(dimensions, 0));
if (arrays.length == 0) {
return $rt_createMultiArray($rt_booleancls(), dimensions);
}
var firstDim = dimensions[0] | 0; var firstDim = dimensions[0] | 0;
for (var i = 0 | 0; i < arrays.length; i = (i + 1) | 0) { for (var i = 0; i < arrays.length; i = (i + 1) | 0) {
arrays[i] = $rt_createBooleanArray(firstDim); arrays[i] = $rt_createBooleanArray(firstDim);
} }
return $rt_createMultiArrayImpl($rt_booleancls(), arrays, dimensions); return $rt_createMultiArrayImpl($rt_booleancls(), arrays, dimensions, 0);
} }
function $rt_createShortMultiArray(dimensions) { function $rt_createShortMultiArray(dimensions) {
var arrays = new Array($rt_primitiveArrayCount(dimensions)); var arrays = new Array($rt_primitiveArrayCount(dimensions, 0));
if (arrays.length == 0) {
return $rt_createMultiArray($rt_shortcls(), dimensions);
}
var firstDim = dimensions[0] | 0; var firstDim = dimensions[0] | 0;
for (var i = 0 | 0; i < arrays.length; i = (i + 1) | 0) { for (var i = 0; i < arrays.length; i = (i + 1) | 0) {
arrays[i] = $rt_createShortArray(firstDim); arrays[i] = $rt_createShortArray(firstDim);
} }
return $rt_createMultiArrayImpl($rt_shortcls(), arrays, dimensions); return $rt_createMultiArrayImpl($rt_shortcls(), arrays, dimensions, 0);
} }
function $rt_createIntMultiArray(dimensions) { function $rt_createIntMultiArray(dimensions) {
var arrays = new Array($rt_primitiveArrayCount(dimensions)); var arrays = new Array($rt_primitiveArrayCount(dimensions, 0));
if (arrays.length == 0) {
return $rt_createMultiArray($rt_intcls(), dimensions);
}
var firstDim = dimensions[0] | 0; var firstDim = dimensions[0] | 0;
for (var i = 0 | 0; i < arrays.length; i = (i + 1) | 0) { for (var i = 0; i < arrays.length; i = (i + 1) | 0) {
arrays[i] = $rt_createIntArray(firstDim); arrays[i] = $rt_createIntArray(firstDim);
} }
return $rt_createMultiArrayImpl($rt_intcls(), arrays, dimensions); return $rt_createMultiArrayImpl($rt_intcls(), arrays, dimensions, 0);
} }
function $rt_createLongMultiArray(dimensions) { function $rt_createLongMultiArray(dimensions) {
var arrays = new Array($rt_primitiveArrayCount(dimensions)); var arrays = new Array($rt_primitiveArrayCount(dimensions, 0));
if (arrays.length == 0) {
return $rt_createMultiArray($rt_longcls(), dimensions);
}
var firstDim = dimensions[0] | 0; var firstDim = dimensions[0] | 0;
for (var i = 0 | 0; i < arrays.length; i = (i + 1) | 0) { for (var i = 0; i < arrays.length; i = (i + 1) | 0) {
arrays[i] = $rt_createLongArray(firstDim); arrays[i] = $rt_createLongArray(firstDim);
} }
return $rt_createMultiArrayImpl($rt_longcls(), arrays, dimensions); return $rt_createMultiArrayImpl($rt_longcls(), arrays, dimensions, 0);
} }
function $rt_createFloatMultiArray(dimensions) { function $rt_createFloatMultiArray(dimensions) {
var arrays = new Array($rt_primitiveArrayCount(dimensions)); var arrays = new Array($rt_primitiveArrayCount(dimensions, 0));
if (arrays.length == 0) {
return $rt_createMultiArray($rt_floatcls(), dimensions);
}
var firstDim = dimensions[0] | 0; var firstDim = dimensions[0] | 0;
for (var i = 0 | 0; i < arrays.length; i = (i + 1) | 0) { for (var i = 0; i < arrays.length; i = (i + 1) | 0) {
arrays[i] = $rt_createFloatArray(firstDim); arrays[i] = $rt_createFloatArray(firstDim);
} }
return $rt_createMultiArrayImpl($rt_floatcls(), arrays, dimensions); return $rt_createMultiArrayImpl($rt_floatcls(), arrays, dimensions, 0);
} }
function $rt_createDoubleMultiArray(dimensions) { function $rt_createDoubleMultiArray(dimensions) {
var arrays = new Array($rt_primitiveArrayCount(dimensions)); var arrays = new Array($rt_primitiveArrayCount(dimensions, 0));
if (arrays.length == 0) {
return $rt_createMultiArray($rt_doublecls(), dimensions);
}
var firstDim = dimensions[0] | 0; var firstDim = dimensions[0] | 0;
for (var i = 0 | 0; i < arrays.length; i = (i + 1) | 0) { for (var i = 0; i < arrays.length; i = (i + 1) | 0) {
arrays[i] = $rt_createDoubleArray(firstDim); arrays[i] = $rt_createDoubleArray(firstDim);
} }
return $rt_createMultiArrayImpl($rt_doublecls(), arrays, dimensions); return $rt_createMultiArrayImpl($rt_doublecls(), arrays, dimensions, 0);
} }
function $rt_primitiveArrayCount(dimensions) { function $rt_primitiveArrayCount(dimensions, start) {
var val = dimensions[1] | 0; var val = dimensions[start + 1] | 0;
for (var i = 2 | 0; i < dimensions.length; i = (i + 1) | 0) { for (var i = start + 2; i < dimensions.length; i = (i + 1) | 0) {
val = (val * (dimensions[i] | 0)) | 0; val = (val * (dimensions[i] | 0)) | 0;
if (val == 0) {
break;
}
} }
return val; return val;
} }
function $rt_createMultiArrayImpl(cls, arrays, dimensions) { function $rt_createMultiArrayImpl(cls, arrays, dimensions, start) {
var limit = arrays.length; var limit = arrays.length;
for (var i = 1 | 0; i < dimensions.length; i = (i + 1) | 0) { for (var i = (start + 1) | 0; i < dimensions.length; i = (i + 1) | 0) {
cls = $rt_arraycls(cls); cls = $rt_arraycls(cls);
var dim = dimensions[i]; var dim = dimensions[i];
var index = 0; var index = 0;

24
tests/src/test/java/org/teavm/vm/VMTest.java
View File

@ -35,6 +35,30 @@ public class VMTest {
assertEquals(int[].class, array[0].getClass()); assertEquals(int[].class, array[0].getClass());
} }
@Test
public void emptyMultiArrayCreated() {
int[][] array = new int[0][0];
assertEquals(0, array.length);
assertEquals(int[][].class, array.getClass());
}
@Test
public void emptyMultiArrayCreated2() {
int[][][] array = new int[1][0][1];
assertEquals(1, array.length);
assertEquals(0, array[0].length);
assertEquals(int[][][].class, array.getClass());
}
@Test
public void emptyMultiArrayCreated3() {
int[][][] array = new int[1][1][0];
assertEquals(1, array.length);
assertEquals(1, array[0].length);
assertEquals(0, array[0][0].length);
assertEquals(int[][][].class, array.getClass());
}
@Test @Test
public void catchesException() { public void catchesException() {
try { try {