efront 4.0.3 → 4.0.7

package/coms/compile/common.js

@@ -121,27 +121,42 @@ var skipAssignment = function (o, cx) {
             break;
         case STRAP:
             if (needpunc) {
-                if (/^catch$/.test(o.text)) {
-                    next();
-                    next();
-                    needpunc = false;
-                    break;
-                }
-                if (!/^(in|instanceof|of|else|as|finally)$/.test(o.text)) break loop;
+                if (!/^(in|instanceof|of|else|as)$/.test(o.text)) break loop;
                 if (o.text === 'else') {
                     if (!ifdeep) break loop;
                     ifdeep--;
+                    needpunc = false;
                 }
-
                 next();
                 needpunc = false;
             }
-            else if (/^(do|if|while|for|switch|with)$/.test(o.text)) {
+            else if (/^(try|catch|finally)$/.test(o.text)) {
+                next();
+                if (o.entry === "(") next();
+                next();
+            }
+            else if (o.text === 'else') {
+                ifdeep--;
+                needpunc = false;
+                next();
+            }
+            else if (/^(if|while|with|switch)$/.test(o.text)) {
                 if (o.text === 'if') ifdeep++;
                 next();
                 next();
                 break;
             }
+            else if (o.text === 'do') {
+                next();
+                next();
+                next();
+            }
+            else if (o.text === 'for') {
+                next();
+                if (o.type === STRAP && o.text === 'await') next();
+                next();
+                break;
+            }
             else if (o.text === "class") {
                 next();
                 while (o && !o.isClass) next();
@@ -163,9 +178,12 @@ var skipAssignment = function (o, cx) {
                 needpunc = false;
                 break loop;
             }
+            else if (o.isend && !ifdeep) {
+                next();
+                break loop;
+            }
             else {
                 next();
-                needpunc = false;
             }
             break;
         default:
@@ -191,7 +209,7 @@ function snapSentenceHead(o) {
             p = o.prev;
             if (!p) break;
         }
-        var maybeprop = o.type === SCOPED && o.entry !== "{" || o.type === EXPRESS && /^\./.test(o.text);
+        var maybeprop = o.type === SCOPED && o.entry !== "{" || o.type === EXPRESS && /^[\.\[]/.test(o.text);
         if (p.type === EXPRESS) {
             if (maybeprop || /\.$/.test(p.text)) {
                 o = p;
@@ -472,7 +490,7 @@ var createScoped = function (parsed, wash) {
                                 if (mustyield !== false && o.next) {
                                     if (o.next.type === STRAP && !/^(?:instanceof|in|of|from|as)$/.test(o.next.text)
                                         || o.next.type === STAMP && /[!~]/.test(o.next.text)
-                                        || o.next.type === EXPRESS && /^\./.test(o.next.text)
+                                        || o.next.type === EXPRESS && !/^[\.\[]/.test(o.next.text)
                                         || o.next.type & (VALUE | QUOTED | SCOPED)
                                     ) {
                                         mustyield = true;
@@ -704,7 +722,7 @@ var createScoped = function (parsed, wash) {
                             || (VALUE | QUOTED | SCOPED) & o.type
                             || EXPRESS === o.type && !/\.$/.test(o.text)) {
                             if ((VALUE | QUOTED | PROPERTY | LABEL) & next.type) break;
-                            if (EXPRESS === next.type && !/^\./.test(next.text)) break;
+                            if (EXPRESS === next.type && !/^[\.\[]/.test(next.text)) break;
                             if (next.type === SCOPED && next.entry === "{") break;
                             if (next.type === STRAP && !next.isExpress) break;
                         }
@@ -1079,7 +1097,7 @@ var createString = function (parsed) {
                 break;
             default:
                 if (o instanceof Object) {
-                    if (o.prev && o.prev.type === EXPRESS && o.type === EXPRESS && (/^\./.test(o.text) || /\.$/.test(o.prev.text)));
+                    if (o.prev && o.prev.type === EXPRESS && o.type === EXPRESS && (/^[\.\[]/.test(o.text) || /\.$/.test(o.prev.text)));
                     else if ((STRAP | EXPRESS | PROPERTY | COMMENT | VALUE) & lasttype && (STRAP | EXPRESS | PROPERTY | VALUE) & o.type) {
                         result.push(" ");
                     }

package/coms/compile/downLevel.js

@@ -937,7 +937,7 @@ var unforin = function (o, getnewname_, killobj) {
     );
     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}++`);
+    var c = scanner2(`(${m.text}=${tname}[${kname}],true);${kname}++`);
     insert1(o, null, ...c);
 };
 
@@ -1358,7 +1358,7 @@ var down = function (scoped) {
                 if (!hp) break a;
                 if (hp.text === 'for') {
                     unforof(hp.next, getdeepname, scoped.used);
-                    killed = unforin(scoped.head, getdeepname, _killobj.bind(null, _getlocal)) !== false;
+                    if (funcMark) killed = unforin(scoped.head, getdeepname, _killobj.bind(null, _getlocal)) !== false;
                     // unforcx(scoped.head, getdeepname);
                 }
                 else if (hp.text === 'catch') {
@@ -1383,8 +1383,8 @@ var down = function (scoped) {
         if (funcMark) {
             var argname = _letname("_");
             unstruct.debug = downLevel.debug;
-            var code = unawait(scoped.body, _getname, argname);
             var body = scanner2(`return ${funcMark}()`);
+            var code = unawait(scoped.body, _getname, argname);
             code.forEach(function (c) {
                 var f = scanner2(`function(${c.awaited ? argname : ''}){\r\n}`);
                 if (!c.length) f[2].push(...scanner2('return [1,0]'));

package/coms/compile/downLevel_test.js

@@ -188,7 +188,7 @@ assert(downLevel(`function (a,...,c){}`), `function (a, c) { c = arguments["leng
 assert(downLevel(`(...a) => k`), `var slice_ = Array["prototype"]["slice"];\r\nfunction () { var a = slice_["call"](arguments, 0); return k }`)
 assert(downLevel(`for await(o of os) noSymbol`), `return async_(
 function () {
-_3 = Symbol["asyncIterator"]; _2 = os[_3]; if (_2) return [1, 0]; _3 = Symbol["iterator"]; _2 = os[_3]; if (_2) return [1, 0]; _3 = Symbol["iterator"]; _2 = Array["prototype"][_3]
+_2 = Symbol["asyncIterator"]; _2 = os[_2]; if (_2) return [1, 0]; _2 = Symbol["iterator"]; _2 = os[_2]; if (_2) return [1, 0]; _2 = Symbol["iterator"]; _2 = Array["prototype"][_2]
 },
 function () {
 _0 = _2; _2 = _0["call"](os); _0 = _2; _2 = _0["next"](); return [_2, 1]
@@ -197,15 +197,15 @@ function (_1) {
 _2 = _1; _ = _2; return [1, 0]
 },
 function () {
-_2 = !_["done"]; if (!_2) return [1, 0]; _3 = _["value"]; o = _3; _2 = (true)
+_2 = !_["done"]; if (!_2) return [1, 0]; o = _["value"]; _2 = (true)
 },
 function () {
 if (!_2) return [1, 0]; noSymbol; _2 = _0["next"](); _ = _2; return [-1, 0]
 })
-var _, _0, _2, _3`)
+var _, _0, _2`)
 assert(downLevel(`for await(var [o,s] of os) noSymbol`), `return async_(
 function () {
-o; s; _4 = Symbol["asyncIterator"]; _3 = os[_4]; if (_3) return [1, 0]; _4 = Symbol["iterator"]; _3 = os[_4]; if (_3) return [1, 0]; _4 = Symbol["iterator"]; _3 = Array["prototype"][_4]
+o; s; _3 = Symbol["asyncIterator"]; _3 = os[_3]; if (_3) return [1, 0]; _3 = Symbol["iterator"]; _3 = os[_3]; if (_3) return [1, 0]; _3 = Symbol["iterator"]; _3 = Array["prototype"][_3]
 },
 function () {
 _0 = _3; _3 = _0["call"](os); _0 = _3; _3 = _0["next"](); return [_3, 1]
@@ -214,12 +214,12 @@ function (_2) {
 _3 = _2; _ = _3; return [1, 0]
 },
 function () {
-_3 = !_["done"]; if (!_3) return [1, 0]; _4 = _["value"]; _1 = _4; _5 = _1[0]; o = _5; _6 = _1[1]; s = _6; _3 = (true)
+_3 = !_["done"]; if (!_3) return [1, 0]; _1 = _["value"]; o = _1[0]; s = _1[1]; _3 = (true)
 },
 function () {
 if (!_3) return [1, 0]; noSymbol; _3 = _0["next"](); _ = _3; return [-1, 0]
 })
-var o, s, _, _0, _1, _3, _4, _5, _6`)
+var o, s, _, _0, _1, _3`)
 assert(downLevel(`for(o of os) noSymbol`), `for (_ = 0, _0 = os["length"]; _ < _0 && (o = os[_], true); _++) noSymbol\r\nvar _, _0`)
 assert(downLevel(`for(var o of os) Symbol`), `for (var o, _0 = os[Symbol["iterator"]] || os[Symbol["asyncIterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (o = _["value"], true); _ = _0["next"]()) Symbol\r\nvar _, _0`)
 assert(downLevel(`for(var o of os) Symbol`), `for (var o, _0 = os[Symbol["iterator"]] || os[Symbol["asyncIterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (o = _["value"], true); _ = _0["next"]()) Symbol\r\nvar _, _0`)
@@ -245,7 +245,7 @@ function () {
 _; _0 = 0; _3 = a["length"]; _1 = _3; return [1, 0]
 },
 function () {
-_3 = _0 < _1; if (!_3) return [1, 0]; _4 = a[_0]; _ = _4; _3 = (true)
+_3 = _0 < _1; if (!_3) return [1, 0]; _ = a[_0]; _3 = (true)
 },
 function () {
 if (!_3) return [2, 0]; return [_, 3]
@@ -253,22 +253,22 @@ if (!_3) return [2, 0]; return [_, 3]
 function () {
 _3 = _0++; return [-2, 0]
 })
-var _, _0, _1, _3, _4 }`)
+var _, _0, _1, _3 }`)
 assert(downLevel(`async function(){}`), `function () { return async_() }`)
 assert(downLevel(`async function(){for(var a of b){Symbol}}`), `function () { return async_(
 function () {
-a; _3 = Symbol["iterator"]; _2 = b[_3]; if (_2) return [1, 0]; _3 = Symbol["asyncIterator"]; _2 = b[_3]; if (_2) return [1, 0]; _3 = Symbol["iterator"]; _2 = Array["prototype"][_3]
+a; _2 = Symbol["iterator"]; _2 = b[_2]; if (_2) return [1, 0]; _2 = Symbol["asyncIterator"]; _2 = b[_2]; if (_2) return [1, 0]; _2 = Symbol["iterator"]; _2 = Array["prototype"][_2]
 },
 function () {
 _0 = _2; _2 = _0["call"](b); _0 = _2; _2 = _0["next"](); _ = _2; return [1, 0]
 },
 function () {
-_2 = !_["done"]; if (!_2) return [1, 0]; _3 = _["value"]; a = _3; _2 = (true)
+_2 = !_["done"]; if (!_2) return [1, 0]; a = _["value"]; _2 = (true)
 },
 function () {
 if (!_2) return [1, 0]; Symbol; _2 = _0["next"](); _ = _2; return [-1, 0]
 })
-var a, _, _0, _2, _3 }`)
+var a, _, _0, _2 }`)
 assert(downLevel(`a={async a(){var b =c;return 1}}`), `a = (_ = {},
 _.a = function () { return async_(\r\nfunction () {\r\nb = c; return [1, 2]\r\n})\r\nvar b }, _)\r\nvar _`)
 assert(downLevel(`async function(){return 1}`), `function () { return async_(\r\nfunction () {\r\nreturn [1, 2]\r\n}) }`)

package/coms/compile/unstruct.js

@@ -23,7 +23,7 @@ var _break = function (body, cx, result, iscontinue) {
             if (b.type === LABEL && b.text === label) {
                 if (!b.breaks) b.breaks = [];
                 var _b = scanner2('return []');
-                _b.ret_ = true;
+                _b.ret_ = -1;
                 if (iscontinue) _b[1].continue = s, s.continue = true;
                 b.breaks.push(_b[1]);
                 pushstep(result, _b);
@@ -40,7 +40,7 @@ var _break = function (body, cx, result, iscontinue) {
             if (b.type !== LABEL) {
                 if (!b.breaks) b.breaks = [];
                 var _b = scanner2("return []");
-                _b.ret_ = true;
+                _b.ret_ = -1;
                 if (iscontinue) _b[1].continue = b, b.continue = true;
                 b.breaks.push(_b[1]);
                 pushstep(result, _b);
@@ -146,7 +146,7 @@ var _switch = function (body, cx, unblock, result, getname) {
         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;
+        else case_ = scanner2(`return[]`), case_.ret_ = -1;
         pushstep(result, case_);
         var by = cy;
         m = o[cy];
@@ -154,7 +154,7 @@ var _switch = function (body, cx, unblock, result, getname) {
         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;
+        case_ = scanner2(`return[]`), case_.ret_ = -1;
         pushstep(result, case_);
         tmp.push(result.length - 1, case_[case_.length - 1], []);
     }
@@ -284,7 +284,9 @@ var _while = function (body, cx, unblock, result) {
     return cx;
 };
 var pushstep = function (result, step) {
-    if (!step.length) return;
+    if (isempty(step, SPACE)) {
+        return;
+    }
     var q = result[result.length - 1];
     if (!q) {
         result.push(step);
@@ -302,6 +304,7 @@ var pushstep = function (result, step) {
         if (needcomma(q)) q.push({ type: STAMP, text: ';' });
         if (!ishalf(q)) {
             q.ret_ = step.ret_;
+            q.ifbrk = step.ifbrk;
         }
         q.push(...step);
         q.await_ = step.await_;
@@ -346,7 +349,7 @@ var patchstep = function (r, nextindex, h) {
         relink(r);
     }
 };
-var flusqueue = function (result, queue) {
+var flushqueue = function (result, queue) {
     var savedLength = result.length;
     var savedIndex = savedLength - 1;
     var prev = result[savedIndex];
@@ -359,21 +362,6 @@ var flusqueue = function (result, queue) {
     }
 };
 
-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;
-        queue.push(n);
-    } while (mx < step.length);
-    flusqueue(result, queue);
-};
 var _do = function (body, cx, unblock, result) {
     var o = body[cx];
     var label = o;
@@ -391,7 +379,7 @@ var _do = function (body, cx, unblock, result) {
 };
 var stepReturn = function (value, type, q) {
     var r = scanner2(`return [${value},${type}]`);
-    r.ret_ = true;
+    r.ret_ = type === 2 ? type : true;
     if (q && q.length) r.name = q[q.length - 1].name;
     return r;
 }
@@ -422,7 +410,10 @@ var _return = function (r, nextindex) {
         r.await_ = true;
     }
     if (needcomma(r)) r.push({ type: STAMP, text: ';' });
-    else if (r.length) r[r.length - 1].text = ';';
+    else if (r.length) {
+        var re = r[r.length - 1];
+        if (re.type === STAMP && re.text === ',') re.text = ';';
+    }
     r.push(...x);
     relink(r);
 };
@@ -463,7 +454,6 @@ var _invoke = function (t, getname) {
     for (var cx = 0; cx < t.length; cx++) {
         var o = t[cx];
         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;
@@ -476,6 +466,19 @@ var _invoke = function (t, getname) {
             var _nameindex = nameindex;
             remove_end_comma(o);
             var iseval = isEvalScope(o);
+            var constStart = 0;
+            if (!iseval) {
+                for (var cy = 0; cy < o.length; cy++) {
+                    while (cy < o.length && o[cy].type & (SPACE | COMMENT)) cy++;
+                    var ay = cy;
+                    cy = skipAssignment(o, cy);
+                    var m = o[ay];
+                    if (cy === ay + 1 && (m.type === EXPRESS && !/[\.\[]/.test(m.text) || m.type === VALUE || m.type === QUOTED && !m.length)) {
+                        continue;
+                    }
+                    constStart = cy + 1;
+                }
+            }
             for (var cy = 0; cy < o.length; cy++) {
                 var by = cy;
                 while (cy < o.length && o[cy].type & (SPACE | COMMENT)) cy++;
@@ -484,16 +487,17 @@ var _invoke = function (t, getname) {
                 var ey = cy;
                 if (ay === ey || ay >= o.length) continue;
                 var m = o.slice(ay, ey);
-                if (m.length === 1 && (m[0].type === EXPRESS && !/\./.test(m[0].text) || m[0].type === VALUE || m[0].type === QUOTED && !m[0].length)) {
+                if (m.length === 1 && (m[0].type === EXPRESS && !/[\.\[]/.test(m[0].text) && ay >= constStart || m[0].type === VALUE || m[0].type === QUOTED && !m[0].length)) {
                     continue;
                 }
-                var q = toqueue(m, getdeepname, true);
-                var qe = q[q.length - 1];
                 if (!iseval || m[m.length - 1] === o.last) {
+                    var q = toqueue(m, getdeepname, 1);
+                    var qe = q[q.length - 1];
                     splice(o, by, ey - by, { text: qe.name, type: EXPRESS });
                     cy = by + 1;
                 }
                 else {
+                    var q = toqueue(m, getdeepname, false);
                     while (cy < o.length && o[cy].type & (SPACE | COMMENT)) cy++;
                     var c = o[cy];
                     if (c && c.type & STAMP && /^[,;]$/.test(c.text)) cy++;
@@ -505,7 +509,7 @@ var _invoke = function (t, getname) {
             }
             nameindex = _nameindex;
             if (!cache.length) continue;
-            if (queue.length) flusqueue(result, queue), queue = [];
+            if (queue.length) flushqueue(result, queue), queue = [];
             for (var c of cache) pushstep(result, c);
             cache = [];
             var n = o.next;
@@ -524,15 +528,15 @@ var _invoke = function (t, getname) {
     }
     if (queue.length) {
         queue.push(t);
-        flusqueue(result, queue);
+        flushqueue(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) {
+        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);
+        pushstep(result, t);
     }
     return result;
 };
@@ -551,10 +555,18 @@ var ishalf = function (q) {
     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 isempty = function (q, ignore_types) {
+    for (var a of q) {
+        if (!(a.type & ignore_types || a.type === STAMP && /^[,;]$/.test(a.text))) return false;
+    }
+    return true;
+}
 var needcomma = function (q) {
-    if (!q.length) return false;
-    var e = q[q.length - 1];
+    if (isempty(q, COMMENT | SPACE)) return false;
     if (ishalf(q)) return false;
+    var i = q.length - 1;
+    var e = q[i];
+    while (e.type & (SPACE | COMMENT)) e = q[--i];
     return !needbreak(e);
 };
 var patchname = function (d, getname) {
@@ -595,9 +607,9 @@ var ternary = function (body, getname, ret) {
                 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) {
+                pushstep(res, scanner2(`if(${getCondition(b, function (b) {
                     b = ternary(b, getname, true);
-                    for (var b of b) addresult(res, b);
+                    for (var b of b) pushstep(res, b);
                     return b;
                 }, true)})return [1,0]`));
                 var q = res[res.length - 1];
@@ -620,6 +632,12 @@ var ternary = function (body, getname, ret) {
         if (!ret && equcount === 1 && canbeOnce(bd)) {
             res = [bd];
         }
+        else if (ret === 1 && !equcount && canbeOnce(bd)) {
+            var name = getname(0);
+            var r = [{ type: EXPRESS, text: name }, { type: STAMP, text: '=' }, ...bd]
+            r.name = name;
+            res = [r];
+        }
         else {
             res = _express(bd, getname, equalsend > skip || ret);
         }
@@ -888,6 +906,7 @@ var getblock = function (body, cx) {
         cx++;
     }
     var b = body.slice(ax, cx);
+    while (o && o.type & (SPACE | COMMENT)) o = body[++cx];
     b.next = o;
     return b;
 };
@@ -903,9 +922,11 @@ var ifpatch = function (result, autoskip) {
     if (!result.length) return;
     if (autoskip !== false) {
         var rs = result[result.length - 1];
-        if (rs.ret_ && !rs.await_) return;
+        if (rs.ret_ !== true && rs.ret_) return;
     }
     var re = stepReturn(1, 0);
+    re.ret_ = -2;
+    re.ifbrk = autoskip !== undefined;
     pushstep(result, re);
 };
 function toqueue(body, getname, ret = false, result = []) {
@@ -916,9 +937,11 @@ function toqueue(body, getname, ret = false, result = []) {
             if (isbr) continue;
             var findex = iftop[cx] - 1;
             var p = result[findex];
-            p.pop();
-            p.push(scanner2(`[${result.length - findex},0]`)[0]);
-            relink(p);
+            if (p.ifbrk) {
+                p.pop();
+                p.push(scanner2(`[${result.length - findex},0]`)[0]);
+                relink(p);
+            }
         }
         for (var cx = 1, dx = iftop.length - 2; cx < dx; cx++) {
             var isbr = iftop[cx++];
@@ -946,6 +969,7 @@ function toqueue(body, getname, ret = false, result = []) {
                     var r = result[cx];
                     if (r.indexOf(b) >= 0) { break }
                 }
+                if (cx < 0) throw console.log(result.map(r => createString(r)), e.text, createString([b.prev, b])), "break语句异常";
                 end.push({ type: VALUE, text: b.continue ? b.continue.contat - cx : result.length - cx }, { type: STAMP, text: "," }, { type: VALUE, text: "0" });
                 relink(end);
             }
@@ -1047,7 +1071,7 @@ function toqueue(body, getname, ret = false, result = []) {
                 while (body[cx] !== o.next) cx++;
                 o = o.next;
                 isbr = isbreak(o);
-                if (!isbr) ifpatch(result);
+                if (!isbr) ifpatch(result, true);
                 iftop.push(result.length);
                 elseif = true;
             }
@@ -1087,8 +1111,8 @@ function toqueue(body, getname, ret = false, result = []) {
                     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);
+                    if (inif) ifpatch(result, true);
+                    else if (!isbr) ifpatch(result, true);
                     uniftop();
                     if (inif) ifpatch(result, false);
                     iftop = null;

package/coms/compile/unstruct_test.js

@@ -57,8 +57,10 @@ test("if(await a) await b", "_ = a; return [_, 1];\r\n if (!@) return [2, 0]; _
 test("for(a in b)", "for (a in b)", true);
 test("for(var a in b) a.push()", "for (var a in b) a.push()", true);
 test("for(;;)", "return [0, 0]", true);
-test("for(a = os[Symbol.iterator] || os[Symbol.asyncIterator] || Array.prototype[Symbol.iterator], a = a.call(os), b = a.next(); !b.done && (o = b.value, true); b = a.next())", "_ = Symbol.iterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.asyncIterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.iterator; _ = Array.prototype[_];\r\n a = _; _ = a.call(os); a = _; _ = a.next(); b = _; return [1, 0];\r\n _ = !b.done; if (!_) return [1, 0]; _ = b.value; o = _; _ = (true);\r\n if (!_) return [1, 0]; _ = a.next(); b = _; return [-1, 0]", true);
-test("for(a=0;a<1;a++)if(a==0)continue", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [2, 0]; _ = a == 0; if (_) return [1, 0]; return [1, 0];\r\n _ = a++; return [-1, 0]`, true);
+test("for(a = os[Symbol.iterator] || os[Symbol.asyncIterator] || Array.prototype[Symbol.iterator], a = a.call(os), b = a.next(); !b.done && (o = b.value, true); b = a.next())", "_ = Symbol.iterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.asyncIterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.iterator; _ = Array.prototype[_];\r\n a = _; _ = a.call(os); a = _; _ = a.next(); b = _; return [1, 0];\r\n _ = !b.done; if (!_) return [1, 0]; o = b.value; _ = (true);\r\n if (!_) return [1, 0]; _ = a.next(); b = _; return [-1, 0]", true);
+test("for(a=0;a<1;a++)if(a==0)continue\r\n else a=1", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [3, 0]; _ = a == 0; if (_) return [2, 0]; return [1, 0];\r\n a = 1; return [1, 0];\r\n _ = a++; return [-2, 0]`, true);
+test("for(a=0;a<1;a++)if(a==0){continue} else {a=1}", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [3, 0]; _ = a == 0; if (!_) return [1, 0]; return [2, 0];\r\n a = 1; return [1, 0];\r\n _ = a++; return [-2, 0]`, true);
+test("for(a=0;a<1;a++){if(a==0){a=2;continue} else if(b) {a=1;continue} c=3}", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [4, 0]; _ = a == 0; if (!_) return [1, 0]; a = 2; return [3, 0];\r\n if (!b) return [1, 0]; a = 1; return [2, 0];\r\n c = 3; return [1, 0];\r\n _ = a++; return [-3, 0]`, true);
 test("for(a=0;a<10;a++) await a", "a = 0; return [1, 0];\r\n _ = a < 10; if (!_) return [2, 0]; _ = a; return [_, 1];\r\n _ = @; _ = a++; return [-1, 0]", true);
 test("for(a=0;a<10;a++) await a, await b", "a = 0; return [1, 0];\r\n _ = a < 10; if (!_) return [3, 0]; _ = a; return [_, 1];\r\n _ = @; _ = b; return [_, 1];\r\n _ = @; _ = a++; return [-2, 0]", true);
 test("for(a=0;b=2,a<10;a++) await a, await b", "a = 0; return [1, 0];\r\n b = 2; _ = a < 10; if (!_) return [3, 0]; _ = a; return [_, 1];\r\n _ = @; _ = b; return [_, 1];\r\n _ = @; _ = a++; return [-2, 0]", true);
@@ -73,6 +75,7 @@ test("switch(a){case 1:case 2:break;}", "if (a === 1) return [1, 0]; if (a === 2
 test("switch(a){case 1:case 2:x=1;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]; return [2, 0];\r\n x = 1; return [1, 0]", true);
 test("switch(a){case 1:case 2:x=1;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]; return [2, 0];\r\n x = 1; return [1, 0]", true);
 test("with(a){ a = 1}", `if (_ = with_("a", [a])) _.a = 1; else a = 1;`, true);
+test("try{a=2+1}catch(e){return;}", 'return [65537, 7];\r\n _ = 2 + 1; a = _; return [0, 9];\r\n e = @; return [undefined, 2];\r\n return [1, 9]', true);
 test("try{a=2+1}catch(e){}", 'return [1, 7];\r\n _ = 2 + 1; a = _; return [0, 9];\r\n return [1, 9]', true);
 test("try{a=2+1}catch(e){a=3}", 'return [65537, 7];\r\n _ = 2 + 1; a = _; return [0, 9];\r\n e = @; a = 3; return [0, 9];\r\n return [1, 9]', true);
 test("(function(){})", '_ = function () {}; (_)', true);
@@ -90,4 +93,5 @@ test(`a=a+b*c+c*d`, `_ = b * c, _ = a + _, _0 = c * d, _ = _ + _0; a = _`, true)
 test(`cc.name += "<f test></f>"`, `_ = cc.name + "<f test></f>"; cc.name = _`, true);
 test("yield a", 'return [a, 3]', true);
 test("throw a", 'throw a', true);
-test("debugger", 'debugger', true);
+test("debugger", 'debugger', true);
+test("a(b,b+=1)", '_ = b; _0 = b + 1; b = _0; a(_, _0)', true);

package/docs//347/211/210/346/234/254/350/257/264/346/230/216.md

@@ -8,4 +8,4 @@
 
 3.x版本 `efront`拥有自建的语法解析器，不再依赖`esprima`、`esmangle`、`escodegen`，自我编译耗时由原来的10分钟github工作流，逐步减少到2分钟左右。
 
-4.0版本 不再依赖`typescipt`（近17万行源码）
+4.0版本 不再依赖`typescipt`（近17万行源码），编译速度再次提升4倍，占用内存减少到原来的1/8，github上自我编译时间也减少到15秒左右。

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.0.3",
+    "version": "4.0.7",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {