efront 3.37.0 → 3.38.2

package/coms/compile/downLevel.js

@@ -1,37 +1,24 @@
 var scanner2 = require("./scanner2");
 var strings = require("../basic/strings");
 var Program = scanner2.Program;
-var { STAMP, SCOPED, STRAP, EXPRESS, COMMENT, SPACE, PROPERTY, VALUE, QUOTED, rename, getDeclared, skipAssignment, createString, relink, createExpressList } = require("./common");
-var link = function (a, b) {
-    if (a) a.next = b;
-    if (b) b.prev = a;
-};
-var splice1 = function (q, from, to, ...a) {
-    var index1 = from ? q.indexOf(from) : q.length;
-    var index2 = to ? q.indexOf(to) : q.length;
-    if (index1 > index2) index2 = index1;
-    if (a.length) {
-        link(q[index1 - 1], a[0]);
-        link(a[a.length - 1], q[index2]);
-    }
-    else if (index1 !== index2) {
-        link(q[index1 - 1], q[index2]);
-    }
-    var res = q.splice(index1, index2 - index1, ...a);
-    if (res[0]) delete res[0].prev, res.first = res[0];
-    if (res[res.length - 1]) delete res[res.length - 1].next;
-    q.first = q.find(o => o.type !== COMMENT && o.type !== SPACE);
-    return res;
+var { STAMP, SCOPED, STRAP, EXPRESS, COMMENT, SPACE, PROPERTY, VALUE, LABEL, QUOTED, rename, getDeclared, skipAssignment, createScoped, createString, splice, relink, snapExpressHead } = require("./common");
+var splice2 = function (q, from, to, ...a) {
+    var cx = q.indexOf(from);
+    if (cx < 0) throw console.log(splice2.caller, console.format('\r\n<red2>自</red2>'), from && createString([from]), console.format('\r\n<yellow>至</yellow>'), to && createString([to]), console.format(`\r\n<cyan>码列</cyan>`), createString(q)), '结构异常';
+    var dx = to ? q.indexOf(to, cx) : q.length;
+    if (dx < 0) throw console.log(splice2.caller, console.format('\r\n<yellow>自</yellow>'), from && createString([from]), console.format('\r\n<red2>至</red2>'), to && createString([to]), console.format(`\r\n<cyan>码列</cyan>`), createString(q)), '结构异常';
+    return splice(q, cx, dx - cx, ...a);
 };
 var insert1 = function (q, r, ...a) {
-    splice1(q, r, r, ...a);
+    if (r) splice2(q, r, r, ...a);
+    else splice(q, q.length, 0, ...a);
 };
 // 解构赋值
-var killdec = function (queue, o, getobjname, _var = 'var', killobj, islet) {
+var killdec = function (queue, i, getobjname, _var = 'var', killobj) {
     var tmpname = '';
     var index = 0;
     var deep = 0;
-    var dec = function (d, i) {
+    var dec = function (d, x) {
         var previx = tmpname;
         var [k, v] = d;
         var dp = 0;
@@ -47,8 +34,7 @@ var killdec = function (queue, o, getobjname, _var = 'var', killobj, islet) {
                 if (dp) {
                     deep += dp;
                     var n = getobjname(deep);
-                    insert1(queue, o, ...scanner2(`${index > 0 ? ',' : ''}${n}=${k}`));
-                    index++;
+                    write(n, k);
                     k = tmpname = n;
                 }
                 dog(v);
@@ -56,13 +42,13 @@ var killdec = function (queue, o, getobjname, _var = 'var', killobj, islet) {
             }
             else {
                 deep++;
-                var n = getobjname(deep)
-                insert1(queue, o, ...scanner2(`${index > 0 ? "," : ''}${n}=${tmpname}!==undefined?${tmpname}:`));
-                var skiped = splice1(d[2], d[3], d[4]);
+                var n = getobjname(deep);
+                write(n, `${tmpname}!==undefined?${tmpname}:`);
+                var skiped = splice2(d[2], d[3], d[4]);
                 killobj(skiped);
-                insert1(queue, o, ...skiped);
+                splice(queue, i, 0, ...skiped);
+                i += skiped.length;
                 k = tmpname = n;
-                index++;
                 dog(v);
                 deep--;
             }
@@ -71,16 +57,17 @@ var killdec = function (queue, o, getobjname, _var = 'var', killobj, islet) {
         }
 
         if (!tmpname) {
-            write(v, null, i < total - 1);
+            write(v, null, x < total - 1);
         }
         else if (d.length === 2) {
-            write(v, k, i < total - 1);
+            write(v, k, x < total - 1);
         }
         else {
-            write(v, `{k}!==undefined?${k}:`, i < total - 1);
-            var skiped = splice1(d[2], d[3], d[4]);
+            write(v, `${k}!==undefined?${k}:`, x < total - 1);
+            var skiped = splice2(d[2], d[3], d[4]);
             killobj(skiped);
-            insert1(queue, o, ...skiped);
+            splice(queue, i, 0, ...skiped);
+            i += skiped.length;
         }
         index++;
     };
@@ -88,12 +75,19 @@ var killdec = function (queue, o, getobjname, _var = 'var', killobj, islet) {
     var write = function (name, value, hasnext) {
         if (name === tmpname && hasnext) {
             tmpname = getobjname(deep++);
-            insert1(queue, o, ...scanner2(`${index > 0 ? "," : ""}${tmpname}=${name}`));
+            if (index > 0) queue.splice(i++, 0, { type: STAMP, text: ',' });
+            var q = scanner2(`${tmpname}=${name}`);
+            queue.splice(i, 0, ...q);
+            i += q.length;
             index++;
         }
-        if (!value && islet) value = 'undefined';
-        var text = `${index > 0 ? "," : ''}${name}${value ? '=' + value : ''}`;
-        insert1(queue, o, ...scanner2(text));
+        if (index > 0) queue.splice(i++, 0, { type: STAMP, text: ',' });
+        queue.splice(i++, 0, { type: EXPRESS, text: name });
+        if (value) {
+            var q = scanner2("=" + value);
+            queue.splice(i, 0, ...q);
+            i += q.length;
+        }
         index++;
     };
     var dog = function (d) {
@@ -149,73 +143,87 @@ var killdec = function (queue, o, getobjname, _var = 'var', killobj, islet) {
         if (!v.attributes) return [p, v];
         return single(v, p);
     };
-    if (_var) insert1(queue, o, { type: STRAP, text: _var });
-    loop: while (o) {
+    if (_var && i < queue.length) queue.splice(i++, 0, { type: STRAP, text: _var });
+    loop: while (i < queue.length) {
+        var o = queue[i];
         var next = o.next;
         tmpname = '';
         if (!next || next.type !== STAMP || next.text !== '=') {
+            // 只声明不赋值的语句
             var hasnext = next && next.type === STAMP && next.text === ',';
+            if (hasnext) next = next.next;
+            var n = indexof(queue, next, i);
             if (o.type === SCOPED) {
-                var [o0] = splice1(queue, o, o = hasnext ? next.next : next);
+                var [o0] = queue.splice(i, n - i);
                 var [[d]] = getDeclared(o0);
                 dog(d);
+                n = i = indexof(queue, next, i);
                 if (hasnext) continue loop;
             }
             else if (hasnext) {
-                if (islet) insert1(queue, next, ...scanner2('=undefined'));
-                o = next.next;
+                i = n;
                 index++;
                 continue;
-            } else if (islet) insert1(queue, next, ...scanner2('=undefined'));
-            o = next;
+            }
+            i = n;
             break;
         }
         var objs = [];
         do {
             var next = o.next;
             if (!next || next.type !== STAMP || next.text !== "=") {
+                // 赋值结束
                 if (tmpname) {
-                    o = skipAssignment(o);
+                    var n = skipAssignment(queue, i);
+                    o = queue[n];
+                    var skiped = queue.splice(i, n - i);
+                    killobj(skiped);
+                    queue.splice(i, 0, ...skiped);
+                    i += skiped.length;
                     break;
                 }
                 if (!next || next.type === STAMP && /^[,;]$/.test(next.text)) {
                     if (o.type === EXPRESS && !/\./.test(o.text)) {
                         tmpname = o.text;
-                        splice1(queue, o, o = next && next.text === ',' ? next.next : next);
+                        queue.splice(i, indexof(queue, o = next, i) - i);
+                        i = indexof(queue, o, i);
                     }
                 }
                 break;
             }
             if (o.type === SCOPED) {
-                var [o0] = splice1(queue, o, o = next.next);
+                var n = indexof(queue, next.next, i);
+                var [o0] = queue.splice(i, n - i);
                 delete o0.next;
                 if (o0.length && getDeclared(o0).length > 0) objs.push(o0);
             }
             else if (o.type === EXPRESS && !/\.\[/.test(o.text)) {
                 if (!tmpname) tmpname = o.text, index++;
-                o = next.next;
-            }
-            else {
-                o = next.next;
             }
+            o = next.next;
+            i = indexof(queue, o, i);
         } while (o);
         if (!tmpname) {
             if (objs.length === 1) {
                 var [[d]] = getDeclared(objs[0]);
                 var a = single(d, '');
                 if (a) {
-                    insert1(queue, o, { type: EXPRESS, text: a[1] });
-                    insert1(queue, o, { type: STAMP, text: "=" });
-                    o = skipAssignment(o);
-                    insert1(queue, o, ...scanner2(a[0]));
+                    splice(queue, i, 0, { type: EXPRESS, text: a[1] }, { type: STAMP, text: "=" });
+                    i += 2;
+                    var i2 = skipAssignment(queue, i);
+                    killobj(queue.slice(i, i = i2));
+                    var q = scanner2(a[0])
+                    queue.splice(i, 0, ...q);
+                    i += q.length;
                     index++;
                     continue;
                 }
             }
             tmpname = getobjname();
-            insert1(queue, o, { type: EXPRESS, text: tmpname });
-            insert1(queue, o, { type: STAMP, text: "=" });
-            o = skipAssignment(o);
+            splice(queue, i, 0, { type: EXPRESS, text: tmpname }, { type: STAMP, text: "=" });
+            i += 2;
+            var i2 = skipAssignment(queue, i);
+            killobj(queue.slice(i, i = i2));
             index++;
         }
         for (var o0 of objs) {
@@ -223,34 +231,80 @@ var killdec = function (queue, o, getobjname, _var = 'var', killobj, islet) {
             dog(d);
         }
     }
-    return o;
+    relink(queue);
+    return i;
 };
 // 键值对重组
-var killmap = function (body, o, _getobjname, killobj) {
-    if (!o.length) return o.next;
+var killmap = function (body, i, _getobjname, killobj) {
+    var o = body[i];
+    if (!o.length) return indexof(body, o.next, i);
     var m = o.first;
-    var s = m;
-    while (m) {
+    var s = m, p;
+
+    loop: while (m) {
+        s = m, p = m.prev;
         if (m.type === EXPRESS) break;
-        s = m;
         while (m && (m.type === STRAP || m.type === STAMP)) m = m.next;
-        if (m.isprop && (m.type === SCOPED || m.type === PROPERTY && /\[/.test(m.text) || m.short || m.next && m.next.type === SCOPED)) {
+        if (!m || m.isprop && (m.type === SCOPED || m.type === PROPERTY && /\[/.test(m.text) || m.short || m.next && m.next.type === SCOPED)) {
             break;
         }
         m = m.next;
-        m = skipAssignment(m);
+        if (!m) break;
+        if (m && m.type === STAMP && m.text === ':') m = m.next;
+        if (!m) break;
+        var n = skipAssignment(m);
+        while (m !== n) {
+            if (m.type === STAMP && m.text === '=>') {
+                body.await_ = true;
+                break loop;
+            }
+            if (m.type === STRAP) {
+                if (/^await$/.test(m.text)) {
+                    body.await_ = true;
+                    break loop;
+                }
+                if (/^function$/.test(m.text)) {
+                    while (m && (m.type !== SCOPED || m.entry !== '{')) m = m.next;
+                    continue;
+                }
+                if (/^class$/.test(m.text)) {
+                    while (m && !m.isClass) m = m.next;
+                    while (m && m.isClass) m = m.next;
+                    continue;
+                }
+            }
+            if (m.type === SCOPED) {
+                if (m.entry === "(" && m.next && m.next.type === STAMP && m.next.text === '=>') {
+                    s = skipAssignment(m);
+                    var mi = o.indexOf(m);
+                    var si = o.indexOf(s, mi);
+                    if (si < 0) si = o.length;
+                    var ms = o.slice(mi, si);
+                    killobj(ms);
+                    splice(o, mi, si - mi, ...ms);
+                    m = s;
+                    continue;
+                }
+                killobj(m);
+                if (m.await_) break loop;
+            }
+            m = m.next;
+        }
+        if (m && m.type === STAMP && /^[,;]$/.test(m.text)) m = m.next;
     }
-    if (!m) return o.next;
+    if (!m) return indexof(body, o.next, i);
     m = s;
-    if (m.prev && m.prev.type === STAMP && m.prev.text === ',') {
-        splice1(body, m.prev, m);
+    if (p && p.type === STAMP && p.text === ',') {
+        var mi = o.indexOf(m);
+        var pi = o.lastIndexOf(p, mi);
+        if (pi > 0) splice(o, pi, mi - pi);
     }
-    var q, qf = o;
+    var q;
     var next = o.next;
-
+    var l = 1;
     var initq = function () {
         q = scanner2(`(${_getobjname()}=)`)[0];
-        var qo = splice1(body, qf, next, q);
+        var qo = splice(body, i, l, q);
         insert1(q, null, ...qo);
         insert1(q, null, { type: STAMP, text: ',' });
     }
@@ -262,41 +316,57 @@ var killmap = function (body, o, _getobjname, killobj) {
             m = skipAssignment(m);
             if (/^\.\.\./.test(s.text)) {
                 s.text = s.text.replace(/^\.\.\./, '');
+                if (!s.text) {
+                    splice2(o, s, s = s.next);
+                }
                 if (q) {
                     t = scanner2(`extend(${_getobjname()},)`);
+                    rootenvs.extend = true;
                     insert1(q, null, ...t);
                 }
                 else {
                     if (!t) {
                         t = scanner2(`extend()`);
-                        var [o0] = splice1(body, o, next, t);
-                        insert1(t[1], null, o0);
-                        qf = t[0];
-                        insert1(body, next, ...t);
+                        rootenvs.extend = true;
+                        var [o0] = body.splice(i, 1, ...t);
+                        t[1].push(o0);
+                        l = 2;
                     }
                     insert1(t[1], null, { type: STAMP, text: "," });
                 }
-                var e = splice1(o, s, m);
+                var e = splice2(o, s, m);
                 insert1(t[1], null, ...e);
                 if (q) {
                     if (m) {
-                        e = splice1(body, m, m = m.next);
+                        e = splice2(o, m, m = m.next);
                         killobj(e);
                         insert1(q, null, ...e);
                     }
                 }
-                if (m && m.type === STAMP && m.text === ',') splice1(o, m, m = m.next);
+                if (m && m.type === STAMP && m.text === ',') splice2(o, m, m = m.next);
             }
             continue;
         }
+        if (m && m.type === STAMP && m.text === ',') {
+            splice2(o, m, m = m.next);
+            continue;
+        }
         if (!q) initq();
+
         var [prop, m] = getprop(o, m);
         if (!prop.value.length) insert1(prop.value, null, { type: EXPRESS, text: prop.name })
-        else killobj(prop.value);
+        else if (prop.sfunc === false) killobj(prop.value);
         setprop(prop, _getobjname(), define_, q);
     }
-    if (q) insert1(q, null, ...scanner2(',' + _getobjname()));
-    return next;
+
+    if (q) {
+        relink(q);
+        var qe = q.last;
+        if (qe.type !== STAMP || qe.text !== ',') q.push({ type: STAMP, text: ',' });
+        q.push(...scanner2(_getobjname()));
+        relink(q);
+    }
+    return indexof(body, next, i);
 };
 var getprop = function (o, m) {
     var prop = {};
@@ -328,9 +398,9 @@ var getprop = function (o, m) {
     }
     else {
         prop.sfunc = false;
-        if (m && /[\=\:]/.test(m.text)) m = m.next;
+        if (m && /^[\=\:]$/.test(m.text)) m = m.next;
     }
-    splice1(o, s, m);
+    splice2(o, s, m);
     var s = m;
     if (m && prop.sfunc !== false && m.type === SCOPED && m.entry === '(') {
         m = m.next;
@@ -338,33 +408,42 @@ var getprop = function (o, m) {
     }
     else m = skipAssignment(m);
     if (m && !m.isprop) m = m.next;
-    if (!prop.short) prop.value = splice1(o, s, m);
-    else splice1(o, s, m);
+    if (!prop.short) prop.value = splice2(o, s, m);
+    else if (s) splice2(o, s, m);
     return [prop, m];
 };
 var setprop = function (prop, k, d, q) {
-    if (prop.sfunc !== false) insert1(prop.value, prop.value[0], ...scanner2(`${prop.async ? "async " : ""}function${prop["*"] ? "*" : ''}`));
+    if (prop.sfunc !== false)
+        // insert1(prop.value, prop.value[0], ...scanner2(`${prop.async ? "async " : ""}function${prop["*"] ? "*" : ''}`));
+        insert1(prop.value, prop.value[0], ...scanner2(`function`));
     if (prop.get || prop.set) {
-        let end = prop.value[prop.value.length - 1];
-        if (end.type === STAMP && /[,;]/.test(end.text)) prop.value.pop();
+        var pv = prop.value;
+        if (pv) {
+            while (pv.length && pv[pv.length - 1].type & (SPACE | COMMENT)) pv.pop();
+            var pe = pv[pv.length - 1];
+            if (pe && pe.type === STAMP && /^[,;]$/.test(pe.text)) pv.pop();
+            else pe = null;
+        }
         if (!d[prop.name]) {
-            let tmp = scanner2(`Object.defineProperty(${k},${prop.name},{})`);
+            let tmp = scanner2(`\r\nObject.defineProperty(${k},${prop.name},{})`);
             insert1(q, null, ...tmp);
-            if (end.type === STAMP && /^[,;]/.test(end.text)) insert1(q, null, end);
-            d[prop.name] = tmp[1][4];
+            if (pe) insert1(q, null, pe);
+            d[prop.name] = tmp[tmp.length - 1][4];
         }
         if (d[prop.name].length) insert1(d[prop.name], null, { type: STAMP, text: ',' });
         insert1(d[prop.name], null, { type: PROPERTY, text: prop.get ? "get" : "set" });
         insert1(d[prop.name], null, { type: STAMP, text: ":" });
-        insert1(d[prop.name], null, ...prop.value);
+        if (pv && pv.length) insert1(d[prop.name], null, ...pv);
     }
     else {
-        insert1(q, null, ...scanner2(`${k}${prop.name}=`));
+        insert1(q, null, ...scanner2(`${q && q.length ? "\r\n" : ''}${k}${prop.name}=`));
         insert1(q, null, ...prop.value);
     }
 }
-var killcls = function (body, o, getname_) {
+var rootenvs = null, rootHyper;
+var killcls = function (body, i, getname_) {
     var extends_ = [];
+    var o = body[i];
     var start = o;
     var decName = !o.isExpress && o.next.type === EXPRESS && o.next.text;
     while (o) {
@@ -392,94 +471,130 @@ var killcls = function (body, o, getname_) {
     if (o) {
         var next = o;
         while (next && !next.isClass) next = next.next;
-        base = createString(splice1(body, o, o = next));
+        base = createString(splice2(body, o, o = next));
     }
-    // if (base === 'Array') base = 'Array2'; 降级时不做填充的工作
+    if (base === 'Array') base = 'Array2', rootenvs.Array2 = true;
     var index = 0;
     while (o && o.isClass) {
+        var scoped = o.scoped;
         var m = o.first;
         var name = extends_.pop();
-        if (!name && (base || extends_.length)) name = getname_('class' + index);
+        if (!name && (base || extends_.length)) name = getname_('cls' + index);
         var assign = [];
         var constructor = scanner2('(){}');
         var define_ = Object.create(null);
         var static_ = Object.create(null);
         var clz = { name };
+        if (!clz.name) clz.name = getname_("cls" + index);
         while (m) {
             var [prop, m] = getprop(o, m);
             if (!prop.value.length) prop.value = scanner2('undefined;');
             var k = prop.static ? clz.name : `${clz.name}.prototype`;
             var d = prop.static ? static_ : define_;
-            if (prop.get || prop.set || prop.sfunc !== false) {
+            if (prop.get || prop.set || prop.static) {
                 setprop(prop, k, d, defines);
             }
-            else if (/^(?:constructor|(['"`])constructor\1)/.test(prop.name)) {
+            else if (/^(?:\.constructor|\[(['"`])constructor\1\])$/.test(prop.name)) {
                 constructor = prop.value;
+                var ce = constructor[constructor.length - 1];
+                while (ce.type & (SPACE | COMMENT) || ce.type === STAMP && /^[,;]$/.test(ce.text)) constructor.pop(), ce = constructor[constructor.length - 1];
+            }
+            else if (prop.sfunc !== false) {
+                setprop(prop, k, d, defines);
             }
             else {
                 insert1(assign, null, ...scanner2(`this${prop.name}=`));
                 insert1(assign, null, ...prop.value);
             }
         }
+        relink(o);
         if (invokes.length) insert1(invokes, null, { type: STAMP, text: ',' });
         insert1(invokes, null, ...scanner2('function ' + name));
-        insert1(constructor[1], constructor[1][0], ...assign);
+        if (base) {
+            constructor[1].push(...scanner2('return this'))
+            relink(constructor[1]);
+            var cs = createScoped(constructor[1]);
+            var newt = getname(cs.vars, cs.envs, 'this_');
+            if (cs.used.this) rename(cs.used, 'this', newt);
+            var inited = false;
+            assign.forEach(o => {
+                if (o.type === EXPRESS) o.text = o.text.replace(/^this\./g, newt);
+            });
+            if (cs.used.super) {
+                cs.used.super.forEach(o => {
+                    if (o.text !== 'super') return;
+                    var n = o.next;
+                    if (!n || n.type !== SCOPED || n.entry !== "(") return;
+                    o.text = base + '.call';
+                    if (!inited) {
+                        insert1(o.queue, o, ...assign);
+                    }
+                    inited = true;
+                    insert1(o.queue, o, ...scanner2(`var ${newt}=`));
+                    if (n.length) n.unshift({ type: STAMP, text: ',' });
+                    n.unshift({ type: EXPRESS, text: 'this' });
+                    insert1(o.queue, n.next, ...scanner2(`||this;`));
+                })
+            }
+            if (scoped.used.super) {
+                scoped.used.super.forEach(o => {
+                    if (!/^super(\.|\[|$)/.test(o.text)) return;
+                    o.text = `${base}.prototype` + o.text.replace(/^super/, '');
+                    insert1(o.queue, o.next, ...scanner2('.bind(this)'));
+                })
+            }
+            if (!inited) constructor[1].unshift(...scanner2(`\r\nvar ${newt}=${base}.apply(this,arguments)||this;\r\n`), ...assign);
+        }
+        else {
+            constructor[1].unshift(...assign);
+        }
         insert1(invokes, null, ...constructor);
         o = o.next;
-        if (base) insert1(foot, null, ...scanner2(`${foot.length ? ";" : ""}extends_(${clz.name},${base})`));
+        if (base) defines.unshift(...scanner2(`extends_(${clz.name},${base})${defines.length ? "\r\n" : ""}`)), rootenvs.extends_ = true;
         base = clz.name;
         if (clz.name) insert1(head, null, ...scanner2(`${head.length ? ',' : ''}${clz.name}`));
         index++;
     }
     insert1(defines, null, ...foot);
+    var s = i;
+    i = body.indexOf(o, i);
+    if (i < 0) i = body.length;
     if (head.length > 1 || start.isExpress) {
-        insert1(defines, null, ...scanner2(`; return ${clz.name}`))
-        if (decName) insert1(func, func[0], ...scanner2(`var ${decName}=`));
-        splice1(body, start, o, ...func);
+        splice(defines, defines.length, 0, ...scanner2(`\r\nreturn ${clz.name}`))
+        if (decName) splice(func, 0, 0, ...scanner2(`var ${decName}=`));
+        splice(body, s, i - s, ...func);
     }
     else {
-        splice1(body, start, o, ...invokes);
         if (defines.length) {
-            insert1(body, o, { text: ';', type: STAMP });
-            insert1(body, o, ...defines);
+            splice(invokes, invokes.length, 0, { text: ';', type: STAMP }, ...defines);
         }
+        splice(body, s, i - s, ...invokes);
+        if (o) insert1(body, o, { type: SPACE, text: '\r\n' });
     }
-    return o;
+    return i;
 };
-var prevInvoke = function (o) {
-    while (o) {
-        var prev = o.prev;
-        if (!prev) break;
-        if (o.type === EXPRESS) {
-            if (prev.type === STRAP && /^(class|function|new|extends)$/.test(prev.text));
-            else if (!/^\.|\[/.test(o.text) || /^\.\.\./.test(o.text)) break;
-        }
-        else if (o.type === VALUE || o.type === QUOTED) break;
-        else if (prev.type === STAMP) {
-            if (prev.text === '*') {
-                if (prev.prev && prev.prev.type !== STRAP) break;
-            }
-            else if (prev.text !== "=>" || o.type !== SCOPED || o.entry !== '{') {
-                break;
-            }
-        }
-        else if (prev.type === STRAP) break;
-        o = prev;
+var indexof = function (list, o, i) {
+    if (o) {
+        i = list.indexOf(o, i);
+        if (i < 0) i = list.length;
     }
-    return o;
+    else i++;
+    return i;
 };
 // 数组或参数展开
-var killspr = function (body, o, _getobjname, setsolid, killobj) {
+var killspr = function (body, i, _getobjname, setsolid, killobj) {
+    var o = body[i];
     var m = o.first;
-    if (!m) return o.next;
+    if (!m) return i + 1;
+    killobj(o);
     var index = 0;
     var spr = function () {
         var s = m;
         s.text = s.text.replace(/^\.\.\./, '');
         m = skipAssignment(m);
         var q = scanner2(`Array.prototype.slice.call()`);
-        var v = splice1(o, s, m);
-        if (m) splice1(o, m, m = m.next);
+        var v = splice2(o, s, m);
+        if (m) splice2(o, m, m = m.next);
         killobj(v);
         insert1(q[1], null, ...v);
         setsolid(q, q[0]);
@@ -487,7 +602,6 @@ var killspr = function (body, o, _getobjname, setsolid, killobj) {
     };
     var killnext = function (m) {
         while (m && (m.type !== STAMP || m.text !== ',')) {
-            if (m.length) killobj(m);
             m = m.next;
         }
         return m;
@@ -498,57 +612,67 @@ var killspr = function (body, o, _getobjname, setsolid, killobj) {
         if (m) m = m.next;
         index++;
     }
-    if (!m) return o.next;
+    if (!m) return i + 1;
     var c = scanner2('.concat()');
     var next = o.next;
     if (o.entry === '(') {
-        var r = prevInvoke(o);
+        var r = snapExpressHead(o);
+        var rt = r.type === EXPRESS && r.text.replace(/^\.\.\./, '');
         if (r === o);
-        else if (r === o.prev && r.type === EXPRESS && !/\.[\s\S]*\./.test(r.text)) {
+        else if (
+            r === o.prev && r.type === EXPRESS && !/\.[\s\S]*\./.test(rt) && !/\[[^\]]*\]\[[^\]]*\]/.test(rt)) {
             var p = r;
-            var n = /\./.test(p.text) && p.text.replace(/\.[^\.]*$/, '') || "null";
-            insert1(o, o.first, ...scanner2(n + ","));
+            var n = /\.|\[/.test(rt) ? rt.replace(/\.[^\.]*|\[[^\]]*\]$/, '') : "null";
+            splice(o, 0, 0, ...scanner2(n + ","));
         }
         else {
-            var p = o.prev;
-            if (p.type === EXPRESS) {
-                var n = p.text.replace(/^[\s\S]*?(\.[^\.]*)$/, "$1");
-                p.text = p.text.replace(/\.[^\.]*$/, "");
-                insert1(body, o, { type: EXPRESS, text: n });
+            var p = o.prev, n = null, hasdot = false;
+            var pt = p.type === EXPRESS && p.text.replace(/^\.\.\./, '');
+            if (p.type === EXPRESS && (n = /^(?:[\s\S]*[^\.])?(\.[^\.]*|\[[^\]]*\])$/.exec(pt))) {
+                hasdot = p.text.length !== pt.length;
+                var n = n[1];
+                p.text = pt.slice(0, pt.length - n.length);
+                splice(body, i++, 0, { type: EXPRESS, text: n });
+            }
+            else if (p.type === SCOPED && p.entry === '[') {
+                p = p.prev;
             }
             else {
-                // p = p.prev;
+                splice(body, i++, 0, { type: VALUE, text: "null" });
             }
-            insert1(o, o.first, ...scanner2(`${_getobjname()},`));
-            var h = scanner2(`(${_getobjname()}=)`);
-            insert1(h[0], null, ...splice1(body, r, p));
-            insert1(body, p, ...h);
-            if (!p.text) {
-                splice1(body, p, p.next);
+            splice(o, 0, 0, ...scanner2(`${_getobjname()},`));
+            var h = scanner2(`${hasdot ? "..." : ''}(${_getobjname()}=)`);
+            var cx = body.lastIndexOf(r, i);
+            var dx = body.indexOf(p, cx) + 1;
+            var h1 = h[h.length - 1];
+            splice(h1, h1.length, 0, ...splice(body, cx, dx - cx, ...h));
+            i += cx - dx + h.length;
+            if (p.type === EXPRESS && !p.text) {
+                var cx = h[0].lastIndexOf(p);
+                if (cx >= 0) splice(h1, cx, 1);
             }
         }
-        insert1(body, o, ...scanner2('.apply'));
+        splice(body, i++, 0, ...scanner2('.apply'));
         var m1 = skipAssignment(m);
         if (index > 0 || m1 && m1.next) {
-            var h = splice1(o, o.first.next.next, null);
+            var h = splice(o, 2, o.length);
             var c = scanner2(`[]`);
-            insert1(c[0], null, ...h);
+            splice(c[0], 0, 0, ...h);
             killobj(c);
-            insert1(o, null, ...c);
-            return next;
+            splice(o, o.length, 0, ...c);
+            return indexof(body, next, i);
         };
         killnext(m);
         m.text = m.text.replace(/^\.\.\./, '');
-        return next;
+        return indexof(body, next, i);
     }
     if (index > 0) {
-        if (m) splice1(o, m.prev, m);
-        insert1(body, next, ...c);
+        if (m) splice2(o, m.prev, m);
+        splice(body, i + 1, 0, ...c);
         insert1(c[1], null, ...spr());
     }
     else {
-        splice1(body, o, next, ...spr());
-        if (m) insert1(body, next, ...c);
+        splice(body, i, 1, ...spr(), ...(m ? c : []));
     }
     var d;
     while (m) {
@@ -566,14 +690,14 @@ var killspr = function (body, o, _getobjname, setsolid, killobj) {
             insert1(c[1], null, ...d);
         }
         if (d[0].length) insert1(d[0], null, { type: STAMP, text: "," });
-        insert1(d[0], null, ...splice1(o, s, m));
-        if (m) splice1(o, m, m = m.next);
+        insert1(d[0], null, ...splice2(o, s, m));
+        if (m) splice2(o, m, m = m.next);
     }
-    return next;
+    return indexof(body, next, i);
 };
 
-var killobj = function (body, getobjname, getname_, setsolid, deep = 0) {
-    var o = body.first;
+var killobj = function (body, getobjname, getletname, getname_, letname_, setsolid, deep = 0) {
+    var i = 0;
     var _getdeep = function () {
         deep++;
         _getdeep = function () {
@@ -588,80 +712,123 @@ var killobj = function (body, getobjname, getname_, setsolid, deep = 0) {
         return getobjname(deep + i);
     };
     var deepkill = function (o) {
-        killobj(o, getobjname, getname_, setsolid, deep);
+        killobj(o, getobjname, getletname, getname_, letname_, setsolid, deep);
+        if (o.await_) body.await_ = true;
     };
-    while (o) {
+    while (i < body.length) {
+        var o = body[i];
         var islet = false;
         if (o.type === STRAP) {
             switch (o.text) {
                 case "await":
-                    body.await = true;
-                    o = o.next;
+                    body.await_ = true;
+                    i++;
+                    break;
+                case "yield":
+                    var o = o.next;
+                    if (o.type === STAMP && o.text === '*') {
+                        i++;
+                        var n = body.indexOf(o, i) + 1;
+                        o = o.next;
+                        splice(body, i, n - i);
+                        n = skipAssignment(body, i - 1);
+                        var name = getname_("_");
+                        var y = scanner2(`for(var ${name} of) yield ${name};`);
+                        y[2].type = STRAP;
+                        splice(y[1], y[1].length, 0, ...splice(body, i, n - i));
+                        unforof(y[1], getname_.bind(null, '_'), y.used);
+                        splice(body, i - 1, 1, ...y);
+                    }
+                    i++;
                     break;
                 case "let":
                 case "const":
                     islet = body.keeplet !== false;
                 case "var":
-                    splice1(body, o, o = o.next);
-                    o = killdec(body, o, _getdeepname, 'var', deepkill, islet);
+                    splice(body, i, 1);
+                    i = killdec(body, i, getletname, 'var', deepkill, islet);
+                    break;
+                case "catch":
+                    var n = o.next;
+                    if (n.type !== SCOPED || n.entry !== '(') {
+                        splice(body, ++i, 0, scanner2(`(${letname_('e')})`)[0])
+                    }
+                    i++;
                     break;
                 case "class":
-                    o = killcls(body, o, getname_);
+                    i = killcls(body, i, letname_);
                     break;
                 case "function":
                     o = o.next;
-                    if (o && o.type === STAMP) o = o.next;
+                    if (o && o.type === STAMP) {
+                        i++;
+                        var n = body.indexOf(o, i) + 1;
+                        o = o.next;
+                        splice(body, i, n - i);
+                    }
                     if (o && o.type === EXPRESS) o = o.next;
                     if (o && o.type === SCOPED) o = o.next;// ()
                     if (o && o.type === SCOPED) o = o.next;// {}
+                    i = body.indexOf(o, i);
+                    if (i < 0) i = body.length;
                     break;
                 case "async":
-                    splice1(body, o, o = o.next);
+                    body.splice(i, 1);
                     break;
                 default:
-                    o = o.next;
+                    i++;
             }
             continue;
         }
         else if (o.type === SCOPED) {
             if (o.isObject) {
                 if (o.next && o.next.type === STAMP && o.next.text === '=') {
-                    o = killdec(body, o, _getdeepname, '', deepkill);
+                    i = killdec(body, i, _getdeepname, '', deepkill);
                     continue;
                 }
                 else {
-                    o = killmap(body, o, _getobjname, deepkill);
+                    i = killmap(body, i, _getobjname, deepkill);
+                    // i = indexof(body, o, i);
                     continue;
                 }
             }
             else if (o.entry === '[') {
-                if (o.next && o.next.type === STAMP && o.next.text === '=' || o.next && o.next.type === STRAP && /^(in|of)$/.test(o.next.type) && body.entry === '(' && body.prev && body.prev.type === STRAP && body.prev.text === 'for') {
-                    o = killdec(body, o, _getdeepname, '', deepkill);
+                var a = snapExpressHead(o);
+                if (a === o && o.next && o.next.type === STAMP && o.next.text === '=' || o.next && o.next.type === STRAP && /^(in|of)$/.test(o.next.type) && body.entry === '(' && body.prev && body.prev.type === STRAP && body.prev.text === 'for') {
+                    i = killdec(body, i, _getdeepname, '', deepkill);
                 }
                 else {
-                    o = killspr(body, o, _getobjname, setsolid, deepkill);
+                    i = killspr(body, i, _getobjname, setsolid, deepkill);
                 }
                 continue;
             }
             else if (o.entry === '(') {
                 if (o.next && o.next.type === STAMP && o.next.text === '=>');
-                else if (o.prev && o.prev.type === STRAP);
+                else if (o.prev && o.prev.type === STRAP) {
+                    var p = o.prev;
+                    if (p.transive || /^(if|else|while|with|switch)$/.test(p.text)) deepkill(o);
+                }
                 else if (!o.prev || o.prev.type === STAMP || o.prev.type === STRAP) {
                     deepkill(o);
                 }
                 else {
-                    o = killspr(body, o, _getobjname, setsolid, deepkill);
+                    i = killspr(body, i, _getobjname, setsolid, deepkill);
                     continue;
                 }
             }
         }
         else if (o.type === STAMP) {
             if (o.text === "=>") {
-                o = unarrow(body, o, killobj, getname_);
+                i = unarrow(body, i, deepkill, letname_);
                 continue;
             }
         }
-        o = o.next;
+        else if (o.isdigit) {
+            if (/^0[^\.]/.test(o.text)) {
+                o.text = String(eval(o.text));
+            }
+        }
+        i++;
     }
 };
 
@@ -683,33 +850,51 @@ var unawait = function (body, getname, argname) {
         return getname("_");
     }, argname);
 };
-var getsync = function (m) {
-    if (m.type === SCOPED && m.await) return null;
+var isbreak = function (m) {
+    return /^(yield|await|throw)$/.test(m.text) || /^(break|continue)/.test(m.text) && !m.isend;
+}
+var getsync = function (m, killobj) {
+    if (m.type === SCOPED && m.await_) return null;
     var n = skipAssignment(m);
     while (m !== n) {
-        if (m.await || m.type === STRAP && /^(yield|await)$/.test(m.text)) return null;
+        if (m.type === STRAP && isbreak(m)) return null;
+        if (m.length) {
+            killobj(m);
+            if (m.await_) return null;
+            if (hasbreak(m)) return null;
+        }
         m = m.next;
     }
+    return n;
+};
+var hasbreak = function (body) {
+    for (var o of body) {
+        if (o.type !== STRAP) continue;
+        if (isbreak(o)) return true;
+    }
+    for (var o of body) {
+        if (o.length && hasbreak(o)) return true;
+    }
+    return false;
 };
-var ises3 = function (o) {
+var ises3 = function (o, killobj) {
     if (o && o.type === SCOPED && o.entry === "{") {
-        if (!o.await) return false;
+        killobj(o);
+        if (o.await_) return false;
+        if (hasbreak(o)) return false;
     }
     else while (o) {
-        o = getsync(o);
-        if (o === null) return true;
+        o = getsync(o, killobj);
+        if (o === null) return false;
         if (!o || o.type !== STAMP || o.text !== ',') {
             break;
         }
         o = o.next;
     }
-    return false;
+    return true;
 }
-var unforin = function (o, body, getnewname_) {
+var unforin = function (o, getnewname_, killobj) {
     // 仅处理有 await 或 yield 的代码
-    if (!o.await) {
-        if (!ises3(o.next)) return;
-    }
     var m = o.first;
     var hasdeclare = false;
     if (m.type === STRAP) {
@@ -718,23 +903,32 @@ var unforin = function (o, body, getnewname_) {
     }
     var n = m.next;
     if (n.type !== STRAP || n.text !== 'in') {
-        return;
+        return false;
+    }
+    if (ises3(o, killobj) && ises3(o.next, killobj)) return;
+    var prev = o.prev;
+    while (prev && prev.type === LABEL) prev = prev.prev;
+    var pp = prev && prev.prev;
+    var ppp = pp && pp.prev;
+    if (pp && pp.type === STRAP && pp.text === 'else' ||
+        ppp && pp.type === SCOPED && pp.entry === '(' && ppp.type === STRAP && /^(with|for|while|if)$/.test(ppp.text)) {
+        var brace = scanner2("{}")[0];
+        var nn = skipAssignment(prev);
+        var os = splice2(o.queue, prev, nn, brace);
+        splice(brace, 0, 0, ...os);
     }
     n = n.next;
     var tname = getnewname_();
     var sname = getnewname_();
     var kname = getnewname_();
     var s = scanner2(`${sname}=`);
-    insert1(s, null, ...splice1(o, n));
+    insert1(s, null, ...splice2(o, n));
     insert1(s, null,
-        ...scanner2(`,${tname}=[];for(${kname} in ${sname})${tname}.push(${kname});`)
+        ...scanner2(`,${tname}=[];for(${hasdeclare ? 'var ' : ''}${m.text} in ${sname})${tname}.push(${m.text});`)
     );
-    insert1(body, o.prev, ...s);
-    splice1(o, m.next);
-    splice1(o, m);
-    insert1(o, o.first, ...scanner2(`${kname}=0;${kname}<${tname}.length`));
-    var c = scanner2(`(=${tname}[${kname}]);${kname}++`);
-    insert1(c[0], c[0].first, m);
+    insert1(o.queue, o.prev, ...s);
+    splice(o, 0, o.length, ...scanner2(`${kname}=0;${kname}<${tname}.length&&`));
+    var c = scanner2(`(${m.text}=${tname}[${kname}]);${kname}++`);
     insert1(o, null, ...c);
 };
 
@@ -750,85 +944,92 @@ var unforof = function (o, getnewname, used) {
         m = m.next;
         hasdeclare = true;
     }
-
     var n = m.next;
     if (n.type !== STRAP || n.text !== 'of') {
         return o.next;
     }
     var f = n.next;
-    var p = splice1(o, m, m = n)[0];
+    var p = splice2(o, m, m = n)[0];
     if (hasdeclare) {
         var [d] = getDeclared(p);
-        insert1(o, m, ...scanner2(d.map(a => a.text).join(",")));
+        if (d.length) insert1(o, m, ...scanner2(d.join(",") + ","));
     }
     var iname = getnewname();
     var gname = getnewname();
     var oname;
-    if (!f.next && f.type === EXPRESS && !/\./.test(f.text) && used[f.text].length === 1) {
-        splice1(o, m);
+    var useSimpleLoop = !(rootHyper || used.Symbol || hasawait);
+    if (!f.next && f.type === EXPRESS && !/\./.test(f.text) && used[f.origin || f.text.replace(/[\.\[][\s\S]*$/, '')].length === 1) {
+        splice2(o, m);
         oname = f.text;
     }
     else {
         oname = getnewname();
-        splice1(o, n, f);
-        var mo = splice1(o, f);
-        insert1(o, null, ...scanner2(`,${oname}=`));
-        insert1(o, null, ...mo);
+        splice2(o, n, f);
+        var mo = splice2(o, f);
+        if (useSimpleLoop) useSimpleLoop = mo.length === 1 && (mo[0].type === EXPRESS || mo[0].type === SCOPED && mo[0].entry === "[");
+        o.push(...scanner2(`${oname}=`));
+        o.push(...mo);
+        o.push({ type: STAMP, text: ',' });
     }
-    insert1(o, null, ...scanner2(`${gname}=${hasawait ? `${oname}[Symbol.asyncGenerator]||${oname}[Symbol.generator]` : `${oname}[Symbol.generator]||${oname}[Symbol.asyncGenerator]`}||Array.prototype[Symbol.asyncGenerator].bind(${oname}),${gname}=${gname}(),${iname}=${hasawait ? "await " : ''}${gname}.next();${p.text}=${iname}.value,!${iname}.done;${iname}=${gname}.next();`));
+    if (useSimpleLoop) o.push(...scanner2(`${iname}=0,${gname}=${oname}.length;${iname}<${gname}&&(${createString([p])}=${oname}[${iname}],true);${iname}++`));
+    else rootenvs.Symbol = true, o.push(...scanner2(`${gname}=${hasawait ? `${oname}[Symbol.asyncIterator]||${oname}[Symbol.iterator]` : `${oname}[Symbol.iterator]||${oname}[Symbol.asyncIterator]`}||Array.prototype[Symbol.iterator],${gname}=${gname}.call(${oname}),${iname}=${hasawait ? "await " : ''}${gname}.next();!${iname}.done&&(${createString([p])}=${iname}.value,true);${iname}=${gname}.next()`));
+    relink(o);
 };
-var unarrow = function (body, o, killobj, getname_) {
+var unarrow = function (body, i, killobj, letname_) {
+    var o = body[i];
     var p = o.prev;
     var n = o.next;
     var b = n, h = p;
-    insert1(body, p || o, ...scanner2("function"));
+    var pi = body.lastIndexOf(p, i);
+    if (pi < 0) pi = 0;
+    body.splice(i, 1);
+    body.splice(pi, 0, { type: STRAP, text: 'function' });
+    var ni = body.indexOf(n, i);
+    if (ni < 0) ni = body.length;
     if (p && p.type !== SCOPED || p.entry !== "(") {
-        h = scanner2("()");
-        insert1(h[0], null, ...splice1(body, p, o));
-        h = h[0];
-        insert1(body, o, h);
-    }
-    if (n.type !== SCOPED || n.text !== "{") {
-        var nn = skipAssignment(n);
-        b = scanner2('{}');
-        b = b[0];
-        killarg(h, b, getname_);
-        insert1(b, null, { type: STRAP, text: "return" });
-        insert1(b, null, ...splice1(body, n, nn));
-        insert1(body, o, b);
+        h = scanner2("()")[0];
+        h.splice(0, 0, ...body.splice(i, 1, h));
+    }
+    if (n.type !== SCOPED || n.entry !== "{") {
+        var nni = skipAssignment(body, ni);
+        b = scanner2('{}')[0];
+        b.push({ type: STRAP, text: "return" }, ...body.splice(ni, nni - ni, b));
+        killarg(h, b, letname_);
         killobj(b);
+        ni = nni;
     }
-    splice1(body, o, o = o && o.next);
-    return o;
+    else nni = ni + 1;
+    return nni;
 };
 var getname = function (vars, envs, k) {
     if (!(k in vars) && !(k in envs)) return vars[k] = true, k;
     var inc = /\d+$/.exec(k);
     if (inc) k = k.slice(0, k.length - inc[0].length), inc = 1 + +inc[0];
     else inc = 0;
-    while ((k + inc) in vars) inc++;
+    while ((k + inc) in vars || (k + inc) in envs) inc++;
     vars[k + inc] = true;
     return k + inc;
 };
-var killarg = function (head, body, _getname) {
+var killarg = function (head, body, _getname, setarg = true) {
     var argcodes = [];
     var o = head.first;
     var index = 0;
     var collect = 0, cname, anames = [];
+    var namemap = Object.create(null);
     while (o) {
-        var aname;
+        var aname = null;
         if (o.type === SCOPED) {
             aname = _getname(head.length > 1 ? 'arg' + index : 'arg');
-            var dec = splice1(head, o, o = o.next, { type: EXPRESS, text: aname });
+            var dec = splice2(head, o, o = o.next, { type: EXPRESS, text: aname });
             dec = `${createString(dec)}=${aname}`;
             if (/^var\s/.test(argcodes[argcodes.length - 1])) argcodes[argcodes.length - 1] += ',' + dec;
             else argcodes.push(`var ` + dec);
         }
-        else if (o.type === EXPRESS) {
+        else if (o.type === EXPRESS || o.type === VALUE) {
             aname = o.text;
             if (/^\.\.\./.test(aname)) {
                 cname = aname.replace(/^\.\.\./, '');
-                splice1(head, o.prev ? o.prev : o, o = o.next);
+                splice2(head, o.prev ? o.prev : o, o = o.next);
                 collect = index + 1;
                 continue;
             }
@@ -844,10 +1045,11 @@ var killarg = function (head, body, _getname) {
             }
             var start = o;
             while (o && (o.type !== STAMP || o.text !== ',')) o = o.next;
-            var assign = splice1(head, start, o);
+            var assign = splice2(head, start, o);
             argcodes.push(`if(${aname}===undefined)${aname}${createString(assign)}`);
+            if (o) o = o.next;
         }
-
+        namemap[aname] = true;
     }
     if (collect > 0) {
         collect--;
@@ -859,29 +1061,249 @@ var killarg = function (head, body, _getname) {
 
         if (cname) argcodes.unshift(`var ${cname}=Array.prototype.slice.call(arguments,${collect}${index > collect ? `,${collect - index}` : ""})`);
     }
-    if (argcodes.length) insert1(body, null, ...scanner2(argcodes.join(";") + ";"));
+    if (argcodes.length && setarg) {
+        if (!body) {
+            var next = head.next;
+            if (next.type === STAMP && /^=>$/.test(next.text)) next = next.next;
+            var end = skipAssignment(next);
+            var body = scanner2(`{${argcodes.join(";")};return}`)[0];
+            while (next !== end) {
+                body.push(next);
+                next = next.next;
+            };
+            relink(body);
+            var hq = head.queue;
+            var i = hq.indexOf(head.next);
+            var j = end ? hq.indexOf(end) : hq.length;
+            splice(hq, i + 1, j - i, body);
+        }
+        else body.unshift(...scanner2(argcodes.join(";") + ";")), relink(body);
+    }
+    return [namemap, argcodes];
 };
-
+var revar = function (scoped) {
+    if (!scoped.body) return;
+    var killed = [];
+    var rm = function (o, i) {
+        if (o.type === STRAP && /^(const|let|var)$/.test(o.text)) {
+            var q = o.queue;
+            if (!q) return;
+            var n = o;
+            var s = i, v = o;
+            if (o.next) do {
+                o = n.next;
+                n = o.next;
+                if (n && n.type === STRAP && n.text === 'in') break;
+                if (n && n.text === '=') {
+                    n = skipAssignment(n);
+                }
+                else {
+                    i = q.indexOf(o.prev, i);
+                    var j = n ? q.indexOf(n, i) : q.length;
+                    q.splice(i, j - i);
+                }
+            } while (n && n.type === STAMP && n.text === ',');
+            if (q[s] === v) q.splice(s, 1);
+            if (killed.indexOf(q) < 0) killed.push(q);
+        }
+        else if (o.length) {
+            backEach(o, rm);
+        }
+    };
+    backEach(scoped.body, rm);
+    killed.forEach(relink);
+};
+var killret = function (body, labels = Object.create(null), gettmpname) {
+    var o = body.first;
+    var breakmap = {};
+    var breakIndex = 4;
+    var tmpname = null;
+    var gettmp = function () {
+        if (tmpname) return tmpname;
+        return tmpname = gettmpname();
+    }
+    var lbls = [];
+    while (o) {
+        var unlabel = false;
+        if (o.type === LABEL) {
+            var lbl = o.text.slice(0, o.text.length - 1);
+            if (!labels[lbl]) {
+                labels[lbl] = true;
+                lbls.push(lbl);
+            }
+        }
+        else if (o.type === SCOPED) {
+            killret(o, labels, gettmpname);
+            if (o.entry === '{') unlabel = true;
+        }
+        else if (o.type === STAMP && o.text === ';') {
+            unlabel = true;
+        }
+        if (unlabel) {
+            for (var lbl of lbls) delete labels[lbl];
+            lbls = [];
+        }
+        if (o.type !== STRAP) {
+            o = o.next;
+            continue;
+        }
+        switch (o.text) {
+            case "function":
+                while (o && o.type !== SCOPED || o.entry !== '{') o = o.next;
+                break;
+            case "return":
+                if (o.next && !o.isend) insert1(body, o.next, ...scanner2(`${gettmp()}=1,`));
+                else insert1(body, o.next, ...scanner2(`${gettmp()}=1,void 0`)), o.isend = false;
+                breakmap[o.text] = 1;
+                break;
+            case "break":
+            case "continue":
+                if (o.next && !o.isend) {
+                    var lbl = o.next.text;
+                    if (labels[lbl]) break;
+                    var k = `${o.text} ${lbl}`;
+                    var v = breakmap[k] || breakIndex++;
+                    breakmap[k] = [v, o.text, o.next];
+                    splice2(body, o.next, o.next.next, ...scanner2(`${gettmp()}=${v}`));
+                }
+                else {
+                    if (labels[o.text]) break;
+                    var v = breakmap[o.text] = o.text === 'break' ? 2 : 3;
+                    insert1(body, o.next, ...scanner2(`${gettmp()}=${v}`));
+                    o.isend = false;
+                }
+                o.text = 'return';
+                break;
+            case "for":
+            case "do":
+            case "while":
+                if (!labels.continue) {
+                    lbls.push('continue');
+                    labels.continue = true;
+                }
+            case "switch":
+                if (!labels.break) {
+                    labels.break = true;
+                    lbls.push('break');
+                }
+                break;
+        }
+        o = o.next;
+    }
+    return breakmap;
+}
 var down = function (scoped) {
+    var inAsync = scoped.async;
+    var inAster = scoped.yield;
+    var funcMark = [, "aster_", "async_", "asyncAster_"][inAsync << 1 | inAster];
+    if (funcMark) rootenvs[funcMark] = true;
     var vars = Object.assign(Object.create(null), scoped.vars);
+    var envs = Object.assign(Object.create(null), scoped.envs);
     var objnames = [];
 
-    var _getname = getname.bind(null, vars, scoped.envs);
+    var _getname = getname.bind(null, vars, envs);
+    var _letname = getname.bind(null, envs, vars);
     var gettmpname = function (i = 0) {
         if (!objnames[i]) objnames[i] = _getname("_");
         return objnames[i];
     };
-    var killvar = function (scoped) {
-        if (!scoped.body) return;
+    var letnames = [];
+    var getletname = function (i = 0) {
+        if (!letnames[i]) letnames[i] = _letname("_");
+        return letnames[i];
     };
     // let 转 var
     var killlet = function (scoped) {
+        if (!scoped.lets || scoped.isfunc) return;
         for (var k in scoped.lets) {
-            var nk = _getname(k);
-            if (nk !== k) rename(scoped.used, k, nk);
+            var nk = _letname(k);
+            if (nk !== k) {
+                delete scoped.lets[k];
+                scoped.lets[nk] = true;
+                rename(scoped.used, k, nk);
+            }
+        }
+        var lets = Object.keys(scoped.lets);
+        var hasChildFunc = false;
+        var checkScope = function (s) {
+            if (s.length) {
+                for (var c of s) {
+                    if (hasChildFunc) return;
+                    checkScope(c);
+                }
+            }
+            if (!s.isfunc) return;
+            var sused = s.used;
+            for (var k of lets) {
+                if (k in sused) {
+                    hasChildFunc = true;
+                    break;
+                }
+            }
+        };
+        checkScope(scoped);
+        if (!hasChildFunc) return;
+        var tmp0 = _getname("tmp");
+        var tmp1 = null;
+        var wrapper = scanner2(`(${inAsync ? 'async ' : ''}function${inAster ? "*" : ''}(${lets}){}(${lets}))`)[0];
+        var body = scoped.body;
+        var bp = body.prev;
+        var bn = body.next;
+        var bq = body.queue;
+        var bpp = bp && bp.prev;
+        var isswitch = bp && bp.type === SCOPED && bp.entry === '(' && bpp && bpp.type === STRAP && bpp.text === 'switch';
+        var wbody = wrapper[wrapper.length - 2];
+        for (var k of lets) vars[k] = true, delete envs[k];
+        backEach(body, function (o, i) {
+            if (o.type === STRAP && /^(const|let|var)$/.test(o.text)) splice(body, i, 1);
+        });
+        if (isswitch) splice(wbody, 0, 0, bpp, bp, body);
+        else splice(wrapper, wrapper.length - 2, 1, body), wbody = body;
+        var retmap = killret(wbody, scoped.lets, function () {
+            if (!tmp0) tmp0 = _getname("tmp");
+            return tmp0;
+        });
+        var hasret = false;
+        for (var k in retmap) {
+            hasret = true;
+            break;
+        }
+        var pre = [];
+        var fix = [];
+        if (hasret) {
+            pre.push({ text: 'if', type: STRAP });
+            fix = scanner2('{}');
+            var fix0 = fix[0];
+            for (var k in retmap) {
+                var v = retmap[k];
+                if (v === 1) {
+                    if (!tmp1) tmp1 = _getname('tmp');
+                    fix0.push(...scanner2(`if(${tmp0}===${v}) return ${tmp1}`), { text: ';', type: STAMP });
+                }
+                else if (v === 2 || v === 3) {
+                    fix0.push(...scanner2(`if(${tmp0}===${v}) ${k}`), { text: ';', type: STAMP });
+                }
+                else {
+                    fix0.push(...scanner2(`if(${tmp0}===${v[0]}) ${v[1]}`), v[2], { text: ';', type: STAMP });
+                }
+            }
+            wrapper.unshift(...scanner2(`${tmp0}=0,${tmp1 ? tmp1 + '=' : ''}`));
+        }
+        if (!pre.length && bn && !(bn.type === STAMP && /^[,;]/.test(bn.text))) fix.push({ type: SPACE, text: ';' });
+        if (isswitch) {
+            splice2(bq, bpp, bn, ...pre, wrapper, ...fix);
+        }
+        else if (body.entry === '{' && (!bp || !bpp && (bp.type !== STRAP || !/^(do|try)$/.test(bp.text)) || bp.type === SCOPED && bp.entry === '(' && bpp && bpp.type === STRAP || bp.type === LABEL)) {
+            splice2(bq, body, bn, ...pre, wrapper, ...fix);
+        }
+        else {
+            var wrap = scanner2('{}')[0];
+            splice(wrap, 0, 0, wrapper);
+            splice2(bq, body, bn, wrap);
         }
     };
     var precode = function (text) {
+        if (!scoped.body) return;
         var codelist = typeof text === 'string' ? scanner2(text) : text;
         var first = codelist[0];
         var last = codelist[codelist.length - 1];
@@ -893,7 +1315,6 @@ var down = function (scoped) {
         scoped.body.unshift.apply(scoped.body, codelist);
     };
 
-    var argcodes = [];
     var solidmap = {};
     var setsolid = function (q, o) {
         var k = o.text;
@@ -913,17 +1334,23 @@ var down = function (scoped) {
         }
         o.text = solidmap[k] + c;
     };
-    if (scoped.used.this) {
+    var markcodes = [];
+    if (scoped.isfunc && scoped.used.this && (funcMark || scoped.insett)) {
         let tn = _getname("this_");
         rename(scoped.used, "this", tn);
-        argcodes.push(`var ${tn}=this;`);
+        scoped.used.this.forEach(o => o.origin = 'this');
+        markcodes.push(`${tn}=this`);
     }
-    if (scoped.used.arguments) {
+    if (scoped.isfunc && scoped.used.arguments && (funcMark || scoped.inseta)) {
         let an = _getname("arguments_");
+        scoped.used.arguments.forEach(o => o.origin = 'arguments');
         rename(scoped.used, "arguments", an);
-        argcodes.push(`var ${an}=arguments;`);
+        markcodes.push(`${an}=arguments`);
     }
     var fordeep = 0;
+    var _killobj = function (_getlocal, o) {
+        return killobj(o, gettmpname, getletname, _getlocal, _letname, setsolid);
+    };
     var kill = function (scoped, _, body) {
         if (scoped.isfunc) return down(scoped);
         killlet(scoped);
@@ -932,45 +1359,62 @@ var down = function (scoped) {
         var getdeepname = function () {
             return gettmpname(--fordeep);
         };
+        var killed = false;
         a: if (scoped.head) {
             var hp = scoped.head.prev;
             if (hp && hp.type === STRAP) {
                 if (hp.text === 'for') {
                     unforof(scoped.head, getdeepname, scoped.used);
-                    unforin(scoped.head, body, getdeepname);
+                    killed = unforin(scoped.head, getdeepname, _killobj.bind(null, _getlocal)) !== false;
                     // unforcx(scoped.head, getdeepname);
                 }
                 else if (hp.text === 'catch') {
-                    killarg(scoped.head, scoped.body, _getname);
+                    killarg(scoped.head, scoped.body, _letname);
                     break a;
                 }
             }
-            killobj(scoped.head, gettmpname, _getlocal, setsolid);
+            if (!killed) _killobj(_getlocal, scoped.head);
         }
-        if (scoped.body) killobj(scoped.body, gettmpname, _getlocal, setsolid);
+        if (!killed && scoped.body) _killobj(_getlocal, scoped.body);
         if (scoped.length) scoped.forEach(kill);
         fordeep = saveddeep;
     };
     if (scoped.isfunc) {
-        killlet(scoped);
-        if (scoped.head) killarg(scoped.head, scoped.body, _getname);
-        if (argcodes.length) precode(argcodes.join(";") + ";");
-        if (scoped.body) scoped.body.keeplet = false, killobj(scoped.body, gettmpname, _getname, setsolid);
+        if (scoped.head) var [argsmap, argcodes] = killarg(scoped.head, scoped.body, _letname, false);
+        else argcodes = [];
+        if ((markcodes.length || argcodes.length) && !funcMark) precode(markcodes.concat(argcodes).join(";") + ";");
+        if (scoped.body) scoped.body.keeplet = false, _killobj(_getname, scoped.body);
+
         scoped.forEach(kill);
-        if (scoped.async || scoped.yield) {
-            var argname = _getname("_");
+        if (funcMark) {
+            var argname = _letname("_");
+            unstruct.debug = downLevel.debug;
             var code = unawait(scoped.body, _getname, argname);
-            var body = scanner2(`return ${[, "aster_", "async_", "asyncAster_"][scoped.async << 1 | scoped.yield]}()`);
+            var body = scanner2(`return ${funcMark}()`);
             code.forEach(function (c) {
-                var f = scanner2(`function(${body[2].length ? argname : ''}){}`);
-                if (!c.length) insert1(f[2], null, ...scanner2('return []'));
-                else insert1(f[2], null, ...c);
-                if (body[2].length) insert1(body[2], null, { type: STAMP, text: "," });
-                insert1(body[2], null, ...f);
+                var f = scanner2(`function(${c.awaited ? argname : ''}){\r\n}`);
+                if (!c.length) f[2].push(...scanner2('return [1,0]'));
+                else f[2].push(...c);
+                f[2].push({ type: SPACE, text: "\r\n" });
+                if (body[2].length) body[2].push({ type: STAMP, text: "," });
+                body[2].push({ type: SPACE, text: '\r\n' }, ...f);
             });
-            scoped.body.splice(0, scoped.body.length);
-            insert1(scoped.body, null, ...body);
+            splice(scoped.body, 0, scoped.body.length);
+            if (markcodes.length || argcodes.length) {
+                splice(scoped.body, 0, 0, ...scanner2(markcodes.concat(argcodes).join(';') + ";\r\n"));
+            }
+            splice(scoped.body, scoped.body.length, 0, ...body);
+            for (var k in envs) if (!(k in scoped.envs)) vars[k] = true;
+            delete vars[argname];
+            revar(scoped);
+            scoped.vars = Object.create(null);
+            scoped.async = false;
+            scoped.yield = false;
         }
+        var vars1 = Object.keys(vars).filter(k => !(k in scoped.vars));
+        if (argsmap) vars1 = vars1.filter(k => !(k in argsmap));
+        if (vars1.length && scoped.body) scoped.body.push(...scanner2(`\r\nvar ${vars1}`));
+        if (scoped.body) relink(scoped.body);
     }
     else {
         kill(scoped);
@@ -981,7 +1425,15 @@ var down = function (scoped) {
  */
 function downLevel(data) {
     var code = scanner2(data);
-    down(code.scoped);
+    code = downcode(code);
     return code.toString();
 }
+var downcode = downLevel.code = function (code) {
+    rootenvs = code.envs;
+    rootHyper = rootenvs.Symbol || code.yield || code.async;
+    down(code.scoped);
+    code.keepcolor = false;
+    rootenvs = null;
+    return code;
+};
 module.exports = downLevel;