mirror of
https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git
synced 2025-01-03 05:44:10 -08:00
JS: fix wrapping keys for native indexers
This commit is contained in:
parent
3282ae3b59
commit
be53236d23
|
@ -631,7 +631,7 @@ class JSClassProcessor {
|
||||||
}
|
}
|
||||||
if (isProperSetIndexer(method.getDescriptor())) {
|
if (isProperSetIndexer(method.getDescriptor())) {
|
||||||
var index = invoke.getArguments().get(0);
|
var index = invoke.getArguments().get(0);
|
||||||
marshaller.wrapArgument(callLocation, index, method.parameterType(0), types.typeOf(index), false);
|
index = marshaller.wrapArgument(callLocation, index, method.parameterType(0), types.typeOf(index), false);
|
||||||
var value = invoke.getArguments().get(1);
|
var value = invoke.getArguments().get(1);
|
||||||
value = marshaller.wrapArgument(callLocation, value, method.parameterType(1),
|
value = marshaller.wrapArgument(callLocation, value, method.parameterType(1),
|
||||||
types.typeOf(value), false);
|
types.typeOf(value), false);
|
||||||
|
|
57
tests/src/test/java/org/teavm/jso/test/ImportClassTest.java
Normal file
57
tests/src/test/java/org/teavm/jso/test/ImportClassTest.java
Normal file
|
@ -0,0 +1,57 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2023 Alexey Andreev.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package org.teavm.jso.test;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.teavm.jso.JSBody;
|
||||||
|
import org.teavm.jso.JSIndexer;
|
||||||
|
import org.teavm.jso.JSObject;
|
||||||
|
import org.teavm.junit.EachTestCompiledSeparately;
|
||||||
|
import org.teavm.junit.OnlyPlatform;
|
||||||
|
import org.teavm.junit.SkipJVM;
|
||||||
|
import org.teavm.junit.TeaVMTestRunner;
|
||||||
|
import org.teavm.junit.TestPlatform;
|
||||||
|
|
||||||
|
@RunWith(TeaVMTestRunner.class)
|
||||||
|
@SkipJVM
|
||||||
|
@OnlyPlatform(TestPlatform.JAVASCRIPT)
|
||||||
|
@EachTestCompiledSeparately
|
||||||
|
public class ImportClassTest {
|
||||||
|
@Test
|
||||||
|
public void indexer() {
|
||||||
|
var o = create();
|
||||||
|
o.set("foo", 23);
|
||||||
|
set(o, "bar", 42);
|
||||||
|
assertEquals(23, o.get("foo"));
|
||||||
|
assertEquals(42, o.get("bar"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@JSBody(script = "return {};")
|
||||||
|
private static native O create();
|
||||||
|
|
||||||
|
@JSBody(params = { "o", "key", "value" }, script = "o[key] = value;")
|
||||||
|
private static native void set(O o, String key, int value);
|
||||||
|
|
||||||
|
interface O extends JSObject {
|
||||||
|
@JSIndexer
|
||||||
|
int get(String key);
|
||||||
|
|
||||||
|
@JSIndexer
|
||||||
|
void set(String key, int value);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user