efront 4.0.20 → 4.0.22

package/coms/compile/downLevel_test.js

@@ -1,15 +1,17 @@
 var downLevel = require("./downLevel");
-var _asert = assert, i = 10;
+var _asert = assert, i = 12;
 assert = function (a, b) {
     var d = 1;
     b = b.split(/(?<!\r)\n/), d = b["length"], b = b["join"]("\r\n");
     _asert(a, b, i);
     i += d;
 }
+var innerJs = new Javascript;
+innerJs.defaultType = common.STRAP;
 // 声明及解构
 assert(downLevel(`var [name, type, options] = piece, key, repeat;`), 'var name = piece[0], type = piece[1], options = piece[2], key, repeat;');
-assert(downLevel(`const`), '');
-assert(downLevel(`let`), '');
+assert(downLevel(`const`), 'const');
+assert(downLevel(`let`), 'let');
 assert(downLevel(`var`), '');
 assert(downLevel(`{let a; function b(){a};return;}`), `if (tmp = 0, tmp0 =function (a) { a; function b() { a }; return tmp = 1, void 0; }(a)) { if (tmp === 1) return tmp0; }
 var tmp, a, tmp0`);
@@ -28,6 +30,11 @@ assert(downLevel(`var {a}=b`), 'var a = b.a');
 assert(downLevel(`var {a}=1`), 'var a = 1 .a');
 assert(downLevel(`var {a}=1.1`), 'var a = 1.1 .a');
 assert(downLevel(`var {c:a}=b`), 'var a = b.c');
+assert(downLevel(`[...[a]]=[1]`), 'a = [1][0]');
+assert(downLevel(`[...[a]]=[...[1]]`), 'a = [1][0]');
+assert(downLevel(`[a[a]]=[1]`), 'a[a] = [1][0]');
+assert(downLevel(`[a,b]=[b,a]`), '_ = [b, a], a = _[0], b = _[1]\r\nvar _');
+assert(downLevel(`var {c:a=2}=b`), 'var _ = b.c, a = _ !== undefined ? _ : 2\r\nvar _');
 assert(downLevel(`var {"c":a}=b`), 'var a = b["c"]');
 assert(downLevel(`var {1:a}=b`), 'var a = b[1]');
 assert(downLevel(`var [,a]=b`), 'var a = b[1]');
@@ -36,9 +43,9 @@ assert(downLevel(`var {1:a}=b`), 'var a = b[1]');
 assert(downLevel(`var {.1:a}=b`), 'var a = b[.1]');
 assert(downLevel(`var {a,[a]:c}=b`), 'var a = b.a, c = b[a]');
 assert(downLevel(`var {a}=a`), 'var a = a.a');
-assert(downLevel(`var {a,b}=a`), 'var _ = a, a = a.a, b = _.b');
+assert(downLevel(`var {a,b}=a`), 'var _ = a, a = a.a, b = _.b\r\nvar _');
 assert(downLevel(`var {a:{a:{a}}}=b`), 'var a = b.a.a.a');
-assert(downLevel(`var {a,[a]:c}={}`), 'var _ = {}, a = _.a, c = _[a]');
+assert(downLevel(`var {a,[a]:c}={}`), 'var _ = {}, a = _.a, c = _[a]\r\nvar _');
 assert(downLevel(`={a,[a]:c}={}`), '= _ = {}, a = _.a, c = _[a]\r\nvar _');
 var tmp = scanner2(`var {window}=this`); tmp.helpcode = false; tmp.detour(); assert(downLevel.code(tmp).toString(), `var window = this["window"]`);
 assert(downLevel(`function (){var [a]=a;}`), "function () { var a = a[0]; }")
@@ -187,7 +194,7 @@ assert(downLevel(`(a)=>k`), "function (a) { return k }")
 assert(downLevel(`(a=1)=>k`), "function (a) { if (a === undefined) a = 1; return k }")
 assert(downLevel(`([a])=>b`), "function (arg) { var a = arg[0]; return b }")
 assert(downLevel(`map(([a])=>a)`), "map(function (arg) { var a = arg[0]; return a })")
