efront 4.19.1 → 4.19.2

package/coms/compile/unstruct.js

@@ -327,6 +327,7 @@ var _while = function (body, cx, unblock, result) {
     var b = rescan`if (${getCondition(o, unblock, true)}) return []`;
     var be = b[b.length - 1];
     pushstep(result, b);
+    var i2 = result.length - 1;
     relink(result[result.length - 1]);
     var block = getblock(body, ++cx);
     cx += block.length;
@@ -335,7 +336,8 @@ var _while = function (body, cx, unblock, result) {
     var we = wend[wend.length - 1];
     pushstep(result, wend);
     we[0].text = String(1 + i - result.length);
-    be.push(...scanner2(`${result.length - i}, 0`));
+    be.push(...scanner2(`${result.length - i2}, 0`));
+
     relink(be);
     return cx;
 };

package/coms/compile/unstruct_test.js

@@ -161,4 +161,6 @@ test("if(a){if(b){c}else{d}}else{e}", `if (!a) return [3, 0]; if (!b) return [1,
 test("if(a&&b||c){d}", `_ = a; if (!_) return [1, 0]; _ = b;\r\n if (_) return [1, 0]; _ = c;\r\n if (!_) return [1, 0]; d; return [1, 0]`, true);
 test("if(a)switch(b){case c:d;break;} else{h}", `if (!a) return [3, 0]; if (b === c) return [1, 0]; return [2, 0];\r\n d; return [1, 0];\r\n return [2, 0];\r\n h; return [1, 0]`)
 test("var res = null, krc;", `res = null; krc`)
-test("res = null, krc;", `res = null; krc`)
+test("res = null, krc;", `res = null; krc`)
+test(`while (a && b);`, '_ = a; if (!_) return [1, 0]; _ = b;\r\n if (!_) return [1, 0]; return [-1, 0]', true);
+test(`while (a < b);`, '_ = a < b; if (!_) return [1, 0]; return [0, 0]', true);

package/package.json

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