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

Adds JS int number to java.lang.Integer conversion

Browse Source
This commit is contained in:
konsoletyper 2014-02-17 17:13:48 +04:00
parent fa1f8f1c6e
commit 119de7ab82
5 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
teavm-html4j/src/main/java/org/teavm/html4j/JavaScriptBodyDependency.java
View File

@ -76,9 +76,10 @@ public class JavaScriptBodyDependency implements DependencyListener {
} }
private void includeDefaultDependencies(DependencyChecker dependencyChecker) { private void includeDefaultDependencies(DependencyChecker dependencyChecker) {
dependencyChecker.attachMethodGraph(JavaScriptBodyConverterGenerator.fromJsMethod); dependencyChecker.attachMethodGraph(JavaScriptConvGenerator.fromJsMethod);
dependencyChecker.attachMethodGraph(JavaScriptBodyConverterGenerator.toJsMethod); dependencyChecker.attachMethodGraph(JavaScriptConvGenerator.toJsMethod);
dependencyChecker.attachMethodGraph(JavaScriptBodyConverterGenerator.intValueMethod); dependencyChecker.attachMethodGraph(JavaScriptConvGenerator.intValueMethod);
dependencyChecker.attachMethodGraph(JavaScriptConvGenerator.valueOfIntMethod);
} }
@Override @Override

4
teavm-html4j/src/main/java/org/teavm/html4j/JavaScriptBodyGenerator.java
View File

@ -63,7 +63,7 @@ public class JavaScriptBodyGenerator implements Generator {
private void wrapParameter(SourceWriter writer, ValueType type, String param) throws IOException { private void wrapParameter(SourceWriter writer, ValueType type, String param) throws IOException {
if (type.isObject("java.lang.Object")) { if (type.isObject("java.lang.Object")) {
writer.appendMethodBody(JavaScriptBodyConverterGenerator.toJsMethod); writer.appendMethodBody(JavaScriptConvGenerator.toJsMethod);
writer.append("(").append(param).append(")"); writer.append("(").append(param).append(")");
} else { } else {
writer.append(param); writer.append(param);
@ -72,7 +72,7 @@ public class JavaScriptBodyGenerator implements Generator {
private void unwrapValue(SourceWriter writer, ValueType type, String param) throws IOException { private void unwrapValue(SourceWriter writer, ValueType type, String param) throws IOException {
if (type.isObject("java.lang.Object")) { if (type.isObject("java.lang.Object")) {
writer.appendMethodBody(JavaScriptBodyConverterGenerator.fromJsMethod); writer.appendMethodBody(JavaScriptConvGenerator.fromJsMethod);
writer.append("(").append(param).append(")"); writer.append("(").append(param).append(")");
} else { } else {
writer.append(param); writer.append(param);

8
teavm-html4j/src/main/java/org/teavm/html4j/JavaScriptBodyConverter.java → teavm-html4j/src/main/java/org/teavm/html4j/JavaScriptConv.java
View File

@ -21,13 +21,13 @@ import org.teavm.javascript.ni.GeneratedBy;
* *
* @author Alexey Andreev <konsoletyper@gmail.com> * @author Alexey Andreev <konsoletyper@gmail.com>
*/ */
public final class JavaScriptBodyConverter { public final class JavaScriptConv {
private JavaScriptBodyConverter() { private JavaScriptConv() {
} }
@GeneratedBy(JavaScriptBodyConverterGenerator.class) @GeneratedBy(JavaScriptConvGenerator.class)
public static native Object toJavaScript(Object obj); public static native Object toJavaScript(Object obj);
@GeneratedBy(JavaScriptBodyConverterGenerator.class) @GeneratedBy(JavaScriptConvGenerator.class)
public static native Object fromJavaScript(Object obj); public static native Object fromJavaScript(Object obj);
} }

11
teavm-html4j/src/main/java/org/teavm/html4j/JavaScriptBodyConverterGenerator.java → teavm-html4j/src/main/java/org/teavm/html4j/JavaScriptConvGenerator.java
View File

@ -25,10 +25,12 @@ import org.teavm.model.*;
* *
* @author Alexey Andreev <konsoletyper@gmail.com> * @author Alexey Andreev <konsoletyper@gmail.com>
*/ */
public class JavaScriptBodyConverterGenerator implements Generator { public class JavaScriptConvGenerator implements Generator {
private static final String convCls = JavaScriptBodyConverter.class.getName(); private static final String convCls = JavaScriptConv.class.getName();
static final MethodReference intValueMethod = new MethodReference("java.lang.Integer", static final MethodReference intValueMethod = new MethodReference("java.lang.Integer",
new MethodDescriptor("intValue", ValueType.INTEGER)); new MethodDescriptor("intValue", ValueType.INTEGER));
static final MethodReference valueOfIntMethod = new MethodReference("java.lang.Integer",
new MethodDescriptor("valueOf", ValueType.INTEGER, ValueType.object("java.lang.Integer")));
private static final ValueType objType = ValueType.object("java.lang.Object"); private static final ValueType objType = ValueType.object("java.lang.Object");
static final MethodReference toJsMethod = new MethodReference(convCls, new MethodDescriptor( static final MethodReference toJsMethod = new MethodReference(convCls, new MethodDescriptor(
"toJavaScript", objType, objType)); "toJavaScript", objType, objType));
@ -86,8 +88,9 @@ public class JavaScriptBodyConverterGenerator implements Generator {
writer.append(" else if (" + obj + ".constructor === ").appendClass("java.lang.String") writer.append(" else if (" + obj + ".constructor === ").appendClass("java.lang.String")
.append(") {").indent().softNewLine(); .append(") {").indent().softNewLine();
writer.append("return $rt_str(" + obj + ");").softNewLine(); writer.append("return $rt_str(" + obj + ");").softNewLine();
writer.outdent().append("}"); writer.outdent().append("} else if (" + obj + " | 0 === " + obj + ") {").indent().softNewLine();
writer.ws().append("else").ws().append("{").indent().softNewLine(); writer.append("return ").appendMethodBody(valueOfIntMethod).append("(" + obj + ");").softNewLine();
writer.outdent().append("} else {").indent().softNewLine();
writer.append("return ").append(obj).append(";").softNewLine(); writer.append("return ").append(obj).append(";").softNewLine();
writer.outdent().append("}").softNewLine(); writer.outdent().append("}").softNewLine();
} }

8
teavm-html4j/src/test/java/org/teavm/html4j/test/JavaScriptBodyConversionTests.java
View File

@ -29,6 +29,14 @@ public class JavaScriptBodyConversionTests {
assertEquals(23, returnAsInt(23)); assertEquals(23, returnAsInt(23));
} }
@Test
public void convertsIntegerResult() {
assertEquals(23, returnAsObject(23));
}
@JavaScriptBody(args = { "value" }, body = "return value;") @JavaScriptBody(args = { "value" }, body = "return value;")
private native int returnAsInt(Object value); private native int returnAsInt(Object value);
@JavaScriptBody(args = { "value" }, body = "return value;")
private native Object returnAsObject(int value);
} }