-assert(downLevel(`var [_, R, G, B, A] = rgbHex.exec(color).map(a => parseInt(a + a, 16));`), "var _0 = rgbHex.exec(color).map(function (a) { return parseInt(a + a, 16) }), _ = _0[0], R = _0[1], G = _0[2], B = _0[3], A = _0[4];")
+assert(downLevel(`var [_, R, G, B, A] = rgbHex.exec(color).map(a => parseInt(a + a, 16));`), "var _0 = rgbHex.exec(color).map(function (a) { return parseInt(a + a, 16) }), _ = _0[0], R = _0[1], G = _0[2], B = _0[3], A = _0[4];\r\nvar _0")
 assert(downLevel(`if (/^(?:select|input|textarea)$/i.test(initialEvent.target.tagName) || getTargetIn(a => a.nodrag || a.hasAttribute('nodrag'), initialEvent.target)) return;`), "if (/^(?:select|input|textarea)$/i.test(initialEvent.target.tagName) || getTargetIn(function (a) { return a.nodrag || a.hasAttribute('nodrag') }, initialEvent.target)) return;")
 i++// 对象收集
 assert(downLevel(`function (a,...b){}`), `var slice_ = Array["prototype"]["slice"];\r\nfunction (a) { var b = slice_["call"](arguments, 1); }`)
