efront 3.37.0 → 3.38.1

package/coms/compile/unstruct.js

@@ -1,12 +1,14 @@
-var { SPACE, COMMENT, EXPRESS, STRAP, QUOTED, STAMP, SCOPED, VALUE, LABEL, createString, skipAssignment, relink } = require("./common");
+var { SPACE, COMMENT, EXPRESS, STRAP, QUOTED, STAMP, SCOPED, VALUE, LABEL, createString, skipAssignment, 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
 var RD = { type: STRAP, text: "@rd" };// if (_) return
 var RETURN = { type: STRAP, text: "@ret" };// return;
+var THROW = { type: STRAP, text: "@throw" };// return;
 var YIELD = { type: STRAP, text: "@yield" };// return;
 var NEXT = { type: STRAP, text: "@next" };// return;
 var _break = function (body, cx, result, iscontinue) {
+    if (!result.length || result[result.length - 1].ret_) return;
     var label;
     do {
         var o = body[++cx];
@@ -20,10 +22,11 @@ var _break = function (body, cx, result, iscontinue) {
             var b = labels[cx];
             if (b.type === LABEL && b.text === label) {
                 if (!b.breaks) b.breaks = [];
-                var _b = scanner2(`return[]`);
-                if (iscontinue) _b.continue = s, s.continue = true;
-                addresult(result, _b);
-                b.breaks.push(_b);
+                var _b = scanner2('return []');
+                _b.ret_ = true;
+                if (iscontinue) _b[1].continue = s, s.continue = true;
+                b.breaks.push(_b[1]);
+                pushstep(result, _b);
                 break;
             }
             else {
@@ -36,10 +39,11 @@ var _break = function (body, cx, result, iscontinue) {
             var b = labels[cx];
             if (b.type !== LABEL) {
                 if (!b.breaks) b.breaks = [];
-                var _b = scanner2(`return[]`);
-                if (iscontinue) _b.continue = b, b.continue = true;
-                addresult(result, _b);
-                b.breaks.push(_b);
+                var _b = scanner2("return []");
+                _b.ret_ = true;
+                if (iscontinue) _b[1].continue = b, b.continue = true;
+                b.breaks.push(_b[1]);
+                pushstep(result, _b);
                 break;
             }
         }
@@ -50,13 +54,13 @@ var _try = function (body, cx, unblock, result, getname) {
     var o = body[cx];
     o = o.next;
     while (body[cx++] !== o);
-    var trystart = scanner2(`return [,7]`);
-    addresult(result, trystart);
+    var trystart = stepReturn(0, 7);
+    var tse = trystart[trystart.length - 1];
+    pushstep(result, trystart);
     var tryoffset = result.length;
     unblock(o);
-    var final = scanner2(`return [0,9]`);
-
-    addresult(result, final);
+    var final = stepReturn(0, 9);
+    pushstep(result, final);
     o = o.next;
     if (o.type !== STRAP || o.text !== 'catch') throw `缺少catch语句`;
     o = o.next;
@@ -65,27 +69,27 @@ var _try = function (body, cx, unblock, result, getname) {
     if (o.type === SCOPED && o.entry === "(") {
         var e = o.first;
         if (e) {
-            arg = scanner2(`${e.text}=${ret_ || "@"}`);
-            addresult(result, arg);
+            arg = scanner2(`${e.text}=${ret_ || "@"};`);
         }
         o = o.next;
     }
+    var ai = result.length;
     unblock(o);
+    if (ai < result.length) {
+        if (arg.length) result[ai].unshift(...arg), result[ai].awaited = true, relink(result[ai]);
+        if (!result[result.length - 1].ret_) pushstep(result, stepReturn(0, 9));
+    }
     o = o.next;
+    var finishoffset = result.length;
     if (o && o.type === STRAP && o.text === 'finally') {
         o = o.next;
-        var finishoffset = result.length;
         unblock(o);
     }
-    var tse = trystart[trystart.length - 1];
-    tse.unshift({
-        text: String(catchoffset - tryoffset << 16 | finishoffset - catchoffset),
-        type: VALUE,
-    });
-    relink(tse);
-
-    var finalend = scanner2(`return [1,9]`);
-    addresult(result, finalend);
+    tse[0].text = String(catchoffset - tryoffset | finishoffset - catchoffset << 16);
+    var finalend = stepReturn(1, 9);
+    pushstep(result, finalend);
+    while (cx < body.length && body[cx] !== o) cx++;
+    return cx;
 };
 var evals = [];
 
@@ -93,8 +97,9 @@ var _with = function (body, cx, unblock, result, getname) {
     var o = body[cx];
     var c = o.next;
     while (body[cx] !== c) cx++;
-    unblock(c);
-    evals.push(getname(0));
+    var qs = ternary(c, getname, true);
+    for (var q of qs) if (q.length) pushstep(result, q);
+    evals.push(q.name);
     var block = getblock(body, ++cx);
     cx += block.length;
     unblock(block);
@@ -118,7 +123,10 @@ var _switch = function (body, cx, unblock, result, getname) {
     var o = body[cx];
     o = o.next;
     if (!o) return;
-    unblock(o);
+    var qt = _express(o, getname, true);
+    for (var q of qt) if (q.length) pushstep(result, q);
+    var q = qt[qt.length - 1];
+    var qn = q.name;
     o = o.next;
     while (body[cx++] !== o);
     if (!o) return;
@@ -128,38 +136,40 @@ var _switch = function (body, cx, unblock, result, getname) {
     while (o[cy] !== m) cy++;
     while (cy < o.length) {
         var block = getblock(o, ++cy);
-        cy += block.length + 1;
+        cy += block.length;
+        while (cy < o.length && o[cy].type & (SPACE | COMMENT)) cy++;
+        cy++;
         var getnextname = function (deep) {
             return getname(deep + 1);
         };
         var q = _express(block, getnextname, true);
-        for (var q of q) addresult(result, q);
-        var case_ = scanner2(`if(${getname(0)}===${getname(1)})return[]`)
-        addresult(result, case_);
+        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_ = true;
+        pushstep(result, case_);
         var by = cy;
         m = o[cy];
-        while (m && (m.type !== STRAP || m.text !== 'case')) m = o[++cy];
-        tmp.push(result.length - 1, case_, o.slice(by, 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_ = true;
+        pushstep(result, case_);
+        tmp.push(result.length - 1, case_[case_.length - 1], []);
     }
     while (tmp.length) {
         cy = tmp.shift();
-        case_ = tmp.shift();
+        q = tmp.shift();
         block = tmp.shift();
-        var q = case_[case_.length - 1];
         q.push({ type: VALUE, text: String(result.length - cy) }, { type: STAMP, text: "," }, { type: VALUE, text: '0' });
         relink(q);
-        for (var cy = 0, dy = block.length; cy < dy; cy++) {
-            var b = getblock(block, cy);
-            cy += b.length;
-            var r = toqueue(b, getnextname, true);
-            for (var r of r) {
-                result.push(r);
-            }
-        }
+        unblock(block);
+        ifpatch(result);
     }
     return cx;
 };
-var _for = function (body, cx, unblock, result, tmpname) {
+var _for = function (body, cx, unblock, result) {
     var o = body[cx];
     var label = o;
     o = o.next;
@@ -172,40 +182,61 @@ var _for = function (body, cx, unblock, result, tmpname) {
         // 含有高级语法的 for in 语句在 ./downLevel.js 中预处理
         var dx = cx;
         var n = o.next;
+        if (n && n.type === SCOPED && n.entry === '(') n = n.next;
         while (body[dx] !== n) dx++;
-        addresult(result, body.slice(cx, dx));
-        return dx;
+        var forin = body.slice(cx, dx);
+        var block = getblock(body, dx);
+        forin.push(...block);
+        pushstep(result, forin);
+        return dx + block.length + 1;
     }
     var cy = 0;
     while (o[cy] !== m) cy++;
     var block = getblock(o, cy);// init
     cy += block.length + 1;
-    unblock(block, ...scanner2(`;return [1,0]`));
+    unblock(block);
+    if (result.length) pushstep(result, stepReturn(1, 0));
     var block1 = getblock(o, cy);// condition
     cy += block1.length + 1;
     var block2 = getblock(o, cy);// next
     while (body[cx] !== o) cx++;
     var block_ = getblock(body, ++cx);// body
     cx += block_.length;
-    unblock(block1);
-    relink(result[result.length - 1]);
-    var b = scanner2(`;if(!${tmpname})return []`)
-    result[result.length - 1].push(...b);
-    relink(result[result.length - 1]);
+    var c = result.length;
+    if (block1.length) {
+        var t = unblock(block1);
+        if (t) {
+            t = t && !t.await_ ? t.name : ret_;
+            var b = scanner2(`if(!${t})return []`);
+            var be = b[b.length - 1];
+            pushstep(result, b);
+        }
+    }
     var i = result.length;
     unblock(block_);
-    if (label.continue) label.continue = result.length, result[result.length - 1].cont = true, label.contat = result.length;
+    if (label.continue) ifpatch(result), label.contat = result.length;
     unblock(block2);
-    result[result.length - 1].push(...scanner2(`;return [${i - result.length},0]`));
-    b[b.length - 1].push(...scanner2(`${result.length - i + 1},0`));
-    relink(result[result.length - 1]);
+    var loopback = stepReturn(0, 0);
+    var le = loopback[loopback.length - 1];
+    pushstep(result, loopback);
+    if (be) be.push(...scanner2(`${result.length - i + 1},0`)), relink(be);
+    le[0].text = String(c - result.length + 1);
     return cx;
 };
+var isunary = function (o) {
+    var f = o.first;
+    if (!f) return false;
+    while (f) {
+        if (f.type & (STAMP | STRAP) && powermap[f.text] < powermap.new) return false;
+        f = f.next;
+    }
+    return true;
+}
 var getCondition = function (o, unblock, not_) {
     var n = '';
     var f = o.first;
-    var not = f.type === STAMP && f.text === "!";
-    if (not) f = f.next;
+    var not = isunary(o) && f.type === STAMP && f.text === "!";
+    if (not) f = f.next, o.shift();
     if (not_) not = !not;
     if (f && f === o.last) {
         if (f.type & (EXPRESS | VALUE)) {
@@ -220,25 +251,36 @@ var getCondition = function (o, unblock, not_) {
     }
     if (!n) {
         n = unblock(o);
-        n = n.await ? ret_ : n.name;
+        if (n.await_) {
+            n.ret_ = true;
+            delete n.await_;
+            n.await__ = true;
+            n = ret_;
+        }
+        else n = n.name;
         if (not) n = "!" + n;
     }
     return n;
 }
-var _while = function (body, cx, unblock, result, tmpname) {
+var _while = function (body, cx, unblock, result) {
     var o = body[cx];
+    ifpatch(result);
     o.contat = result.length;
     o = o.next;
     while (body[cx] !== o) cx++;
-    var b = scanner2(`if(${getCondition(o, unblock, true)})return []`)
-    result.push(b);
+    var i = result.length;
+    var b = scanner2(`if(${getCondition(o, unblock, true)})return []`);
+    var be = b[b.length - 1];
+    pushstep(result, b);
     relink(result[result.length - 1]);
     var block = getblock(body, ++cx);
-    var i = result.length;
     cx += block.length;
     unblock(block);
-    result.push(scanner2(`return [${i - result.length - 1},0]`));
-    b[b.length - 1].push(...scanner2(`${result.length - i + 1},0`));
+    var wend = stepReturn(0, 0);
+    var we = wend[wend.length - 1];
+    pushstep(result, wend);
+    we[0].text = String(1 + i - result.length);
+    be.push(...scanner2(`${result.length - i},0`));
     return cx;
 };
 var pushstep = function (result, step) {
@@ -247,17 +289,23 @@ var pushstep = function (result, step) {
     if (!q) {
         result.push(step);
     }
-    else if (q.await) {
-        if (!step.awaited) step.unshift(...scanner2(`${q.name}=${ret_};`));
+    else if (q.await_) {
+        if (!step.awaited) step.unshift(...scanner2(`${q.name}=${ret_};`)), relink(step);
         step.awaited = true;
-        relink(step);
         result.push(step);
     }
-    else if (q.ifrt || q.cont) {
+    else if (q.ret_) {
+        if (q.await__) step.awaited = true;
         result.push(step);
     }
     else {
-        q.push({ type: STAMP, text: ";" }, ...step);
+        if (needcomma(q)) q.push({ type: STAMP, text: ';' });
+        if (!ishalf(q)) {
+            q.ret_ = step.ret_;
+        }
+        q.push(...step);
+        q.await_ = step.await_;
+        q.name = step.name;
         step = q;
         relink(q);
     }
@@ -298,63 +346,83 @@ var patchstep = function (r, nextindex, h) {
         relink(r);
     }
 };
-var addresult = function (result, step) {
-    if (!step.length) return;
+var flusqueue = function (result, queue) {
     var savedLength = result.length;
-    var prev = result[savedLength - 1];
+    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 addresult = function (result, step) {
+    if (!step.length) return;
     var cx, mx = 0, n;
     var awaited = step.awaited;
+    var queue = [];
     do {
+        while (step[mx] && step[mx].type === STAMP && /^[,;]$/.test(step[mx].text)) mx++;
         cx = step.indexOf(NEXT, mx);
         n = step.slice(mx, mx = cx < 0 ? step.length : cx + 1);
         if (awaited) n.awaited = awaited, awaited = false;
         n.name = step.name;
-        pushstep(result, n);
+        queue.push(n);
     } while (mx < step.length);
-    if (ret_) {
-        if (prev) patchstep(prev, result.length - savedLength - 1, patch || 0);
-        result.slice(savedLength).forEach((a, i) => patchstep(a, result.length - i - savedLength, 0));
-    }
+    flusqueue(result, queue);
 };
-var _do = function (body, cx, unblock, result, tmpname) {
+var _do = function (body, cx, unblock, result) {
     var o = body[cx];
     var label = o;
     o = o.next;
+    ifpatch(result);
     var i = result.length;
     unblock(o);
     o = o.next.next;
-    if (label.continue) result[result.length - 1].cont = true, label.contat = result.length;
-    var b = scanner2(`if(${getCondition(o, unblock)})return [${i - result.length},0];return [1,0]`);
-    addresult(result, b);
+
+    if (label.continue) ifpatch(result), label.contat = result.length;
+    var b = scanner2(`if(${getCondition(o, unblock)})return [${i - result.length},0]`);
+    pushstep(result, b);
     while (body[cx] !== o) cx++;
-    return cx;
+    return cx + 1;
 };
-
+var stepReturn = function (value, type, q) {
+    var r = scanner2(`return [${value},${type}]`);
+    r.ret_ = true;
+    if (q && q.length) r.name = q[q.length - 1].name;
+    return r;
+}
 var needbreak = function (o) {
-    return o === RE || o === RZ || o === RD || o === RETURN || o === NEXT || o === YIELD;
+    return o && o.type === STAMP && /^[,;]$/.test(o.text) || o === RD || o == RE || o === RZ || isretn(o);
 };
+var isretn = function (o) {
+    return o === RETURN || o === NEXT || o === YIELD || o === THROW;
+}
 var _return = function (r, nextindex) {
     var name = r.name;
     var e = r[r.length - 1];
-    if (!needbreak(e)) return;
-    r.ifrt = true;
+    if (!isretn(e)) return;
     r.pop();
-    var semicolon = r[r.length - 1];
-    semicolon = semicolon && semicolon.type === STAMP && /^[,;]$/.test(semicolon.text);
+    r.ret_ = !ishalf(r);
     var x;
     if (e === RETURN) {
-        x = scanner2(`return [${name},2]`);
+        x = stepReturn(name, 2);
     }
     else if (e === YIELD) {
-        x = scanner2(`return [${name},3]`);
+        x = stepReturn(name, 3);
+    }
+    else if (e === THROW) {
+        x = scanner2(`throw ${name}`);
     }
     else if (e === NEXT) {
-        x = scanner2(`return [${name},1]`);
-        r.await = true;
+        x = stepReturn(name, 1);
+        r.await_ = true;
     }
-    if (semicolon) r.pop();
-    r.push({ type: STAMP, text: ';' });
+    if (needcomma(r)) r.push({ type: STAMP, text: ';' });
+    else if (r.length) r[r.length - 1].text = ';';
     r.push(...x);
     relink(r);
 };
@@ -362,7 +430,7 @@ var remove_end_comma = function (o) {
     if (!o.length || o.type !== SCOPED || o.entry === '[') return;
     for (var cx = o.length - 1; cx >= 0; cx--) {
         var m = o[cx];
-        if (m.type !== SPACE && m.type !== COMMENT) {
+        if (!(m.type & (SPACE | COMMENT))) {
             break;
         }
     }
@@ -379,55 +447,72 @@ var _invoke = function (t, getname) {
     var cache = [];
     var queue = [];
     queue.name = t.name;
+    var qname = t.name;
     var bx = 0;
     for (var cx = 0; cx < t.length; cx++) {
         var o = t[cx];
-        if (o.type === STAMP && /^[,;]$/.test(o.text)) {
-            if (queue.length) queue.push({ type: STAMP, text: ',' });
-            queue.push(...t.splice(bx, cx + 1));
-            cx += bx - cx - 1;
-            queue.pop();
+        if (needbreak(o)) {
+            if (needcomma(queue)) queue.push({ type: STAMP, text: ',' });
+            var s = splice(t, bx, cx + 1 - bx);
+            if (cx > 0) s.name = s[0].text;
+            else s.name = qname;
+            queue.push(s);
+            cx = bx - 1;
             bx = cx + 1;
             continue;
         }
         if (o.type === SCOPED && (o.entry === '[' || o.entry === "(")) {
             var _nameindex = nameindex;
             remove_end_comma(o);
-            var cy = 0;
             for (var cy = 0; cy < o.length; cy++) {
+                if (o[cy].type & (SPACE | COMMENT)) continue;
                 var by = cy;
+                var c = o[cy];
+                if (c.type & STAMP && /^[,;]$/.test(c.text)) continue;
                 cy = skipAssignment(o, cy);
                 if (by === cy) continue;
                 var m = o.slice(by, cy);
-                if (m.length === 1 && (m[0].type === EXPRESS && !/\./.test(m[0].text) || m[0].type === VALUE || m[0].type === QUOTED)) {
+                if (m.length === 1 && (m[0].type === EXPRESS && !/\./.test(m[0].text) || m[0].type === VALUE || m[0].type === QUOTED && !m[0].length)) {
                     continue;
                 }
                 var q = toqueue(m, getdeepname, true);
-                o.splice(by, cy, { text: getdeepname(0), type: EXPRESS });
+                var qe = q[q.length - 1];
+                o.splice(by, cy - by, { text: qe.name, type: EXPRESS });
                 cy -= cy - by - 1;
                 nameindex++;
                 cache.push(...q);
             }
-            if (!cache.length) continue;
             nameindex = _nameindex;
-            if (queue.length) addresult(result, queue), queue = [], queue.name = getdeepname(nameindex);
-            result.push(...cache);
+            if (!cache.length) continue;
+            if (queue.length) flusqueue(result, queue), queue = [];
+            for (var c of cache) pushstep(result, c);
             cache = [];
-            var m = t.splice(bx, cx + 1);
-            m.name = queue.name;
-            cx -= m.length;
-            if (bx + 1 < t.length && (t[bx].type & (SCOPED | EXPRESS))) t.splice(bx, 0, ...scanner2(`${getname(0)}=${getname(nameindex)}`)), t.name = getname(0);
-            relink(m);
-            addresult(result, m);
-            nameindex++;
-            bx = cx + 1;
+            var n = o.next;
+            if (n && !needbreak(n)) {
+                var h = snapExpressHead(o);
+                var hx = t.lastIndexOf(h, cx);
+                var fs = splice(t, hx, cx + 1 - hx, { type: EXPRESS, text: getname(nameindex) });
+                fs.unshift(...scanner2(`${getname(nameindex)}=`));
+                relink(fs);
+                fs.name = getname(nameindex);
+                pushstep(result, fs);
+                nameindex++;
+                cx = hx - 1;
+            }
         }
     }
     if (queue.length) {
-        if (t.length) queue.push({ type: STAMP, text: ',' }, ...t), queue.name = t.name;
-        addresult(result, queue);
+        queue.push(t);
+        flusqueue(result, queue);
+    }
+    else if (t.length) {
+        var t0 = t[0];
+        if (t0.type === EXPRESS && /^\./.test(t0.text) || t0.type & (STAMP | STRAP) && powermap[t0.text] < powermap.new) {
+            t.unshift(...scanner2(`${qname}=${qname}`));
+            relink(t);
+        }
+        addresult(result, t);
     }
-    else if (t.length) addresult(result, t);
     return result;
 };
 
@@ -438,40 +523,196 @@ var _await = function (t) {
     }
     return false;
 };
+var ishalf = function (q) {
+    var i = q.length - 1;
+    var e = q[i];
+    while (i > 0 && e.type & (SPACE | COMMENT)) e = q[--i];
+    if (!e) return false;
+    return e.type === SCOPED && e.entry === '(' && e.prev && e.prev.type === STRAP && /^if$/.test(e.prev.text) || e.type === STRAP && /^else$/.test(e.text);
+}
 var needcomma = function (q) {
     if (!q.length) return false;
     var e = q[q.length - 1];
+    if (ishalf(q)) return false;
     return !needbreak(e);
 };
+var patchname = function (d, getname) {
+    var de = d[d.length - 1];
+    if (de && !de.name) {
+        splice(de, 0, 0, { type: EXPRESS, text: getname(0) }, { type: STAMP, text: "=" });
+        de.name = getname(0);
+    }
+}
 var ternary = function (body, getname, ret) {
+    var getnextname = function (i) {
+        return getname(i + 1);
+    };
     var question = [];
     var res = [];
+    var equalsend = 0;
+    var skip = 0;
+    var equcount = 0;
     for (var cx = 0, dx = body.length; cx < dx; cx++) {
         var o = body[cx];
-        if (o.type == STAMP && o.text === '?') {
+        if (o.type === STRAP && /^(var|let|const)$/.test(o.text)) {
+            skip = cx + 1;
+            equalsend = skip;
+            continue;
+        }
+        if (o.type !== STAMP) continue;
+        if (o.text === '?') {
             question.push(cx);
         }
-        else if (o.type === STAMP && o.text === ":") {
+        else if (o.text === ":") {
             var bx = question.pop();
             if (!question.length) {
-                var b = body.slice(0, bx);
+                var b = body.slice(equalsend, bx);
                 relink(b);
-                var c = ternary(body.slice(bx + 1, cx), getname, true);
-                var d = ternary(body.slice(cx + 1), getname, true);
-                addresult(c, scanner2(`return [${d.length + 1},0]`));
+                var c = toqueue(body.slice(bx + 1, cx), getname, true);
+                var d = toqueue(body.slice(cx + 1), getname, true);
+                patchname(c, getname);
+                patchname(d, getname);
+                pushstep(d, stepReturn(1, 0, d));
+                pushstep(c, stepReturn(d.length + 1, 0, c));
                 addresult(res, scanner2(`if(${getCondition(b, function (b) {
-                    addresult(res, _express(b));
-                    return res[res.length - 1];
-                })})return [1,0]`));
-                res.push(...c);
+                    b = ternary(b, getname, true);
+                    for (var b of b) addresult(res, b);
+                    return b;
+                }, true)})return [1,0]`));
+                var q = res[res.length - 1];
+                var qi = res.length - 1;
+                var qe = q[q.length - 1];
+                if (c.length) {
+                    pushstep(res, c[0]);
+                    res.push(...c.slice(1));
+                }
+                qe.text = String(res.length - qi);
                 res.push(...d);
             }
         }
+        else if (powermap[o.text] === powermap["="]) {
+            if (!question.length) equalsend = cx + 1, equcount += o.text.length;
+        }
     }
-    if (!res.length) return _express(body, getname, ret);
-    return res;
+    if (!res.length) {
+        var bd = equalsend ? body.slice(equalsend) : body;
+        if (!ret && equcount === 1 && canbeOnce(bd)) {
+            res = [bd];
+        }
+        else {
+            res = _express(bd, getname, equalsend > skip || ret);
+        }
+    }
+    if (equalsend === skip) {
+        return res;
+    }
+    var equals = body.slice(skip, equalsend);
+    var explist = res;
+    var q = explist[explist.length - 1];
+    // if (!q) throw `语法错误: <red>${createString(body)}</red> \r\n行列位置: ${equals[0].row}:${equals[0].col}`
+    var n = q.name;
+    var i = equals.length - 1;
+    while (i >= 0) {
+        var p = equals[i];
+        while (p && p.type & (SPACE | COMMENT)) p = equals[--i];
+        if (!p) break;
+        var a = p.prev;
+        var b = snapExpressHead(a);
+        if (b) {
+            var ai = equals.lastIndexOf(b, i);
+        }
+        else {
+            var ai = equals.lastIndexOf(a, i);
+        }
+        if (ai < 0) ai = 0;
+        var ass = equals.slice(ai, i);
+        if (n) var asn = [{ type: EXPRESS, text: n }];
+        else asn = explist.pop();
+        for (var a of ass) {
+            if (a.type === SCOPED) {
+                if (a.entry === '[') {
+                    var q = _express(a, getnextname, true);
+                    for (var q of q) {
+                        if (q.length) pushstep(explist, q);
+                    }
+                    splice(a, 0, a.length, { type: EXPRESS, text: q.name });
+                }
+                else if (a.entry === '(') {
+                    _invoke(a);
+                }
+            }
+        }
+        var an = '';
+        var eq = equals[i];
+        if (eq.text.length > 1) {
+            var punc = eq.text.slice(0, eq.text.length - 1);
+            var bdtmp = ass.concat({ type: STAMP, text: punc }, ...asn);
+            var explist2 = _express(bdtmp, getname, true);
+            for (var e of explist2) pushstep(explist, e);
+            eq.text = "=";
+            var q2 = explist2[explist2.length - 1];
+            an = q2.name;
+        }
+        else an = n;
+        ass.push(equals[i], ...asn);
+        relink(ass);
+        if (evals.length) ass[0].set = getname(0);
+        ass.name = an;
+        patchstep(ass, ass.length, 0);
+        pushstep(explist, ass);
+        i = ai - 1;
+        n = an;
+    }
+    return explist;
+};
+var canbeOnce = function (body) {
+    for (var cx = 0, dx = body.length; cx < dx; cx++) {
+        if (body[cx].type & (SPACE | COMMENT)) continue;
+        break;
+    }
+    var o = body[cx];
+    var n = snapExpressFoot(o);
+    var bx = cx;
+    cx = n ? body.lastIndexOf(n) + 1 : body.length;
+    if (cx < 0) return false;
+    for (; cx < dx; cx++) {
+        if (body[cx].type & (SPACE | COMMENT)) continue;
+        return false;
+    }
+    for (cx = bx; cx < dx; cx++) {
+        var o = body[cx];
+        if (o.type & (SPACE | COMMENT)) continue;
+        if (o.type & (EXPRESS | VALUE) || o.type === QUOTED && !o.length || o.type === SCOPED && o.entry === "[" && canbeTemp(o)) {
+            continue;
+        }
+        return false;
+    }
+    return true;
+};
+var canbeTemp = function (body) {
+    var cx = 0, dx = body.length - 1;
+    while (cx < dx) {
+        if (body[cx].type & (SPACE | COMMENT)) {
+            cx++;
+            continue;
+        }
+        if (body[dx].type & (SPACE | COMMENT)) {
+            dx--;
+            continue;
+        }
+        break;
+    }
+    if (body[cx] !== body[dx]) return false;
+    var o = body[cx];
+    if (!o) return false;
+    return o.type === EXPRESS && !/[\.\[]/.test(o.text) || o.type === VALUE || o.type === QUOTED && !o.length;
 };
 var _express = function (body, getname, ret) {
+    if (canbeTemp(body)) {
+        var q = [];
+        q.name = createString(body);
+        return [q];
+    }
     var result = [];
     var q = [];
     var needpunc = false;
@@ -480,25 +721,23 @@ var _express = function (body, getname, ret) {
     var n = null;
     var nameindex = 0;
     var maxindex = 0;
+    var hasor = false;
     var getdeepname = function (deep = 0) {
         return getname(maxindex + deep);
     };
-    var ax = 0;
     var exps = [];
     for (var cx = 0, dx = body.length; cx < dx; cx++) {
+        if (!(body[cx].type & (COMMENT | SPACE))) { bx = cx; break; }
+    }
+    for (; cx < dx; cx++) {
         var o = body[cx];
         if (o.type & (COMMENT | SPACE)) continue;
-        if (o.type === STRAP && /^(var|let|const)/.test(o.text)) {
-            bx = cx + 1;
+        if (o.type === STRAP && o.text === 'function') {
+            while (o && (o.type !== SCOPED || o.entry !== '{')) o = body[++cx];
             continue;
         }
         if (o.type & (STRAP | STAMP)) {
             var p = 0;
-            if (o.text === '=') {
-                ax = exps.length;
-                bx = cx + 1;
-                continue;
-            }
             if (/[!~]|\+\-|\-\+/.test(o.text)) p = powermap["!"];
             if (!p && /[\+\-]/.test(o.text)) p = needpunc ? powermap["+"] : powermap["!"];
             if (!p) p = powermap[o.text];
@@ -506,7 +745,8 @@ var _express = function (body, getname, ret) {
             var b = body.slice(bx, cx + 1);
             bx = cx + 1;
             b.index = nameindex;
-            if (!cache.length || p > cache[cache.length - 1]) {
+            var isor = p === powermap["||"];
+            if (!isor) if (!cache.length || p > cache[cache.length - 1] || p >= powermap.new) {
                 cache.push(b, p);
                 continue;
             }
@@ -514,8 +754,11 @@ var _express = function (body, getname, ret) {
             var n = scanner2(name);
             q.name = name;
             n.index = nameindex;
-            nameindex = cache[cache.length - 2].index;
             n.push(b.pop());
+
+            if (cache.length) nameindex = cache[cache.length - 2].index;
+            else if (isor) n.pop(), q.push(...scanner2(`${getname(nameindex)}=`), ...b);
+
             while (cache.length && cache[cache.length - 1] >= p) {
                 if (needcomma(q)) q.push({ type: STAMP, text: ',' });
                 var p0 = cache.pop();
@@ -528,7 +771,7 @@ var _express = function (body, getname, ret) {
             }
             nameindex++;
             if (maxindex < nameindex) maxindex = nameindex;
-            if (p == powermap["||"]) {
+            if (isor) {
                 if (o.text === '||') {
                     q.push(RE);
                 }
@@ -538,6 +781,7 @@ var _express = function (body, getname, ret) {
                 else if (o.text === '??') {
                     q.push(RD);
                 }
+                hasor = true;
                 nameindex = 0;
             } else {
                 cache.push(n, p);
@@ -558,15 +802,19 @@ var _express = function (body, getname, ret) {
         nameindex = cache[cache.length - 1].index;
         var t = cache.pop();
         var isawait = _await(t, nameindex);
-        if (p > powermap["="] && (ret || ax >= 1 || cache.length > 0 || isawait)) q.push(...scanner2(`${getname(nameindex)}=`));
-        q.push.apply(q, t);
-        q.push.apply(q, b);
+        if (!t.length && canbeTemp(b) && b[0].text === getname(nameindex)) {
+        }
+        else {
+            if (p > powermap["="] && (ret || cache.length > 0 || isawait)) q.push(...scanner2(`${getname(nameindex)}=`));
+            q.push.apply(q, t);
+            q.push.apply(q, b);
+        }
         if (isawait) q.push(NEXT);
         needname = true;
         b = [{ type: EXPRESS, text: getname(nameindex) }];
     }
-    else if (ax !== 1) {
-        if (ret && b.length || ax > 1) {
+    else {
+        if (ret && b.length) {
             q.push(...scanner2(`${getname(nameindex)}=`));
             q.push(...b);
             needname = true;
@@ -576,133 +824,103 @@ var _express = function (body, getname, ret) {
         }
     }
     if (needname) q.name = getname(nameindex);
-    if (ax === 1) {
-        if (q.length) q.push({ type: STAMP, text: ';' });
-        q.push(exps[0], { type: STAMP, text: "=" });
-        q.push(...b);
-        q.name = exps[0].text;
-        if (evals.length) exps[0].set = getname(nameindex);
-        exps.shift();
-    }
-    if (ax > 1) {
-        while (ax > 0) {
-            q.push({ type: STAMP, text: ';' });
-            var [e] = exps.splice(ax - 1, 1);
-            if (evals.length) e.set = getname(nameindex + 1);
-            q.push(e);
-            q.push(...scanner2(`=${getname(nameindex)}`))
-            ax--;
-        }
-    }
-    if (evals.length && exps.length) for (var cx = q.length - 1; cx >= 0; cx--) {
-        var o = q[cx];
-        if (o.type !== EXPRESS) continue;
-        if (o === exps[exps.length - 1]) {
-            exps.pop();
-            o.get = true;
-            if (!exps.length) {
-                break;
-            }
-        }
-    }
     relink(q);
-    return _invoke(q, getdeepname);
+    result = _invoke(q, getdeepname);
+    if (hasor) result[result.length - 1].ret_ = true;
+    return result;
 };
 
 var getblock = function (body, cx) {
     var o = body[cx];
-    if (o.type === SCOPED && o.entry === '{') return [o];
+    if (o && o.type === SCOPED && o.entry === '{') return [o];
+    if (!o || o.type === STAMP && /^[;:]$/.test(o.text)) return [];
     var ax = cx;
-    do {
+    while (o) {
         cx = skipAssignment(body, cx);
         var o = body[cx];
         if (!o || o.type !== STAMP || o.text !== ',') break;
         cx++;
-    } while (o);
-    return body.slice(ax, cx);
+    }
+    var b = body.slice(ax, cx);
+    b.next = o;
+    return b;
 };
 var labels = [];
 var scopes = [];
 var isbreak = function (o) {
-    return o.type === STRAP && /^(break|return|continue|yield)$/.test(o.text);
+    if (o.type !== STRAP) return false;
+    return /^(break|continue)$/.test(o.text) ||
+        /^(yield|return)$/.test(o.text) && (o.isend || skipAssignment(o.next) === o.next.next && canbeTemp([o.next]));
 };
 
-function toqueue(body, getname, ret = false) {
-    var retn = false;
-    var ifpatch = function () {
-        var re = scanner2(`return [1,0]`);
-        re.awaited = true;
-        addresult(result, re);
+var ifpatch = function (result, autoskip) {
+    if (!result.length) return;
+    if (autoskip !== false) {
+        var rs = result[result.length - 1];
+        if (rs.ret_ && !rs.await_) return;
     }
+    var re = stepReturn(1, 0);
+    pushstep(result, re);
+};
+function toqueue(body, getname, ret = false, result = []) {
+    var retn = false;
     var uniftop = function () {
-        for (var cx = 3, dx = iftop.length; cx < dx; cx += 3) {
-            var findex = iftop[cx];
-            var r = iftop[cx + 1];
-            var p = result[findex - 1];
-            if (!r) {
-                p.pop();
-                p.push(...scanner2(`[${result.length + 1 - findex},0]`));
-                relink(p);
-            }
+        for (var cx = 4, dx = iftop.length; cx < dx; cx += 4) {
+            var isbr = iftop[cx - 3];
+            if (isbr) continue;
+            var findex = iftop[cx] - 1;
+            var p = result[findex];
+            p.pop();
+            p.push(scanner2(`[${result.length - findex},0]`)[0]);
+            relink(p);
         }
-        for (var cx = 0, dx = iftop.length - 2; cx < dx;) {
-            var findex = iftop[cx++];
-            var f = result[findex];
-            var r = iftop[cx++];
-            var n = iftop[cx++];
-            if (r) {
-                var c = scanner2(`if(${n})`);
-                f.unshift.apply(f, c);
-                relink(f);
-            }
-            else if (f) {
-                var c = scanner2(`if(${n})return [${iftop.length > cx ? iftop[cx] - findex : result.length - findex},0];`);
-                f.unshift.apply(f, c);
-                relink(f);
+        for (var cx = 1, dx = iftop.length - 2; cx < dx; cx++) {
+            var isbr = iftop[cx++];
+            var ce = iftop[cx++];
+            var cindex = iftop[cx++];
+            var findex = iftop[cx] ? iftop[cx] : result.length;
+            if (!isbr) {
+                ce[0].text = findex - cindex;
+                relink(ce);
             }
         };
     };
-    var unblock = function (block, ...end) {
-        var c = toqueue(block, getname, true);
-        bx = cx + 1;
-        if (c.length > 0) {
-            c.forEach(q => {
-                if (q.length) result.push(q);
-            });
-            if (end.length) {
-                var q = c[c.length - 1];
-                q.push(...end);
-                relink(q);
-            }
-        }
+    var unblock = function (block) {
+        toqueue(block, getname, true, result);
         return result[result.length - 1];
     };
     var poplabel = function () {
+        if (!labels.length) return;
         var e = labels.pop();
         if (e.breaks) {
             while (e.breaks.length) {
                 var b = e.breaks.pop();
-                var end = b[b.length - 1];
+                var end = b;
                 for (var cx = result.length - 1; cx >= 0; cx--) {
                     var r = result[cx];
-                    if (r[r.length - 1] === end) { break }
+                    if (r.indexOf(b) >= 0) { break }
                 }
-                end.push({ type: VALUE, text: b.contat - cx ? b.continue : result.length - cx }, { type: STAMP, text: "," }, { type: VALUE, text: "0" });
+                end.push({ type: VALUE, text: b.continue ? b.continue.contat - cx : result.length - cx }, { type: STAMP, text: "," }, { type: VALUE, text: "0" });
                 relink(end);
             }
         }
     };
-
-    var result = [];
     var cx = 0, bx = 0;
     var iftop = null;
+    var brk = function (text, YIELD) {
+        if (o.text !== text) return;
+        retn = [YIELD];
+        ret = true;
+        bx = ++cx;
+        return retn;
+    };
     do {
-        while (cx < body.length && (body[cx].type === SPACE || body[cx].type === COMMENT)) cx++;
         var o = body[cx];
+        while (o && (o.type & (SPACE | COMMENT) || o.type === STAMP && /^[,;]$/.test(o.text))) o = body[++cx];
         if (!o) break;
         while (labels.length) {
             var e = labels[labels.length - 1];
-            if (e.type !== LABEL && !iftop) break;
+            if (e.type !== LABEL) break;
             if (scopes.lastIndexOf(e.scope) >= 0) break;
             poplabel();
         }
@@ -710,106 +928,103 @@ function toqueue(body, getname, ret = false) {
         if (o.type === LABEL) {
             o.scope = scopes[scopes.length - 1];
             labels.push(o);
+            bx = ++cx;
             continue;
         }
-        if (o.type === SCOPED && o.entry === '{' && !o.isExpress) {
+        if (o.type === SCOPED && o.entry === '{' && !o.isObject) {
             scopes.push(o);
-            var b = toqueue(o, getname, false);
+            toqueue(o, getname, false, result);
             scopes.pop();
-            // addresult(result, b);
-            result.push.apply(result, b);
-            cx++;
-            bx = cx;
+            bx = ++cx;
             continue;
         }
         a: if (o.type === STRAP) {
-            if (/^(new|typeof|await)$/.test(o.text)) {
-                break a;
-            }
-            if (o.text === 'yield') {
-                retn = [YIELD];
-                ret = true;
-                bx = cx + 1;
-                cx++;
+            if (/^(new|typeof|await|delete|void|debugger)$/.test(o.text)) {
                 break a;
             }
-            if (o.text === 'return') {
-                retn = [RETURN];
-                ret = true;
-                bx = cx + 1;
-                cx++;
-                break a;
-            }
-            if (/^(async|function)$/.test(o.text)) {
-                cx = skipAssignment(body, cx);
-                addresult(result, body.slice(bx, cx));
-                bx = cx + 1;
+            if (brk("yield", YIELD)) break a;
+            if (brk("return", RETURN)) break a;
+            if (brk("throw", THROW)) break a;
+            if (/^(async|function|class)$/.test(o.text)) {
+                // cx = skipAssignment(body, cx);
+                // var f = body.slice(bx, cx);
+
+                // addresult(result, f);
+                // bx = cx + 1;
                 break a;
             }
             if (/^(break|continue)$/.test(o.text)) {
                 cx = _break(body, cx, result, o.text === 'continue');
-                bx = cx + 1;
+                bx = cx;
                 continue;
             };
             if (o.text === 'with') {
                 cx = _with(body, cx, unblock, result, getname);
-                bx = cx + 1;
+                bx = cx;
                 continue;
             }
             if (o.text === 'try') {
                 cx = _try(body, cx, unblock, result, getname);
-                bx = cx + 1;
+                bx = cx;
                 continue;
             }
             if (o.text === 'for') {
                 labels.push(o);
-                cx = _for(body, cx, unblock, result, getname(0));
+                cx = _for(body, cx, unblock, result);
                 poplabel();
-                bx = cx + 1;
+                bx = cx;
                 continue;
             }
             if (o.text === 'while') {
                 labels.push(o);
-                cx = _while(body, cx, unblock, result, getname(0));
+                cx = _while(body, cx, unblock, result);
                 poplabel();
-                bx = cx + 1;
+                bx = cx;
                 continue;
             }
             if (o.text === 'do') {
                 labels.push(o);
-                cx = _do(body, cx, unblock, result, getname(0));
+                cx = _do(body, cx, unblock, result);
                 poplabel();
-                bx = cx + 1;
+                bx = cx;
                 continue;
             }
             if (o.text === 'switch') {
                 labels.push(o);
                 cx = _switch(body, cx, unblock, result, getname);
                 poplabel();
-                bx = cx + 1;
+                bx = cx;
                 continue;
             }
-            var elseif = false;
+            var elseif = false, isbr = false;
             if (o.text === 'else') {
-                ifpatch();
                 while (body[cx] !== o.next) cx++;
                 o = o.next;
-                var isbr = isbreak(o);
-                iftop.push(result.length, isbr);
+                isbr = isbreak(o);
+                if (!isbr) ifpatch(result);
+                iftop.push(result.length);
                 elseif = true;
             }
             if (o.text === 'if') {
                 while (body[cx] !== o.next) cx++;
                 o = o.next;
                 var isbr = isbreak(o.next);
+                var i = result.length;
                 var n = getCondition(o, unblock, !isbr);
                 o = o.next;
+                if (isbr) {
+                    var c = scanner2(`if(${n})`);
+                }
+                else {
+                    var c = scanner2(`if(${n})return [0,0]`);
+                }
+                var ce = c[3];
+                pushstep(result, c);
                 if (!elseif) {
-                    if (iftop) uniftop();
-                    iftop = [result.length, isbr, n];
+                    iftop = [i, isbr, ce, result.length - 1];
                 }
                 else {
-                    iftop.push(n);
+                    iftop.push(isbr, ce, result.length - 1);
                 }
                 elseif = true;
             }
@@ -818,28 +1033,39 @@ function toqueue(body, getname, ret = false) {
                 var block = getblock(body, cx);
                 cx += block.length;
                 o = body[cx];
+                while (o && o.type & (SPACE | COMMENT)) o = body[++cx];
                 unblock(block);
                 if (o && o.type === STAMP && o.text === ';') o = o.next;
-                while (body[cx] !== o) cx++;
+                while (cx < body.length && body[cx] !== o) cx++;
                 if (!o || o.type !== STRAP || o.text !== 'else') {
+                    var bn = body.next;
+                    if (bn && bn.type === STAMP && bn.text === ';') bn = bn.next;
+                    var inif = bn && bn.type === STRAP && bn.text === 'else';
+                    if (inif) ifpatch(result);
+                    else if (!isbr) ifpatch(result);
                     uniftop();
+                    if (inif) ifpatch(result, false);
                     iftop = null;
                 }
             }
             else {
                 cx++;
             }
+            bx = cx;
             continue;
         }
         cx = skipAssignment(body, cx);
         var b = body.slice(bx, cx);
-        cx++;
-        bx = cx;
+        bx = ++cx;
         b = ternary(b, getname, ret);
-        result.push(...b);
+        for (var a of b) pushstep(result, a);
         if (retn) {
-            retn.name = b[b.length - 1].name;
-            addresult(result, retn);
+            if (b.length) retn.name = b[b.length - 1].name;
+            pushstep(result, retn);
+        }
+        else {
+            var q = b[b.length - 1];
+            if (q && !q.length && q.name) pushstep(result, scanner2(q.name));
         }
         retn = false;
     } while (cx < body.length);