efront 3.36.7 → 3.36.9

package/coms/basic/refilm_decode.js

@@ -219,7 +219,8 @@ function parseValue(map) {
         case "nil":
             return null;
     }
-    return parseNumber(map);
+    if (/^[\d\.]/.test(map)) return parseNumber(map);
+    return map;
 }
 
 var last_type = '';
@@ -228,7 +229,7 @@ var getComment = function (piece) {
     for (var cx = 0, dx = piece.length; cx < dx; cx++) {
         var p = piece[cx];
         if (!isString(p)) continue;
-        var a = /^\/\//.exec(p);
+        var a = /^(\/\/|;)/.exec(p);
         if (a) {
             return piece.splice(cx, piece.length - cx).join(' ').slice(2);
         }
@@ -329,11 +330,11 @@ function parse(piece) {
             let [_, t, d] = /^(\w*?)\/?(\d+)$/.exec(type);
             type = d + 'bit/' + t;
         }
-        var sizematch = /^(\-?\d+|\-?\d*\.\d+)([YZEPTGMK]i?b?|bytes?|bits?|B|[^\/]*)([\/]|$|\s|\=)/i.exec(type);
+        var sizematch = /^(\-?\d+|\-?\d*\.\d+)?([YZEPTGMK]i?b?|bytes?|bits?|words?|dword|real[48]|long|B|[^\/]*)([\/]|$|\s|\=)/i.exec(type);
         if (sizematch) {
-            var [size_text, size, unit] = sizematch;
-            if (unit) {
-                var ratio = KMGT.indexOf(unit.toUpperCase().charAt(0));
+            var [size_text, size = 1, unit, eq] = sizematch;
+            if (unit && /^i?b?$/i.test(unit.slice(1))) {
+                let ratio = KMGT.indexOf(unit.toUpperCase().charAt(0));
                 size *= Math.pow(1024, ratio + 1);
                 if (ratio >= 0) {
                     unit = unit.slice(1).replace(/^i/, '');
@@ -345,12 +346,19 @@ function parse(piece) {
             var ratio;
             switch (unit) {
                 case "long":
+                case "qword":
+                case "real8":
                 case "double":
-                    if (!size) size = 8;
+                    ratio = 8;
+                    break;
+                case "dword":
+                case "real":
+                case "real4":
                 case "float":
                 case "uint":
                 case "int":
-                    if (!size) size = 4;
+                    ratio = 4;
+                    break;
                 case "bit":
                 case "utf":
                 case "bool":
@@ -368,12 +376,17 @@ function parse(piece) {
                     ratio = 1;
             }
             type = type.slice(size_text.length);
-            if (/\=/.test(type)) {
-                var value = type.slice(1, (size * ratio) + 1);
-                type = type.slice(value.length + 1) || 'flag';
+            if (eq === '=') {
+                // 只读
+                var value = parseValue(type);
+                type = "flag";
+            }
+            else if (/=/.test(type)) {
+                [type, value] = type.split("=");
+                value = parseValue(value);
             }
             if (!type) {
-                type = size + unit;
+                type = (!sizematch[1] ? '' : size) + unit;
             } else {
                 type = type.replace(/^[\|\:\-\,\/]/, '');
             }
@@ -387,7 +400,6 @@ function parse(piece) {
             type = type.slice(1);
         }
         if (typeof options === "string" && !/^[\$#]+\d+$/.test(options)) {
-            console.log(options)
             options = is(options);
             var needUnfold = /^\[|\]$/.test(options);
             options = options.replace(/^\[|\]$/g, '');

package/coms/compile/Javascript.js

@@ -439,7 +439,7 @@ Javascript.prototype.detour = function detour(o, ie) {
 };
 
 var removeImport = function (c, i, code) {
-    var { used, envs } = code;
+    var { used, envs, vars } = code;
     var [dec, map, o] = getDeclared(c.next);
     if (dec.length !== 1 || !o) throw new Error("代码结构异常！");
     if (o.type !== STRAP || o.text !== 'from') throw new Error("缺少from语句");
@@ -484,8 +484,8 @@ var removeImport = function (c, i, code) {
                 used[name].push(u);
             });
             delete used[dn];
+            delete vars[dn];
         });
-
     }
     var u = { type: EXPRESS, text: name };
     code.splice(i + 1, oi - i - 1, u);

package/coms/compile/common.js

@@ -282,6 +282,7 @@ var createScoped = function (parsed, wash) {
             var isClass = false;
             var isAsync = false;
             var isAster = false;
+            var function_obj = null;
             if (o.type === STAMP && equal_reg.test(o.text)) {
                 var p = snapExpressHead(o.prev);
                 if (!p) {
@@ -424,6 +425,7 @@ var createScoped = function (parsed, wash) {
                             if (o.prev && o.prev.text === 'async') {
                                 isAsync = true;
                             }
+                            function_obj = o;
                             if (o.next.type === STAMP) {
                                 isAster = true;
                                 o = o.next;
@@ -508,6 +510,7 @@ var createScoped = function (parsed, wash) {
                     scoped.async = isAsync;
                     scoped.isfunc = true;
                     isFunction = true;
+                    if (function_obj) function_obj.scoped = scoped;
                     funcbody = scoped;
                 } else {
                     vars = _vars;

package/coms/compile/unstruct.js

@@ -6,7 +6,7 @@ var RD = { type: STRAP, text: "@rd" };// if (_) return
 var RETURN = { type: STRAP, text: "@ret" };// return;
 var YIELD = { type: STRAP, text: "@yield" };// return;
 var NEXT = { type: STRAP, text: "@next" };// return;
-var _break = function (body, cx, result) {
+var _break = function (body, cx, result, iscontinue) {
     var label;
     do {
         var o = body[++cx];
@@ -15,15 +15,20 @@ var _break = function (body, cx, result) {
     } while (true);
     var bx = cx;
     if (label) {
+        var s;
         for (var cx = labels.length - 1; cx >= 0; cx--) {
             var b = labels[cx];
             if (b.type === LABEL && b.text === label) {
                 if (!b.breaks) b.breaks = [];
                 var _b = scanner2(`return[]`);
+                if (iscontinue) _b.continue = s, s.continue = true;
                 addresult(result, _b);
                 b.breaks.push(_b);
                 break;
             }
+            else {
+                s = b;
+            }
         }
     }
     else {
@@ -32,6 +37,7 @@ var _break = function (body, cx, result) {
             if (b.type !== LABEL) {
                 if (!b.breaks) b.breaks = [];
                 var _b = scanner2(`return[]`);
+                if (iscontinue) _b.continue = b, b.continue = true;
                 addresult(result, _b);
                 b.breaks.push(_b);
                 break;
@@ -155,6 +161,7 @@ var _switch = function (body, cx, unblock, result, getname) {
 };
 var _for = function (body, cx, unblock, result, tmpname) {
     var o = body[cx];
+    var label = o;
     o = o.next;
     var m = o.first;
     if (m.type === STRAP && /^(let|const|var)$/.test(m.text)) {
@@ -187,6 +194,7 @@ var _for = function (body, cx, unblock, result, tmpname) {
     relink(result[result.length - 1]);
     var i = result.length;
     unblock(block_);
+    if (label.continue) label.continue = result.length, result[result.length - 1].cont = true, label.contat = result.length;
     unblock(block2);
     result[result.length - 1].push(...scanner2(`;return [${i - result.length},0]`));
     b[b.length - 1].push(...scanner2(`${result.length - i + 1},0`));
@@ -219,6 +227,7 @@ var getCondition = function (o, unblock, not_) {
 }
 var _while = function (body, cx, unblock, result, tmpname) {
     var o = body[cx];
+    o.contat = result.length;
     o = o.next;
     while (body[cx] !== o) cx++;
     var b = scanner2(`if(${getCondition(o, unblock, true)})return []`)
@@ -244,7 +253,7 @@ var pushstep = function (result, step) {
         relink(step);
         result.push(step);
     }
-    else if (q.ifrt) {
+    else if (q.ifrt || q.cont) {
         result.push(step);
     }
     else {
@@ -310,10 +319,12 @@ var addresult = function (result, step) {
 };
 var _do = function (body, cx, unblock, result, tmpname) {
     var o = body[cx];
+    var label = o;
     o = o.next;
     var i = result.length;
     unblock(o);
     o = o.next.next;
+    if (label.continue) result[result.length - 1].cont = true, label.contat = result.length;
     var b = scanner2(`if(${getCondition(o, unblock)})return [${i - result.length},0];return [1,0]`);
     addresult(result, b);
     while (body[cx] !== o) cx++;
@@ -451,7 +462,7 @@ var ternary = function (body, getname, ret) {
                 addresult(res, scanner2(`if(${getCondition(b, function (b) {
                     addresult(res, _express(b));
                     return res[res.length - 1];
-                })})return [1,0];return [${c.length + 1},0]`));
+                })})return [1,0]`));
                 res.push(...c);
                 res.push(...d);
             }
@@ -540,6 +551,7 @@ var _express = function (body, getname, ret) {
         }
     }
     var b = body.slice(bx, cx);
+    var needname = false;
     if (cache.length) while (cache.length) {
         var p = cache.pop();
         if (needcomma(q)) q.push({ type: STAMP, text: ',' });
@@ -550,31 +562,33 @@ var _express = function (body, getname, ret) {
         q.push.apply(q, t);
         q.push.apply(q, b);
         if (isawait) q.push(NEXT);
+        needname = true;
         b = [{ type: EXPRESS, text: getname(nameindex) }];
     }
     else if (ax !== 1) {
         if (ret && b.length || ax > 1) {
             q.push(...scanner2(`${getname(nameindex)}=`));
             q.push(...b);
+            needname = true;
         }
         else {
             q.push(...b);
         }
     }
-    q.name = getname(nameindex);
+    if (needname) q.name = getname(nameindex);
     if (ax === 1) {
         if (q.length) q.push({ type: STAMP, text: ';' });
         q.push(exps[0], { type: STAMP, text: "=" });
         q.push(...b);
         q.name = exps[0].text;
-        exps[0].set = getname(nameindex);
+        if (evals.length) exps[0].set = getname(nameindex);
         exps.shift();
     }
     if (ax > 1) {
         while (ax > 0) {
             q.push({ type: STAMP, text: ';' });
             var [e] = exps.splice(ax - 1, 1);
-            e.set = getname(nameindex + 1);
+            if (evals.length) e.set = getname(nameindex + 1);
             q.push(e);
             q.push(...scanner2(`=${getname(nameindex)}`))
             ax--;
@@ -608,6 +622,10 @@ var getblock = function (body, cx) {
     return body.slice(ax, cx);
 };
 var labels = [];
+var scopes = [];
+var isbreak = function (o) {
+    return o.type === STRAP && /^(break|return|continue|yield)$/.test(o.text);
+};
 
 function toqueue(body, getname, ret = false) {
     var retn = false;
@@ -617,18 +635,27 @@ function toqueue(body, getname, ret = false) {
         addresult(result, re);
     }
     var uniftop = function () {
-        for (var cx = 2, dx = iftop.length; cx < dx; cx += 2) {
+        for (var cx = 3, dx = iftop.length; cx < dx; cx += 3) {
             var findex = iftop[cx];
+            var r = iftop[cx + 1];
             var p = result[findex - 1];
-            p.pop();
-            p.push(...scanner2(`[${result.length + 1 - findex},0]`));
-            relink(p);
+            if (!r) {
+                p.pop();
+                p.push(...scanner2(`[${result.length + 1 - findex},0]`));
+                relink(p);
+            }
         }
-        for (var cx = 0, dx = iftop.length - 1; cx < dx;) {
+        for (var cx = 0, dx = iftop.length - 2; cx < dx;) {
             var findex = iftop[cx++];
             var f = result[findex];
+            var r = iftop[cx++];
             var n = iftop[cx++];
-            if (f) {
+            if (r) {
+                var c = scanner2(`if(${n})`);
+                f.unshift.apply(f, c);
+                relink(f);
+            }
+            else if (f) {
                 var c = scanner2(`if(${n})return [${iftop.length > cx ? iftop[cx] - findex : result.length - findex},0];`);
                 f.unshift.apply(f, c);
                 relink(f);
@@ -660,7 +687,7 @@ function toqueue(body, getname, ret = false) {
                     var r = result[cx];
                     if (r[r.length - 1] === end) { break }
                 }
-                end.push({ type: VALUE, text: result.length - cx }, { type: STAMP, text: "," }, { type: VALUE, text: "0" });
+                end.push({ type: VALUE, text: b.contat - cx ? b.continue : result.length - cx }, { type: STAMP, text: "," }, { type: VALUE, text: "0" });
                 relink(end);
             }
         }
@@ -675,23 +702,20 @@ function toqueue(body, getname, ret = false) {
         if (!o) break;
         while (labels.length) {
             var e = labels[labels.length - 1];
-            if (e.type !== LABEL) {
-                break;
-            }
-            if (e.keep) {
-                e.keep = false;
-                break;
-            }
+            if (e.type !== LABEL && !iftop) break;
+            if (scopes.lastIndexOf(e.scope) >= 0) break;
             poplabel();
         }
 
         if (o.type === LABEL) {
-            o.keep = true;
+            o.scope = scopes[scopes.length - 1];
             labels.push(o);
             continue;
         }
         if (o.type === SCOPED && o.entry === '{' && !o.isExpress) {
+            scopes.push(o);
             var b = toqueue(o, getname, false);
+            scopes.pop();
             // addresult(result, b);
             result.push.apply(result, b);
             cx++;
@@ -722,8 +746,8 @@ function toqueue(body, getname, ret = false) {
                 bx = cx + 1;
                 break a;
             }
-            if (o.text === 'break') {
-                cx = _break(body, cx, result);
+            if (/^(break|continue)$/.test(o.text)) {
+                cx = _break(body, cx, result, o.text === 'continue');
                 bx = cx + 1;
                 continue;
             };
@@ -768,23 +792,25 @@ function toqueue(body, getname, ret = false) {
             var elseif = false;
             if (o.text === 'else') {
                 ifpatch();
-                iftop.push(result.length);
                 while (body[cx] !== o.next) cx++;
                 o = o.next;
+                var isbr = isbreak(o);
+                iftop.push(result.length, isbr);
                 elseif = true;
             }
             if (o.text === 'if') {
                 while (body[cx] !== o.next) cx++;
                 o = o.next;
-                var n = getCondition(o, unblock, true);
+                var isbr = isbreak(o.next);
+                var n = getCondition(o, unblock, !isbr);
+                o = o.next;
                 if (!elseif) {
                     if (iftop) uniftop();
-                    iftop = [result.length, n];
+                    iftop = [result.length, isbr, n];
                 }
                 else {
                     iftop.push(n);
                 }
-                o = o.next;
                 elseif = true;
             }
             if (elseif) {
@@ -823,7 +849,13 @@ var ret_ = '';
 module.exports = function (body, newname, ret) {
     if (ret) ret = isString(ret) ? ret : newname();
     var ret0 = ret_;
-    ret_ = ret;
+    var ret1 = null;
+    if (ret) ret_ = isString(ret) ? ret : {
+        toString() {
+            if (ret1) return ret1;
+            return newname();
+        }
+    };
     var tmpnames = [];
     var p = 0;
     var getname = function (i) {

package/coms/compile/unstruct_test.js

@@ -16,7 +16,7 @@ test('a * a + b * c', "_ = a * a, _0 = b * c, _ + _0");
 test('a * a + b * c * c ** d', "_ = a * a, _0 = b * c, _1 = c ** d, _0 = _0 * _1, _ + _0");
 test('a * a || b * c * c ** d', "_ = a * a @re _ = b * c, _0 = c ** d, _ * _0");
 test('a * a || b * c || c * d', "_ = a * a @re _ = b * c @re c * d");
-test('a?b:c', "if (a) return [1, 0]; _ = b; return [2, 0]; _ = c;");
+test('a?b:c', "if (a) return [1, 0]; _ = b; return [2, 0]; _ = c");
 test('a * a && b * c * c ** d', "_ = a * a @rz _ = b * c, _0 = c ** d, _ * _0");
 test('a = 1 + 2', "_ = 1 + 2, a = _", true);
 test('a = b', "a = b", true);

package/coms/kugou/buildScroll.js

@@ -1,6 +1,5 @@
 function Main(dataid, datapath, titleid) {
     var _titlebar = titlebar(" ");
-    state.with(_titlebar);
     var page = createVboxWithState(state);
     page.initialStyle = 'margin-left:100%';
     page.innerHTML = buildScroll;

package/coms/zimoli/zimoli.js

@@ -339,7 +339,7 @@ function prepare(pgpath, ok) {
     };
     state.titlebar = function () {
         var realTitleBar = titlebar.apply(null, arguments);
-        if (!realTitleBar.parentNode) state.with(realTitleBar);
+        if (!realTitleBar.parentNode) _with_elements.push(realTitleBar);
         return realTitleBar;
     };
     var roles = res || null;
@@ -397,7 +397,7 @@ function create(pagepath, args, from, needroles) {
     }
     else if (isFunction(pagepath)) {
         var pg = pagepath;
-        var { with: _with_elements, state = {}, onback: _pageback_listener, roles } = pg;
+        var { with: _with_elements = [], state = {}, onback: _pageback_listener, roles } = pg;
     }
     if (!checkroles(user.roles, roles) || !checkroles(user.roles, needroles)) {
         // 检查权限
@@ -406,14 +406,15 @@ function create(pagepath, args, from, needroles) {
         }
         return alert(i18n`没有权限！`, 0);
     }
-    _with_elements = [].concat(_with_elements);
+    var _with_length = _with_elements.length;
     state.onback = function (handler) {
         _pageback_listener = handler;
     };
     var _page = pg.call(state, args, from);
     if (undefined === args || null === args) args = {};
     if (_page) {
-        if (_with_elements.length) _page.with = _with_elements.concat(_page.with || []);
+        if (_with_length) _page.with = _with_elements.concat(_page.with || []);
+        _with_elements.splice(_with_length, _with_elements.length - _with_length);
         if (args.initialStyle) _page.initialStyle = args.initialStyle;
         if (args.holdupStyle) _page.holdupStyle = args.holdupStyle;
         if (_page.initialStyle && !_page.holdupStyle) {

package/package.json

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