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

Support for default and static methods in Functors

Browse Source
This commit is contained in:
marciodel 2017-05-29 10:08:40 -03:00 committed by Alexey Andreev
parent eba3fa3ac4
commit 5ecfb3620c
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jso/impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java
View File

@ -991,7 +991,9 @@ class JSClassProcessor {
} }
private boolean isProperFunctor(ClassReader type) { private boolean isProperFunctor(ClassReader type) {
return type.hasModifier(ElementModifier.INTERFACE) && type.getMethods().size() == 1; return type.hasModifier(ElementModifier.INTERFACE)
&& type.getMethods().stream().filter(it->it.hasModifier(ElementModifier.ABSTRACT))
.toArray().length == 1;
} }
private Variable wrapFunctor(CallLocation location, Variable var, ClassReader type) { private Variable wrapFunctor(CallLocation location, Variable var, ClassReader type) {
@ -999,7 +1001,8 @@ class JSClassProcessor {
diagnostics.error(location, "Wrong functor: {{c0}}", type.getName()); diagnostics.error(location, "Wrong functor: {{c0}}", type.getName());
return var; return var;
} }
String name = type.getMethods().iterator().next().getName(); String name = type.getMethods().stream()
.filter(it->it.hasModifier(ElementModifier.ABSTRACT)).findFirst().get().getName();
Variable functor = program.createVariable(); Variable functor = program.createVariable();
Variable nameVar = addStringWrap(addString(name, location.getSourceLocation()), location.getSourceLocation()); Variable nameVar = addStringWrap(addString(name, location.getSourceLocation()), location.getSourceLocation());
InvokeInstruction insn = new InvokeInstruction(); InvokeInstruction insn = new InvokeInstruction();

36
tests/src/test/java/org/teavm/jso/test/FunctorTest.java
View File

@ -41,6 +41,24 @@ public class FunctorTest {
assertSame(firstRef, secondRef); assertSame(firstRef, secondRef);
} }
@Test
public void functorWithDefaultMethodPassed(){
JSFunctionWithDefaultMethod javaFunction = (s) -> s+" returned";
String returned = javaFunction.defaultMethod();
assertEquals(returned, "Content returned");
}
@Test
public void functorWithStaticMethodPassed(){
JSFunctionWithStaticMethod javaFunction = (s) -> s+" returned";
String returned = javaFunction.apply(JSFunctionWithStaticMethod.staticMethod());
assertEquals(returned, "Content returned");
}
@Test @Test
public void propertyWithNonAlphabeticFirstChar() { public void propertyWithNonAlphabeticFirstChar() {
WithProperties wp = getWithPropertiesInstance(); WithProperties wp = getWithPropertiesInstance();
@ -63,6 +81,24 @@ public class FunctorTest {
int apply(int a, int b); int apply(int a, int b);
} }
@JSFunctor
interface JSFunctionWithDefaultMethod extends JSObject {
String apply(String a);
default String defaultMethod(){
return apply("Content");
}
}
@JSFunctor
interface JSFunctionWithStaticMethod extends JSObject {
String apply(String a);
public static String staticMethod(){
return "Content";
}
}
interface WithProperties extends JSObject { interface WithProperties extends JSObject {
@JSProperty @JSProperty
String get_foo(); String get_foo();