@@ -196,7 +203,7 @@ assert(downLevel(`function (a,...,c){}`), `function (a, c) { c = arguments["leng
 assert(downLevel(`(...a) => k`), `var slice_ = Array["prototype"]["slice"];\r\nfunction () { var a = slice_["call"](arguments, 0); return k }`)
 assert(downLevel(`for await(o of os) noSymbol`), `return async_(
 function () {
-return [7, 8]
+return [8, 8]
 },
 function () {
 _2 = Symbol["asyncIterator"]; _2 = os[_2]; if (_2) return [1, 0]; _2 = Symbol["iterator"]; _2 = os[_2]; if (_2) return [1, 0]; _2 = Symbol["iterator"]; _2 = Array["prototype"][_2]
@@ -208,19 +215,22 @@ function (_1) {
 _2 = _1; _ = _2; return [1, 0]
 },
 function () {
-_2 = !_["done"]; if (!_2) return [1, 0]; o = _["value"]; _2 = (true)
+_2 = !_["done"]; if (!_2) return [2, 0]; _2 = _["value"]; return [_2, 1]
+},
+function (_1) {
+_2 = _1; o = _2; _2 = (true)
 },
 function () {
 if (!_2) return [2, 0]; noSymbol; _2 = _0["next"](); return [_2, 1]
 },
 function (_1) {
-_2 = _1; _ = _2; return [-2, 0]
+_2 = _1; _ = _2; return [-3, 0]
 },
 function () {
 return [0, 9]
 },
 function () {
-_2 = _ &&! _["done"]; if (!_2) return [1, 0]; _2 = _0["return"]; _2 = isFunction(_2)
+_2 = _; if (!_2) return [1, 0]; _2 = !_["done"]; if (!_2) return [1, 0]; _2 = _0["return"]; _2 = isFunction(_2)
 },
 function () {
 if (!_2) return [1, 0]; _2 = _0["return"](); return [1, 0]
@@ -231,45 +241,59 @@ return [1, 9]
 var _, _0, _2`)
 assert(downLevel(`for await(var [o,s] of os) noSymbol`), `return async_(
 function () {
-return [7, 8]
+return [11, 8]
 },
 function () {
-o; s; _3 = Symbol["asyncIterator"]; _3 = os[_3]; if (_3) return [1, 0]; _3 = Symbol["iterator"]; _3 = os[_3]; if (_3) return [1, 0]; _3 = Symbol["iterator"]; _3 = Array["prototype"][_3]
+o; s; _5 = Symbol["asyncIterator"]; _5 = os[_5]; if (_5) return [1, 0]; _5 = Symbol["iterator"]; _5 = os[_5]; if (_5) return [1, 0]; _5 = Symbol["iterator"]; _5 = Array["prototype"][_5]
+},
+function () {
+_0 = _5; _0 = _0["call"](os); _5 = _0["next"](); return [_5, 1]
+},
+function (_4) {
+_5 = _4; _ = _5; return [1, 0]
 },
 function () {
-_0 = _3; _0 = _0["call"](os); _3 = _0["next"](); return [_3, 1]
+_5 = !_["done"]; if (!_5) return [5, 0]; _5 = _["value"]; return [_5, 1]
 },
-function (_2) {
-_3 = _2; _ = _3; return [1, 0]
+function (_4) {
+_5 = _4; _1 = _5; _6 = Symbol["iterator"]; _6 = _1[_6]; if (_6) return [1, 0]; _6 = Symbol["iterator"]; _6 = Array["prototype"][_6]
+},
+function () {
+_6 = (_6); _2 = _6["call"](_1); _3 = undefined; _3 = _2["next"](); o = _3["value"]; _3 = _2["next"](); s = _3["value"]; _9 = !_3; if (_9) return [1, 0]; _9 = !_3["done"]
+},
+function () {
+_9 = (_9); if (!_9) return [1, 0]; _9 = _2["return"]; _9 = isFunction(_9); if (!_9) return [1, 0]; _9 = _2["return"]()
 },
 function () {
-_3 = !_["done"]; if (!_3) return [1, 0]; _1 = _["value"]; o = _1[0]; s = _1[1]; _3 = (true)
+_3 = _9; _5 = (true)
 },
 function () {
-if (!_3) return [2, 0]; noSymbol; _3 = _0["next"](); return [_3, 1]
+if (!_5) return [2, 0]; noSymbol; _5 = _0["next"](); return [_5, 1]
 },
-function (_2) {
-_3 = _2; _ = _3; return [-2, 0]
+function (_4) {
+_5 = _4; _ = _5; return [-6, 0]
 },
 function () {
 return [0, 9]
 },
 function () {
-_3 = _ &&! _["done"]; if (!_3) return [1, 0]; _3 = _0["return"]; _3 = isFunction(_3)
+_5 = _; if (!_5) return [1, 0]; _5 = !_["done"]; if (!_5) return [1, 0]; _5 = _0["return"]; _5 = isFunction(_5)
 },
 function () {
-if (!_3) return [1, 0]; _3 = _0["return"](); return [1, 0]
+if (!_5) return [1, 0]; _5 = _0["return"](); return [1, 0]
 },
 function () {
 return [1, 9]
 })
-var o, s, _, _0, _1, _3`)
-assert(downLevel(`for(o of os) noSymbol`), `for (_ = 0, _0 = os["length"]; _ < _0 && (o = os[_], true); _++) noSymbol\r\nvar _, _0`)
-assert(downLevel(`for(var o of os) Symbol`), `try { for (var o, _0 = os[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (o = _["value"], true); _ = _0["next"]()) Symbol } finally { if (_ &&! _["done"] && isFunction(_0["return"])) _0["return"]() }\r\nvar _, _0`)
-assert(downLevel(`for(var o of os) Symbol`), `try { for (var o, _0 = os[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (o = _["value"], true); _ = _0["next"]()) Symbol } finally { if (_ &&! _["done"] && isFunction(_0["return"])) _0["return"]() }\r\nvar _, _0`)
-assert(downLevel(`for(var o of o)Symbol`), `try { for (var o, _1 = o, _0 = _1[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](_1), _ = _0["next"](); !_["done"] && (o = _["value"], true); _ = _0["next"]()) Symbol } finally { if (_ &&! _["done"] && isFunction(_0["return"])) _0["return"]() }\r\nvar _, _0, _1`)
-assert(downLevel(`for(var [a] of os)Symbol`), `try { for (var a, _0 = os[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (a = _["value"][0], true); _ = _0["next"]()) Symbol } finally { if (_ &&! _["done"] && isFunction(_0["return"])) _0["return"]() }\r\nvar _, _0`)
-assert(downLevel(`for(var [a,b] of os)Symbol`), `try { for (var a, b, _0 = os[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (_1 = _["value"], a = _1[0], b = _1[1], true); _ = _0["next"]()) Symbol } finally { if (_ &&! _["done"] && isFunction(_0["return"])) _0["return"]() }\r\nvar _, _0, _1`)
+var o, s, _, _0, _1, _2, _3, _5, _6, _7, _8, _9`);
+assert(downLevel(`for(o of os) noSymbol`), `for (_ = 0; _ < os["length"] && (o = os[_], true); _++) noSymbol\r\nvar _, _0`)
+assert(downLevel(`for(var o of os) Symbol`), `try { for (var o, _0 = os[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (o = _["value"], true); _ = _0["next"]()) Symbol } finally { if (_ && !_["done"] && isFunction(_0["return"])) _0["return"]() }\r\nvar _, _0`)
+assert(downLevel(`for(var o of os) Symbol`), `try { for (var o, _0 = os[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (o = _["value"], true); _ = _0["next"]()) Symbol } finally { if (_ && !_["done"] && isFunction(_0["return"])) _0["return"]() }\r\nvar _, _0`)
+assert(downLevel(`for(var o of o)Symbol`), `try { for (var o, _1 = o, _0 = _1[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](_1), _ = _0["next"](); !_["done"] && (o = _["value"], true); _ = _0["next"]()) Symbol } finally { if (_ && !_["done"] && isFunction(_0["return"])) _0["return"]() }\r\nvar _, _0, _1`)
+assert(downLevel(`for(var [a] of os)Symbol`), `try { for (var a, _0 = os[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (_1 = _["value"], _2 = (_1[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]])["call"](_1), _3 = undefined, _3 = _2["next"](), a = _3["value"], _3 = (!_3 || !_3["done"]) && isFunction(_2["return"]) && _2["return"](), true); _ = _0["next"]()) Symbol } finally { if (_ && !_["done"] && isFunction(_0["return"])) _0["return"]() }
+var _, _0, _1, _2, _3`)
+assert(downLevel(`for(var [a,b] of os)Symbol`), `try { for (var a, b, _0 = os[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (_1 = _["value"], _2 = (_1[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]])["call"](_1), _3 = undefined, _3 = _2["next"](), a = _3["value"], _3 = _2["next"](), b = _3["value"], _3 = (!_3 || !_3["done"]) && isFunction(_2["return"]) && _2["return"](), true); _ = _0["next"]()) Symbol } finally { if (_ && !_["done"] && isFunction(_0["return"])) _0["return"]() }
+var _, _0, _1, _2, _3`)
 assert(downLevel(`[...a]=a`), `var slice_ = Array["prototype"]["slice"];\r\na = slice_["call"](a, 0)`)
 assert(downLevel(`[c,...a]=a`), `var slice_ = Array["prototype"]["slice"];\r\nc = a[0], a = slice_["call"](a, 1)`)
 assert(downLevel(`[...a]=a`), `var slice_ = Array["prototype"]["slice"];\r\na = slice_["call"](a, 0)`)
@@ -286,10 +310,10 @@ var _0, _1 };`);
 i++//异步或步进函数
 assert(downLevel(`function *(){yield *a}`), `function () { return aster_(
 function () {
-_; _0 = 0; _1 = a["length"]; return [1, 0]
+_; _0 = 0; return [1, 0]
 },
 function () {
-_3 = _0 < _1; if (!_3) return [1, 0]; _ = a[_0]; _3 = (true)
+_3 = _0 < a["length"]; if (!_3) return [1, 0]; _ = a[_0]; _3 = (true)
 },
 function () {
 if (!_3) return [2, 0]; return [_, 3]
@@ -319,7 +343,7 @@ function () {
 return [0, 9]
 },
 function () {
-_2 = _ &&! _["done"]; if (!_2) return [1, 0]; _2 = _0["return"]; _2 = isFunction(_2)
+_2 = _; if (!_2) return [1, 0]; _2 = !_["done"]; if (!_2) return [1, 0]; _2 = _0["return"]; _2 = isFunction(_2)
 },
 function () {
 if (!_2) return [1, 0]; _2 = _0["return"](); return [1, 0]

package/coms/compile/run-test262.js

@@ -0,0 +1,141 @@
+var fs = require("fs/promises");
+var path = require("path");
+var vm = require("vm");
+var testpath = path.join(__dirname, '../../../test262');
+var $262 = await async function () {
+    var $262 = {
+        evalScript(script) {
+            script = downLevel(script);
+            vm.runInNewContext(script);
+        },
+        createRealm() {
+            return;
+        },
+    };
+    $262.global = vm.createContext({ $262 });
+    var v8agent = await fs.readFile(path.join(testpath, "implementation-contributed/v8/test262/harness-agent.js"));
+    new Function("$262", [v8agent].join("\r\n"))($262);
+    return $262;
+}();
+var harness = await async function () {
+    var hpath = path.join(testpath, "harness");
+    var nameMap = { "-gc": "GC" };
+    var files = await fs.readdir(hpath, { withFileTypes: true });
+    var codes = await queue.call(files.filter(f => /\.js$/i.test(f.name)), async (f) => {
+        var n = f.name;
+        var p = path.join(hpath, n);
+        var code = scanner2(String(await fs.readFile(p)));
+        n = n.replace(/\.js$/i, '').replace(/\-\w+/g, function (a) {
+            return a in nameMap ? nameMap[a] : a[1].toUpperCase() + a.slice(2);
+        });
+        code.name = n;
+        return code;
+    });
+    var vars = {};
+    codes.sort((a, b) => {
+        var aenvs = a.envs;
+        var avars = a.vars;
+        var bvars = b.vars;
+        var benvs = b.envs;
+        for (var k in aenvs) if (k in bvars) return -1;
+        for (var k in benvs) if (k in avars) return 1;
+        return 0;
+    });
+    codes.forEach(c => extend(vars, c.vars));
+    return new Function("$262", 'print', codes.join("\r\n") + `\r\nreturn {${Object.keys(vars).map(a => `${a}:${a}`).join(',')}}`)($262, console.info);
+}();
+await async function () {
+    extend(harness, {
+        aster_,
+        async_,
+        asyncAster_,
+        isFunction,
+        restIter_,
+        rest_,
+        exec_,
+    })
+    extend(global, harness);
+    var rest = [path.join(testpath, 'test')];
+    var ignore = [
+        "dynamic-import",
+        "intl402",
+        "built-ins",
+    ];
+    ignore.forEach(k => ignore[k] = true);
+    var testFiles = [];
+    while (rest.length) {
+        var p = rest.pop();
+        var names = await fs.readdir(p, { withFileTypes: true });
+        for (var n of names) {
+            if (n.name in ignore) continue;
+            var p1 = path.join(p, n.name);
+            if (n.isDirectory()) rest.push(p1);
+            else if (!/\.js$/i.test(p1)) continue;
+            else testFiles.push(p1);
+        }
+    }
+    // testFiles = testFiles.slice(4053,9153);
+    testFiles.skip = 0;
+    var currentTest, currentText;
+    var currentIndex = 0;
+    var running = false;
+    var interupt = function (e) {
+        if (this == 'r' && !running) return;
+        console.fail(this, currentIndex, currentTest + "\r\n");
+        console.log(currentText);
+        if (e) console.trace(e);
+        process.exit();
+    };
+    process.on("uncaughtException", interupt.bind('e'));
+    process.on("unhandledRejection", interupt.bind('r'));
+    await queue.call(testFiles, async function (f, i) {
+        var runText = async function (text) {
+            /**
+             * @type {vm.RunningCodeInNewContextOptions}
+             */
+            var ctxOptions = {
+                filename: f,
+                displayErrors: false,
+            };
+            running = true;
+            if (code.envs.$DONE) harness.$DONE = function (e) {
+                if (e) console.fail(ti, f + "\r\n"), console.log(currentText), console.trace(e), process.exit();
+            };
+            vm.runInThisContext(text, ctxOptions);
+            running = false;
+        };
+        var ti = `${i}/${testFiles.length}`;
+        var data = await fs.readFile(f);
+        var de;
+        try {
+            console.test("解析", ti, f);
+            var code = scanner2(String(data));
+            console.test("降级", ti, f);
+            var text = downLevel.code(code).toString();
+        } catch (e) {
+            de = e;
+        }
+        currentTest = f;
+        currentText = text;
+        currentIndex = ti;
+        if (text) {
+            try {
+                console.test("执行", ti, f);
+                await runText(text);
+            } catch (e) { de = e };
+        }
+        if (de) try {
+            try {
+                console.test("检查", ti, f);
+                await runText(data);
+            } catch (e) { de = null };
+        } catch { de = null; }
+        if (!text && de) {
+            console.log(de)
+            console.fail(ti, f);
+            throw de;
+        }
+        console.pass(path.relative(testpath, f));
+    }, 1, null);
+    console.log(`\r\n完成 ${testFiles.length} 个测试项！`);
+}();

package/coms/compile/unstruct.js

@@ -1,4 +1,4 @@
-var { SPACE, COMMENT, EXPRESS, STRAP, QUOTED, STAMP, SCOPED, VALUE, LABEL, createString, skipAssignment, skipSentenceQueue, isHalfSentence, splice, relink, createExpressList, snapExpressHead, snapExpressFoot } = require("./common");
+var { SPACE, COMMENT, EXPRESS, STRAP, QUOTED, STAMP, SCOPED, VALUE, LABEL, isEval, createString, skipAssignment, skipSentenceQueue, isHalfSentence, splice, relink, createExpressList, snapExpressHead, snapExpressFoot } = require("./common");
 var scanner2 = require("./scanner2");
 var RE = { type: STRAP, text: "@re" };// if (_) return
 var RZ = { type: STRAP, text: "@rz" };// if (!_) return
@@ -139,6 +139,7 @@ var _switch = function (body, cx, unblock, result, getname) {
     var m = o.first;
     var tmp = [];
     while (o[cy] !== m) cy++;
+    var default_ = null, case_ = null;
     while (cy < o.length) {
         var block = getblock(o, ++cy);
         cy += block.length;
@@ -150,23 +151,25 @@ var _switch = function (body, cx, unblock, result, getname) {
         var q = ternary(block, getnextname, true);
         for (var q of q) if (q.length) pushstep(result, q);
         var qe = q;
-        if (qe.name) var case_ = scanner2(`if(${qn}===${qe.name})return[]`);
-        else case_ = scanner2(`return[]`), case_.ret_ = -1;
-        pushstep(result, case_);
+        if (qe.name) case_ = scanner2(`if(${qn}===${qe.name})return[]`), pushstep(result, case_);
+        else default_ = case_ = scanner2(`return[]`), default_.ret_ = -1;
         var by = cy;
         m = o[cy];
         while (m && (m.type !== STRAP || !/^(default|case)$/i.test(m.text))) m = o[++cy];
         tmp.push(result.length - 1, case_[case_.length - 1], o.slice(by, cy));
     }
-    if (!result[result.length - 1].ret_) {
-        case_ = scanner2(`return[]`), case_.ret_ = -1;
-        pushstep(result, case_);
-        tmp.push(result.length - 1, case_[case_.length - 1], []);
+    if (!default_) {
+        default_ = scanner2(`return[]`), default_.ret_ = -1;
+        tmp.push(result.length - 1, default_[default_.length - 1], []);
     }
+    var default_r = default_[default_.length - 1];
+    pushstep(result, default_);
+    default_r.index = result.length - 1;
     while (tmp.length) {
         cy = tmp.shift();
         q = tmp.shift();
         block = tmp.shift();
+        if (default_r === q) cy = default_r.index;
         q.push({ type: VALUE, text: String(result.length - cy) }, { type: STAMP, text: "," }, { type: VALUE, text: '0' });
         relink(q);
         unblock(block);
@@ -322,6 +325,9 @@ var pushstep = function (result, step) {
     }
     _return(step);
 };
+var patchresult = function (result) {
+    for (var cx = 0, dx = result.length; cx < dx; cx++)patchstep(result[cx], result.length - cx, 0);
+};
 var patchstep = function (r, nextindex, h) {
     var name = r.name;
     var o, i, x, p, n;
@@ -335,6 +341,7 @@ var patchstep = function (r, nextindex, h) {
             r.splice(i, 1, ...scanner2(_withget(b.text)));
         }
     }
+    var changed = false;
     for (i = r.length - 1; i >= h; i--) {
         o = r[i];
         if (o === RZ) {
@@ -347,6 +354,7 @@ var patchstep = function (r, nextindex, h) {
             x = scanner2(`if(${name}!==null&&${name}!== undefined)return [${nextindex},0]`);
         }
         else continue;
+        changed = true;
         var p = o.prev;
         if (!p || p.type === STAMP && p.text === ";");
         else x.unshift({ type: STAMP, text: ";" });
@@ -354,22 +362,15 @@ var patchstep = function (r, nextindex, h) {
         if (!n || n.type === STAMP && n.text === ';');
         else x.push({ type: STAMP, text: ';' });
         r.splice(i, 1, ...x);
-        relink(r);
     }
+    if (changed) relink(r);
+    return changed;
 };
 var flushqueue = function (result, queue) {
-    var savedLength = result.length;
-    var savedIndex = savedLength - 1;
-    var prev = result[savedIndex];
-    if (prev) var patch = prev.length;
     for (var q of queue) pushstep(result, q);
-    queue = [];
-    if (ret_) {
-        if (prev) patchstep(prev, result.length - savedIndex, patch || 0);
-        result.slice(savedLength).forEach((a, i) => patchstep(a, result.length - savedLength - i, 0));
-    }
 };
 
+
 var _do = function (body, cx, unblock, result) {
     var o = body[cx];
     var label = o;
@@ -438,17 +439,6 @@ var remove_end_comma = function (o) {
         splice(o, cx, o.length - cx);
     }
 };
-var isEvalScope = function (o) {
-    if (o.entry === "[") {
-        var h = snapExpressHead(o);
-        return o !== h;
-    }
-    else if (o.entry === '(') {
-        var h = snapExpressHead(o);
-        return o === h;
-    }
-    return false;
-};
 var ispropcall = function (o) {
     var n = o.next;
     if (!n || n.type !== SCOPED && n.entry !== '(') return false;
@@ -493,7 +483,7 @@ var _invoke = function (t, getname) {
         if (o.type === SCOPED && (o.entry === '[' || o.entry === "(")) {
             var _nameindex = nameindex;
             remove_end_comma(o);
-            var iseval = isEvalScope(o);
+            var iseval = o.iseval = isEval(o);
             var constStart = 0;
             if (!iseval) {
                 for (var cy = 0; cy < o.length; cy++) {
@@ -522,7 +512,7 @@ var _invoke = function (t, getname) {
                 if (!iseval || m[m.length - 1] === o.last) {
                     var q = toqueue(m, getdeepname, 1);
                     var qe = q[q.length - 1];
-                    splice(o, by, ey - by, { text: qe.name, type: EXPRESS });
+                    splice(o, by, ey - by, ...qe ? [{ text: qe.name, type: EXPRESS }] : []);
                     cy = by + 1;
                 }
                 else {
@@ -567,9 +557,9 @@ var _invoke = function (t, getname) {
         }
         pushstep(result, t);
     }
+    if (ret_) patchresult(result, 0);
     return result;
 };
-
 var _await = function (t) {
     var t0 = t[0];
     if (t0.type === STRAP) {
@@ -615,7 +605,7 @@ var clone = function (o) {
 var popass = function (explist) {
     var asn = explist.pop();
     var n;
-    if (!asn.ret_ && asn.length) {
+    if (asn && !asn.ret_ && asn.length) {
         asn = createExpressList(asn);
         if (asn.length > 1) {
             explist.push(...asn.slice(0, asn.length - 1));
@@ -627,7 +617,7 @@ var popass = function (explist) {
         }
     }
     else {
-        n = asn.name;
+        n = asn && asn.name;
         asn = [{ type: EXPRESS, text: n }];
     }
     return [asn, n];
@@ -686,10 +676,12 @@ var ternary = function (body, getname, ret) {
             if (!question.length) {
                 var b = body.slice(equalsend, bx);
                 relink(b);
-                var c = toqueue(body.slice(bx + 1, cx), getnextname, true);
-                var d = toqueue(body.slice(cx + 1), getnextname, true);
-                patchname(c, getnextname);
-                patchname(d, getnextname);
+                var c = toqueue(equals.concat(body.slice(bx + 1, cx)), getnextname, true);
+                var d = toqueue(equals.concat(body.slice(cx + 1)), getnextname, true);
+                if (!equals.length && ret) {
+                    patchname(d, getnextname);
+                    patchname(c, getnextname);
+                }
                 pushstep(d, stepReturn(1, 0, d));
                 pushstep(c, stepReturn(d.length + 1, 0, c));
                 pushstep(explist, scanner2(`if(${getCondition(b, function (b) {
@@ -707,9 +699,12 @@ var ternary = function (body, getname, ret) {
                 qe.text = String(explist.length - qi);
                 explist.push(...d);
                 hasquestion = true;
-                break;
+                return explist;
             }
         }
+        else if (o.text === "=>") {
+            cx = skipAssignment(body, cx + 1);
+        }
         else if (powermap[o.text] === powermap["="]) {
             var ass = toqueue(body.slice(equalsend, cx), getnextname, false);
             var [ass1, n = ++eqused] = popass(ass);
@@ -731,6 +726,7 @@ var ternary = function (body, getname, ret) {
             explist = [r];
         }
         else {
+            if (equals.length && bd.length === 1 && bd[0].type === SCOPED && bd[0].entry === '(' && skipAssignment(bd[0], 0) === bd[0].length) bd = bd[0];
             explist = _express(bd, getnextname, equalsend > skip || ret);
         }
     }
@@ -1142,12 +1138,18 @@ function toqueue(body, getname, ret = false, result = []) {
         while (labels.length) {
             var e = labels[labels.length - 1];
             if (e.type !== LABEL) break;
-            if (scopes.lastIndexOf(e.scope) >= 0) break;
+            var ei = scopes.lastIndexOf(e.scope);
+            if (ei === scopes.length - 1) {
+                if (cx < e.final) break;
+            }
+            else if (ei >= 0) break;
             _poplabel();
         }
 
         if (o.type === LABEL) {
             o.scope = scopes[scopes.length - 1];
+            o.final = body.indexOf(skipSentenceQueue(o.next), cx);
+            if (o.final < 0) o.final = body.length;
             labels.push(o);
             var next = o.next;
             if (next && next.type === SCOPED && next.entry === '{') {

package/coms/compile/unstruct_test.js

@@ -1,9 +1,11 @@
 var unstruct = require('./unstruct');
 var scanner2 = require("./scanner2");
-var { createString } = require("./common");
-var r = 10;
+var { createString, STRAP } = require("./common");
+var r = 12;
+var innerjs = new Javascript;
+innerjs.defaultType = STRAP;
 function test(codetext, expect, ret = false) {
-    var code = scanner2(codetext), i = -2;
+    var code = scanner2(codetext, innerjs), i = -2;
     try { code = unstruct(code, () => ++i >= 0 ? "_" + i : '_', ret && "@"); } catch (e) { console.log(r); throw e }
     assert(code.map(createString).join(";\r\n "), expect, r++);
 }
@@ -18,7 +20,7 @@ test('a * a + b * c * c ** d', "_ = a * a, _0 = b * c, _1 = c ** d, _0 = _0 * _1
 test('a * a || b * c * c ** d', "_ = a * a @re _ = b * c, _0 = c ** d, _ * _0");
 test('a * a || b * c || c * d', "_ = a * a @re _ = b * c @re c * d");
 test('a || b || c', "_ = a; if (_) return [1, 0]; _ = b; if (_) return [1, 0]; c", true);
-test('a?b:c', "if (!a) return [1, 0]; _ = b; return [2, 0];\r\n _ = c; return [1, 0]");
+test('a?b:c', "if (!a) return [1, 0]; b; return [2, 0];\r\n c; return [1, 0]");
 test('a * a && b * c * c ** d', "_ = a * a @rz _ = b * c, _0 = c ** d, _ * _0");
 test('a = 1 + 2', "a = 1 + 2", true);
 test('a = b', "a = b", true);
@@ -36,11 +38,13 @@ test('a * a ?? b * c * c ** d', "_ = a * a; if (_ !== null && _ !== undefined) r
 test('a * a && await b*c', "_ = a * a; if (!_) return [2, 0]; _ = b; return [_, 1];\r\n _ = @; _ * c", true);
 test("await a", "_ = a; return [_, 1]", true);
 test("yield a", "return [a, 3]", true);
+test("!a.done&&(b=await a.value)", "_ = !a.done; if (!_) return [2, 0]; _ = a.value; return [_, 1];\r\n _ = @; b = _; (_)", true);
+test("a=1?2:3",`if (false) return [1, 0]; a = 2; return [2, 0];\r\n a = 3; return [1, 0]`)
 test("await a()", "_ = a(); return [_, 1]", true);
 test("yield a()", "_ = a(); return [_, 3]", true);
 test("a = await a()", "_ = a(); return [_, 1];\r\n _ = @; a = _", true);
 test("a = yield a()", "_ = a(); return [_, 3];\r\n _ = @; a = _", true);
-test("(1+ +1)", "_ = +1, _ = 1 + _; (_)", true);
+test("(1+ +1)", "_ = 1 + +1; (_)", true);
 test("await a(await b)", "_ = b; return [_, 1];\r\n _ = @; _ = a(_); return [_, 1]", true);
 test("await a(await b).s(await c)", "_ = b; return [_, 1];\r\n _ = @; _ = a(_); _0 = c; return [_0, 1];\r\n _0 = @; _ = _.s(_0); return [_, 1]", true);
 test("a*a + await a(await b).s(await c)", "_ = a * a, _0 = b; return [_0, 1];\r\n _0 = @; _0 = a(_0); _1 = c; return [_1, 1];\r\n _1 = @; _0 = _0.s(_1); return [_0, 1];\r\n _0 = @; _ + _0", true);
@@ -114,4 +118,5 @@ test("//aaa", '//aaa', true);
 test("menus[0].name+='aaa'", "_ = menus[0]; _0 = _.name + 'aaa'; _.name = _0", true);
 test("menus[a+b].name+='aaa'", "_ = a + b; _ = menus[_]; _0 = _.name + 'aaa'; _.name = _0", true);
 test("menus[a+b]()", "_ = a + b; menus[_]()", true);
+test(`switch(a){default: a;case 1:b;}`, 'if (a === 1) return [2, 0]; return [1, 0];\r\n a; return [1, 0];\r\n b; return [1, 0]', true);
 test("loop:{a=b;if(a) continue loop}", "a = b; if (a) return [0, 0]", true);

package/coms/kugou/dance.js

@@ -62,6 +62,7 @@ var danceIcon = lazy(async function (theta) {
  */
 function draw(buffer) {
     danceIcon(buffer.theta);
+    if (!buffer.length) return;
     var canvas = this;
     var context = canvas.getContext("2d");
     if (canvas.width !== canvas.offsetWidth * devicePixelRatio) canvas.width = canvas.offsetWidth * devicePixelRatio;