efront 4.2.5 → 4.2.7

package/coms/basic/i18n.js

@@ -1,8 +1,9 @@
 "use strict";
 var languageMap = {};
 var languageIndex = 0;
-function i18n() {
-    return arguments[isFinite(this) ? this : languageIndex];
+function i18n(arg) {
+    if (typeof arg === 'string') arg = arguments;
+    return arg[isFinite(this) ? this : languageIndex];
 };
 i18n.lang = function (type) {
     var id = getLanguageIndexFromName(type) || 0;

package/coms/compile/unstruct.js

@@ -1266,8 +1266,9 @@ function toqueue(body, getname, ret = false, result = []) {
             if (o.text === 'else') {
                 while (body[cx] !== o.next) cx++;
                 o = o.next;
+                var ispbr = iftop[iftop.length - 3];
+                if (!ispbr) ifpatch(result, true);
                 isbr = isbreak(o);
-                if (!isbr) ifpatch(result, true);
                 iftop.push(result.length);
                 elseif = true;
             }

package/coms/compile/unstruct_test.js

@@ -69,7 +69,7 @@ test("for(a in b)", "for (a in b)", true);
 test("for(a of b)", "for (a of b)", true);
 test("for await(a of b)", "for await (a of b)", 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 = a.call(os); b = a.next(); return [1, 0];\r\n _ = !b.done; if (!_) return [1, 0]; o = b.value; _ = (true);\r\n if (!_) return [1, 0]; b = a.next(); 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\r\n else a=1", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [2, 0]; _ = a == 0; if (_) return [1, 0]; a = 1; return [1, 0];\r\n _ = a++; return [-1, 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);
@@ -134,4 +134,5 @@ test("[key[1]][key[2]][key[3]]", '_ = key[1]; _ = [_]; _0 = key[2]; _ = _[_0]; _
 test("[key[1]][key[2]]+[key[3]][key[4]]", '_ = key[1]; _ = [_]; _0 = key[2]; _ = _[_0]; _0 = key[3]; _0 = [_0]; _1 = key[4]; _ + _0[_1]');
 test("if(a)a:{break a}", "if (!a) return [2, 0]; return [1, 0];\r\n return [1, 0]", true);
 unstruct.debug = true;
-test("rgb=(rgb<<8|rgb>>16)&0xffffff", "_ = rgb << 8, _0 = rgb >> 16, _ = _ | _0; _ = (_); rgb = _ & 0xffffff", true);
+test("rgb=(rgb<<8|rgb>>16)&0xffffff", "_ = rgb << 8, _0 = rgb >> 16, _ = _ | _0; _ = (_); rgb = _ & 0xffffff", true);
+test(`if (c) a; else return true; return false`, "if (!c) return [1, 0]; a; return [2, 0];\r\n return [true, 2];\r\n return [false, 2]")

package/package.json

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