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

Properly support non-ASCII characters in System.out and System.err

Browse Source
This commit is contained in:
Alexey Andreev 2020-04-30 14:49:33 +03:00
parent c7c47f63ee
commit a9e7e51c51
1 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
core/src/main/resources/org/teavm/backend/javascript/runtime.js
View File

@ -436,28 +436,56 @@ function $rt_assertNotNaN(value) {
} }
return value; return value;
} }
var $rt_stdoutBuffer = ""; function $rt_createOutputFunction(printFunction) {
var $rt_putStdout = typeof $rt_putStdoutCustom === "function" ? $rt_putStdoutCustom : function(ch) { var buffer = "";
if (ch === 0xA) { var utf8Buffer = 0;
if (console) { var utf8Remaining = 0;
console.info($rt_stdoutBuffer);
function putCodePoint(ch) {
if (ch === 0xA) {
printFunction(buffer);
buffer = "";
} else if (ch < 0x10000) {
buffer += String.fromCharCode(ch);
} else {
ch = (ch - 0x10000) | 0;
var hi = (ch >> 10) + 0xD800;
var lo = (ch & 0x3FF) + 0xDC00;
buffer += String.fromCharCode(hi, lo);
} }
$rt_stdoutBuffer = "";
} else {
$rt_stdoutBuffer += String.fromCharCode(ch);
} }
};
var $rt_stderrBuffer = ""; return function(ch) {
var $rt_putStderr = typeof $rt_putStderrCustom === "function" ? $rt_putStderrCustom : function(ch) { if ((ch & 0x80) === 0) {
if (ch === 0xA) { putCodePoint(ch);
if (console) { } else if ((ch & 0xC0) === 0x80) {
console.error($rt_stderrBuffer); if (utf8Buffer > 0) {
utf8Remaining <<= 6;
utf8Remaining |= ch & 0x3F;
if (--utf8Buffer === 0) {
putCodePoint(utf8Remaining);
}
}
} else if ((ch & 0xE0) === 0xC0) {
utf8Remaining = ch & 0x1F;
utf8Buffer = 1;
} else if ((ch & 0xF0) === 0xE0) {
utf8Remaining = ch & 0x0F;
utf8Buffer = 2;
} else if ((ch & 0xF8) === 0xF0) {
utf8Remaining = ch & 0x07;
utf8Buffer = 3;
} }
$rt_stderrBuffer = ""; };
} else { }
$rt_stderrBuffer += String.fromCharCode(ch);
} var $rt_putStdout = typeof $rt_putStdoutCustom === "function"
}; ? $rt_putStdoutCustom
: console ? $rt_createOutputFunction(function(msg) { console.info(msg); }) : function() {};
var $rt_putStderr = typeof $rt_putStderrCustom === "function"
? $rt_putStderrCustom
: console ? $rt_createOutputFunction(function(msg) { console.error(msg); }) : function() {};
var $rt_packageData = null; var $rt_packageData = null;
function $rt_packages(data) { function $rt_packages(data) {
var i = 0; var i = 0;