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

Add better exception handling in async methods:

Browse Source 
https://github.com/konsoletyper/teavm/issues/67
This commit is contained in:
Alexey Andreev 2015-02-20 17:51:32 +04:00
parent d929181e81
commit cd2602a5c2
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
teavm-core/src/main/resources/org/teavm/javascript/runtime.js
View File

@ -456,7 +456,7 @@ function $rt_asyncResult(value) {
} }
function $rt_asyncError(e) { function $rt_asyncError(e) {
return function() { return function() {
throw e; throw new TeaVMAsyncError(e);
} }
} }
function $rt_staticAsyncAdapter(f) { function $rt_staticAsyncAdapter(f) {
@ -490,7 +490,19 @@ function $rt_rootInvocationAdapter(f) {
return function() { return function() {
var args = Array.prototype.slice.apply(arguments); var args = Array.prototype.slice.apply(arguments);
args.push(function(result) { args.push(function(result) {
try {
result(); result();
} catch (e) {
var prefix = "Exception occured %s at %o";
var hasWrappers = false;
while (e instanceof TeaVMAsyncError) {
console.error(prefix, e.message, e.stack);
e = e.cause;
prefix = "Caused by %s at %o";
hasWrappers = true;
}
console.error(!hasWrappers ? prefix : "Root cause is %s at %o", e.message, e.stack);
}
}); });
return f.apply(this, args); return f.apply(this, args);
} }
@ -543,6 +555,12 @@ function $rt_guardAsync(f, continuation) {
} }
} }
} }
function TeaVMAsyncError(cause) {
this.message = "Async error occured";
this.cause = cause;
}
TeaVMAsyncError.prototype = new Error();
TeaVMAsyncError.prototype.constructor = TeaVMAsyncError;
function $dbg_repr(obj) { function $dbg_repr(obj) {
return obj.toString ? obj.toString() : ""; return obj.toString ? obj.toString() : "";