efront 4.0.7 → 4.0.9

package/coms/compile/downLevel.js

@@ -982,7 +982,7 @@ var unforof = function (o, getnewname, used) {
         splice(o, o.length, 0, { type: STAMP, text: ',' });
     }
     if (useSimpleLoop) splice(o, o.length, 0, ...scanner2(`${iname}=0,${gname}=${oname}["length"];${iname}<${gname}&&(${createString([p])}=${oname}[${iname}],true);${iname}++`));
-    else rootenvs.Symbol = true, splice(o, o.length, 0, ...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"]()`));
+    else rootenvs.Symbol = true, splice(o, o.length, 0, ...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}=${hasawait ? 'await ' : ''}${gname}["next"]()`));
     relink(o);
 };
 var unarrow = function (body, i, killobj, letname_) {

package/coms/compile/downLevel_test.js

@@ -200,7 +200,10 @@ function () {
 _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]
+if (!_2) return [2, 0]; noSymbol; _2 = _0["next"](); return [_2, 1]
+},
+function (_1) {
+_2 = _1; _ = _2; return [-2, 0]
 })
 var _, _0, _2`)
 assert(downLevel(`for await(var [o,s] of os) noSymbol`), `return async_(
@@ -217,7 +220,10 @@ function () {
 _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]
+if (!_3) return [2, 0]; noSymbol; _3 = _0["next"](); return [_3, 1]
+},
+function (_2) {
+_3 = _2; _ = _3; return [-2, 0]
 })
 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`)

package/coms/compile/unstruct.js

@@ -8,7 +8,8 @@ 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 re = result[result.length - 1];
+    if (!result.length || re.ret_ && !re.await_ && re.ret_ !== -2) return;
     var label;
     do {
         var o = body[++cx];
@@ -37,7 +38,7 @@ var _break = function (body, cx, result, iscontinue) {
     else {
         for (var cx = labels.length - 1; cx >= 0; cx--) {
             var b = labels[cx];
-            if (b.type !== LABEL) {
+            if (b.type !== LABEL && (!iscontinue || b.text !== 'switch')) {
                 if (!b.breaks) b.breaks = [];
                 var _b = scanner2("return []");
                 _b.ret_ = -1;

package/coms/compile/unstruct_test.js

@@ -94,4 +94,5 @@ test(`cc.name += "<f test></f>"`, `_ = cc.name + "<f test></f>"; cc.name = _`, t
 test("yield a", 'return [a, 3]', true);
 test("throw a", 'throw a', true);
 test("debugger", 'debugger', true);
-test("a(b,b+=1)", '_ = b; _0 = b + 1; b = _0; a(_, _0)', true);
+test("a(b,b+=1)", '_ = b; _0 = b + 1; b = _0; a(_, _0)', true);
+test("while(a){if(b){if(c);else d;continue;}}", 'if (!a) return [4, 0]; if (!b) return [3, 0]; if (!c) return [1, 0]; return [2, 0];\r\n d; return [1, 0];\r\n return [-2, 0];\r\n return [-3, 0]', true);

package/package.json

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