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

Fix async test building. Fix Window.prompt. Fix non-integer JS number to

Browse Source 
Java primitive conversion
This commit is contained in:
Alexey Andreev 2015-10-19 16:49:27 +03:00
parent 1d72ea166b
commit 84be461a69
3 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
core/src/main/java/org/teavm/model/util/AsyncMethodFinder.java
View File

@ -72,18 +72,8 @@ public class AsyncMethodFinder {
if (asyncMethods.contains(method.getReference()) || method.getProgram() == null) { if (asyncMethods.contains(method.getReference()) || method.getProgram() == null) {
continue; continue;
} }
if (method.hasModifier(ElementModifier.SYNCHRONIZED)) { if (hasMonitor(method)) {
add(method.getReference()); add(method.getReference());
continue;
}
ProgramReader program = method.getProgram();
AsyncInstructionReader insnReader = new AsyncInstructionReader();
for (int i = 0; i < program.basicBlockCount(); ++i) {
program.basicBlockAt(i).readAllInstructions(insnReader);
if (insnReader.async) {
add(method.getReference());
break;
}
} }
} }
} }
@ -105,21 +95,36 @@ public class AsyncMethodFinder {
} }
private boolean hasAsyncMethods() { private boolean hasAsyncMethods() {
int count = asyncMethods.size(); boolean result = false;
if (asyncMethods.contains(new MethodReference(Object.class, "monitorEnter", Object.class, void.class))) { loop: for (String clsName : classSource.getClassNames()) {
--count; ClassReader cls = classSource.get(clsName);
} for (MethodReader method : cls.getMethods()) {
if (asyncMethods.contains(new MethodReference(Object.class, "monitorEnter", Object.class, if (!asyncMethods.contains(method.getReference()) || method.getProgram() == null) {
int.class, void.class))) { continue;
--count; }
} if (hasMonitor(method)) {
if (asyncMethods.contains(new MethodReference(Object.class, "monitorEnterWait", Object.class, break loop;
int.class, void.class))) { }
--count; }
} }
ClassReader cls = classSource.get("java.lang.Thread"); ClassReader cls = classSource.get("java.lang.Thread");
MethodReader method = cls != null ? cls.getMethod(new MethodDescriptor("start", void.class)) : null; MethodReader method = cls != null ? cls.getMethod(new MethodDescriptor("start", void.class)) : null;
return count > 0 && method != null; return result && method != null;
}
private boolean hasMonitor(MethodReader method) {
if (method.hasModifier(ElementModifier.SYNCHRONIZED)) {
return true;
}
ProgramReader program = method.getProgram();
AsyncInstructionReader insnReader = new AsyncInstructionReader();
for (int i = 0; i < program.basicBlockCount(); ++i) {
program.basicBlockAt(i).readAllInstructions(insnReader);
if (insnReader.async) {
return true;
}
}
return false;
} }
private void add(MethodReference methodRef) { private void add(MethodReference methodRef) {

4
html4j/src/main/java/org/teavm/html4j/JavaScriptConvGenerator.java
View File

@ -138,7 +138,7 @@ public class JavaScriptConvGenerator implements Generator {
writer.outdent().append("} else if (" + type + " === ").appendClass("java.lang.Character") writer.outdent().append("} else if (" + type + " === ").appendClass("java.lang.Character")
.append(") {").indent().softNewLine(); .append(") {").indent().softNewLine();
writer.append("return ").appendMethodBody(valueOfCharMethod).append("(typeof " + obj + " === 'number' ? " writer.append("return ").appendMethodBody(valueOfCharMethod).append("(typeof " + obj + " === 'number' ? "
+ obj + "0xFFFF : " + obj + ".charCodeAt(0));").softNewLine(); + obj + " & 0xFFFF : " + obj + ".charCodeAt(0));").softNewLine();
writer.outdent().append("} else if (" + type + " === ").appendClass("java.lang.Byte") writer.outdent().append("} else if (" + type + " === ").appendClass("java.lang.Byte")
.append(") {").indent().softNewLine(); .append(") {").indent().softNewLine();
@ -186,7 +186,7 @@ public class JavaScriptConvGenerator implements Generator {
writer.append("return $rt_str(" + obj + ");").softNewLine(); writer.append("return $rt_str(" + obj + ");").softNewLine();
writer.outdent().append("} else if (typeof " + obj + " === 'number') {").indent().softNewLine(); writer.outdent().append("} else if (typeof " + obj + " === 'number') {").indent().softNewLine();
writer.append("if (" + obj + "|0 === " + obj + ") {").indent().softNewLine(); writer.append("if ((" + obj + "|0) === " + obj + ") {").indent().softNewLine();
writer.append("return ").appendMethodBody(valueOfIntMethod).append("(" + obj + ");").softNewLine(); writer.append("return ").appendMethodBody(valueOfIntMethod).append("(" + obj + ");").softNewLine();
writer.outdent().append("} else {").indent().softNewLine(); writer.outdent().append("} else {").indent().softNewLine();
writer.append("return ").appendMethodBody(valueOfDoubleMethod).append("(" + obj + ");").softNewLine(); writer.append("return ").appendMethodBody(valueOfDoubleMethod).append("(" + obj + ");").softNewLine();

2
jso/apis/src/main/java/org/teavm/jso/browser/Window.java
View File

@ -93,7 +93,7 @@ public abstract class Window implements JSObject, WindowEventTarget, StorageProv
return prompt(message, ""); return prompt(message, "");
} }
@JSBody(params = { "message", "default" }, script = "prompt(message, default);") @JSBody(params = { "message", "defaultValue" }, script = "prompt(message, defaultValue);")
public static native String prompt(String message, String defaultValue); public static native String prompt(String message, String defaultValue);
@JSBody(params = { "handler", "delay" }, script = "return setTimeout(handler, delay);") @JSBody(params = { "handler", "delay" }, script = "return setTimeout(handler, delay);")