efront 4.0.41 → 4.0.48

package/apps/pivot/log/count.js

@@ -1,6 +1,6 @@
 var fields = refilm`
-路径/path html
-访问量/count
+访问量/count money/10
+路径/path html/20
 `;
 function main() {
     var page = div();

package/coms/basic/Table.js

@@ -56,6 +56,7 @@ class Table extends Array {
         var searchtext = this.searchText;
         var fields = this.searchFields ? this.searchFields : this.fields;
         var power = 0;
+        var s = o;
         if (isNode(o)) {
             o = extend({
                 name: o.name,
@@ -68,6 +69,7 @@ class Table extends Array {
             }, o);
         }
         else o = isObject(o) ? Object.create(o) : new o.constructor(o);
+        o.$origin = s;
         for (var f of fields) {
             var name = seek(o, f.key);
             if (isEmpty(name) || !isString(name)) continue;
@@ -90,13 +92,24 @@ class Table extends Array {
         this.update();
     }
     async update() {
+        var origin = this.splice(0, this.length)
+        if (this.searched && this.source && this.searched !== this.source.length) {
+            origin = origin.map(o => o.$origin);
+        }
+        else {
+            origin = [];
+        }
         this.searched = 0;
-        this.splice(0, this.length);
         var source = this.sorted ? this.sorted : this.source;
         if (!source) return;
         var searchid = ++this.searchid;
         this.complete = false;
         this.coverCount = 0;
+        if (origin.length) {
+            if (origin.length >= 160) origin = origin.slice(0, 80);
+            source = source.filter(a => origin.indexOf(a) < 0);
+            source = origin.concat(source);
+        }
         if (this.searchText) for (var o of source) {
             this.addItem(o);
             if (++this.searched % 600 === 0) {

package/coms/basic/analyse_test.js

@@ -1,5 +1,6 @@
 var require = window.require;
 var fs, path;
+var document = window.document;
 function test(url) {
     var data = fs.readFileSync(url);
     data = String(data);
@@ -39,7 +40,7 @@ function analyse_test(text) {
     fs = require("fs");
     path = require("path");
     if (text) return analyse(text);
-    testxml("/book/金山打字");
+    if (document) testxml("/book/金山打字");
     // testcode("/work/efront/coms/basic");
 
     testblog("炒面.txt");

package/coms/basic/arrayEqual.js

@@ -0,0 +1,8 @@
+function sliceEqual(a, b) {
+    if (a === b) return true;
+    if (a.length !== b.length) return false;
+    for (var cx = 0, dx = a.length; cx < dx; cx++) {
+        if (!isSame(a[cx], b[cx])) return false;
+    }
+    return true;
+}

package/coms/basic/concatByte.js

@@ -6,10 +6,8 @@ function concatTypedArray(buffs) {
     while (offset < total) {
         var b = buffs[inc++];
         if (b.buffer) b = new Uint8Array(b.buffer, b.byteOffset, b.byteLength);
-        for (var cx = 0, dx = b.length; cx < dx; cx++) {
-            res[offset + cx] = b[cx];
-        }
-        offset += dx;
+        res.set(b, offset);
+        offset += b.length;
     }
     return res;
 }

package/coms/{zimoli → basic}/deepEqual.js

@@ -53,23 +53,6 @@ var objectEqual = function (o1, o2, deep) {
     }
     return true;
 };
-function shallowEqual(o1, o2) {
-    // 浅层比对，对内层对象不进行递归比对
-    if (o1 === o2) return true;
-    if (isObject(o1) && isObject(o2)) {
-        var keys1 = Object.keys(o1), keys2 = Object.keys(o2);
-        if (keys1.length !== keys2.length) return false;
-        keys1.sort(), keys2.sort();
-        for (var cx = 0, dx = keys1.length; cx < dx; cx++) {
-            var key1 = keys1[cx];
-            var key2 = keys2[cx];
-            if (key1 !== key2) return false;
-            if (!singleEqual(o1[key1], o2[key2])) return false;
-        }
-        return true;
-    }
-    return singleEqual(o1, o2);
-}
 function deepEqual(o1, o2) {
     if (o1 === o2) return true;
     if (isObject(o1) && isObject(o2)) {

package/coms/basic/isSame.js

@@ -1,3 +1,4 @@
+var isNaN = Number.isNaN;
 function isSame(o1, o2) {
-    return o1 === o2 || isNumber(o1) && isNumber(o2) && isNaN(o1) && isNaN(o2);
+    return o1 === o2 || isNaN(o1) && isNaN(o2);
 }

package/coms/basic/refilm_decode.js

@@ -275,13 +275,13 @@ function parse(piece) {
             }
         };
         var is = function (a) {
-            var reg = /^[\*\+\-\!\-\$&\?\~]|[\*\+\-\!\-\$&\?\~]$/;
+            var reg = /^[\*\+\-\!\-&\?\~]|^\$(?!\d)|[\*\+\-\!\-\$&\?\~]$/;
             if (!reg.test(a)) return a;
             required = test(/^\*|\*$/, a);
             if (test(/^[\+]|[\+]$/, a)) inlist = true;
             if (test(/^[\!]|[\!]$/, a)) inlist = false;
             hidden = test(/^\-|\-$/, a);
-            readonly = test(/^[\$&]|[\$&]$/, a);
+            readonly = test(/^&|\$(?!\d)|[\$&]$/, a);
             delete_onempty = test(/^\?|\?$/, a);
             delete_onsubmit = test(/^\~|\~$/, a);
             return a.replace(reg, '');
@@ -331,6 +331,7 @@ function parse(piece) {
             type = d + 'bit/' + t;
         }
         var sizematch = /^(\-?\d+|\-?\d*\.\d+)?([YZEPTGMK]i?b?|bytes?|bits?|words?|dword|real[48]|long|B|[^\/]*)([\/]|$|\s|\=)/i.exec(type);
+        if (!sizematch[1] && /^\$\d/.test(sizematch[2])) sizematch = null;
         if (sizematch) {
             var [size_text, size = 1, unit, eq] = sizematch;
             if (unit && /^i?b?$/i.test(unit.slice(1))) {

package/coms/basic/refilm_decode_test.js

@@ -0,0 +1,2 @@
+var fields = refilm_decode(["启动时间/time $1"]);
+console.log(fields);

package/coms/basic/shallowEqual.js

@@ -0,0 +1,18 @@
+var singleEqual = isSame;
+function shallowEqual(o1, o2) {
+    // 浅层比对，对内层对象不进行递归比对
+    if (o1 === o2) return true;
+    if (isObject(o1) && isObject(o2)) {
+        var keys1 = Object.keys(o1), keys2 = Object.keys(o2);
+        if (keys1.length !== keys2.length) return false;
+        keys1.sort(), keys2.sort();
+        for (var cx = 0, dx = keys1.length; cx < dx; cx++) {
+            var key1 = keys1[cx];
+            var key2 = keys2[cx];
+            if (key1 !== key2) return false;
+            if (!singleEqual(o1[key1], o2[key2])) return false;
+        }
+        return true;
+    }
+    return singleEqual(o1, o2);
+}

package/coms/basic/str2array.js

@@ -0,0 +1,5 @@
+var spliter = /\s*[,;\|]\s*/
+module.exports = function (names) {
+    if (typeof names === 'string') names = names.split(spliter);
+    return names;
+}

package/coms/compile/Javascript.js

@@ -312,6 +312,7 @@ var scan = function (data) {
 var detourTemplate = function (raw, params) {
     var spliter = { text: ",", type: STAMP };
     var template = scan(`extend([],{["raw"]:[]})`);
+    rootenvs.extend = true;
     var str0 = template[1].first;
     var str1 = template[1][2][2];
     for (var r of raw) {
@@ -364,19 +365,27 @@ var removeQuote = function (o, c, i) {
     if (c.next) c.next.prev = cf;
 }
 
-Javascript.prototype.detour = function detour(o, ie) {
-    var avoidMap = this.avoidMap;
+Javascript.prototype.detour = function (o, ie) {
+    context = this;
+    var envs = rootenvs = Object.create(null);
+    detour(o, ie);
+    rootenvs = null;
+    context = null;
+    return envs;
+}
+var context = null, rootenvs = null;
+function detour(o, ie) {
     while (o) {
         switch (o.type) {
             case SCOPED:
-                this.detour(o.first, ie);
+                detour(o.first, ie);
                 break;
             case EXPRESS:
                 var text = o.text.replace(/^\.\.\./, '');
                 var hasdot = o.text.length !== text.length;
-                if (avoidMap) {
+                if (context.avoidMap) {
                     var m = /^[^\.\[\]]+/.exec(o.text);
-                    if (m) { avoidMap[m[0]] = true; }
+                    if (m) { context.avoidMap[m[0]] = true; }
                 }
                 if (/\?\./.test(text)) {
                     text = renderExpress(text);
@@ -384,7 +393,7 @@ Javascript.prototype.detour = function detour(o, ie) {
                     o = replace(o, ...scan(text));
                     continue;
                 }
-                text = text.replace(/\.([^\.\[\!\=\:]+)/g, (_, a) => ie === undefined || this.strap_reg.test(a) || /#/.test(a) ? `[${strings.recode(a)}]` : _);
+                text = text.replace(/\.([^\.\[\!\=\:]+)/g, (_, a) => ie === undefined || context.strap_reg.test(a) || /#/.test(a) ? `[${strings.recode(a)}]` : _);
                 if (hasdot) text = "..." + text;
                 o.text = text;
                 break;
@@ -404,7 +413,7 @@ Javascript.prototype.detour = function detour(o, ie) {
                             else {
                                 c.entry = "(";
                                 c.leave = ")";
-                                this.detour(c.first, ie);
+                                detour(c.first, ie);
                                 splice(o, cx + 1, 0, { type: STAMP, text: ',' });
                                 removeQuote(o, c);
                             }
@@ -424,7 +433,7 @@ Javascript.prototype.detour = function detour(o, ie) {
                             } else {
                                 c.entry = '(';
                                 c.leave = ")";
-                                this.detour(c.first, ie);
+                                detour(c.first, ie);
                                 params.push(c);
                             }
                         }
@@ -460,7 +469,7 @@ Javascript.prototype.detour = function detour(o, ie) {
                 if (/^\[/.test(o.text)) break;
                 if (o.queue.isObject) {
                     var text = strings.recode(o.text);
-                    if (ie === undefined || o.prev && (o.prev.type !== STAMP || o.prev.text !== ",") || this.strap_reg.test(o.text)) {
+                    if (ie === undefined || o.prev && (o.prev.type !== STAMP || o.prev.text !== ",") || context.strap_reg.test(o.text)) {
                         text = `[${text}]`;
                     }
                     else if (ie !== false) {
@@ -612,6 +621,7 @@ var removeExport = function (c, i, code) {
             o = n && n.next;
             var exp = scan(`\r\nexports.${prop}=`);
             exp.push(name);
+            name.isExpress = true;
             allexports.push(exp);
         }
         var ni = skipAssignment(code, i);
@@ -627,6 +637,7 @@ var removeExport = function (c, i, code) {
         n.type = STAMP;
         c.text = `exports.default`;
         code.exportDefault = true;
+        n.next.isExpress = true;
         c.type = EXPRESS;
         return;
     }
@@ -638,6 +649,7 @@ var removeExport = function (c, i, code) {
         }
         c.text = `exports.${dec[0]}`;
         c.type = EXPRESS;
+        n.isExpress = true;
         code.splice(i + 1, 0, ...scan(`=`));
         var nn = n.next;
         var d = nn.text;

package/coms/compile/Program.js

@@ -153,6 +153,7 @@ class Program {
     extends_reg = /^(extends)$/;
     spaces = spaceDefined;
     nocase = false
+    keepspace = false;
     lastIndex = 0
     compile(s) {
         return s.replace(/\\[\s\S]|[\[\]\(\)\{\}\+\.\-\*\?\$\^\|\\\/ ]/g, function (m) {
@@ -192,7 +193,7 @@ class Program {
             var last = queue.last;
             Object.defineProperty(scope, 'queue', { value: queue, enumerable: false, configurable: true });
             scope.prev = last;
-            if (scope.type !== COMMENT && scope.type !== SPACE) {
+            if (!(scope.type & (COMMENT | SPACE))) {
                 var keeplast = program.setType(scope) === false;
                 if (keeplast) {
                     if (queue.last !== last) last = queue.last;
@@ -237,12 +238,7 @@ class Program {
                 }
             }
             var last = queue.last;
-            if (type === SPACE) {
-                if (last && last.isend === false) {
-                    last.isend = true;
-                    queue.inExpress = false;
-                }
-            }
+            if (type === SPACE);
             else if (type !== STAMP);
             else if (m === ";") {
                 if (last && last.isend === false) last.isend = true;
@@ -526,8 +522,16 @@ class Program {
                     m = m.replace(/^[^\r\n\u2028\u2029]+/, '').replace(/\r\n|\r|\n|\u2028|\u2029/g, "\r\n");
                     row += m.replace(/[^\r\n]+/g, '').length >> 1;
                     colstart = match.index + m.replace(/[^\r\n]+$/, '').length - 1;
+                    var last = queue.last;
+                    if (last && last.isend === false) {
+                        last.isend = true;
+                        queue.inExpress = false;
+                    }
                     save(SPACE);
                 }
+                else {
+                    if (this.keepspace) save(SPACE);
+                }
                 lasttype = SPACE;
                 continue;
             }

package/coms/compile/common.js

@@ -13,7 +13,7 @@ const [
     /*1024 */PROPERTY,
 ] = new Array(20).fill(0).map((_, a) => 1 << a);
 // --------------//1//2/////////////////////////22/////////////2//2//3//4/////4////////3/////3//////3//3//////3///////211/////////////2//////2//////1///
-var number_reg = /^(?:(?:0x[0-9a-f]+|0b\d+|0o\d+)(?:_[0-9a-f]+)*|(?:(?:(?:\d+_)*\d+|\d*)\.\d+(?:_\d+)*|(?:\d+_)*\d+\.?))(?:e[\+\-]?\d+(?:_\d+)*|[mn])?$/i;
+var number_reg = /^(?:(?:0x[0-9a-f]+|0b\d+|0o\d+)(?:_[0-9a-f]+)*|(?:(?:(?:\d+_)*\d+|\d*)\.\d+(?:_\d+)*|(?:\d+_)*\d+\.?))(?:e[\+\-]?\d+(?:_\d+)*|[mniul]|ll)?$/i;
 var equal_reg = /^(?:[\+\-\*\/~\^&\|%]|\*\*|>>>?|<<)?\=$|^(?:\+\+|\-\-)$/;
 var skipAssignment = function (o, cx) {
     var next = arguments.length === 1 ? function () {
@@ -132,6 +132,7 @@ var skipAssignment = function (o, cx) {
                 next();
             }
             else if (o.text === 'else') {
+                if (ifdeep <= 0) break loop;
                 ifdeep--;
                 needpunc = false;
                 next();
@@ -140,7 +141,6 @@ var skipAssignment = function (o, cx) {
                 if (o.text === 'if') ifdeep++;
                 next();
                 next();
-                break;
             }
             else if (o.text === 'do') {
                 next();
@@ -151,14 +151,12 @@ var skipAssignment = function (o, cx) {
                 next();
                 if (o.type === STRAP && o.text === 'await') next();
                 next();
-                break;
             }
             else if (o.text === "class") {
                 next();
                 while (o && !o.isClass) next();
                 while (o && o.isClass) next();
                 needpunc = true;
-                break;
             }
             else if (o.text === "function") {
                 next();
@@ -167,7 +165,6 @@ var skipAssignment = function (o, cx) {
                 if (o) next();
                 if (o) next();
                 needpunc = true;
-                break;
             }
             else if (o.text === 'debugger') {
                 next();
@@ -1005,6 +1002,7 @@ var createString = function (parsed) {
     var keepspace = parsed.keepspace !== false;
     var helpcode = parsed.helpcode;
     var lasttype = SPACE;
+    var uncomment = parsed.comment === false;
     var result = [], cacheresult, finalresult = result;
     var helpcolor = parsed.keepcolor === false;
     var run = (o, i, a) => {
@@ -1022,8 +1020,9 @@ var createString = function (parsed) {
         switch (o.type) {
             case COMMENT:
                 // 每一次要远行，我都不得不对自己的物品去粗取精。取舍之间，什么重要，什么不是那么重要，都有了一道明显的分界线。
+                if (uncomment) break;
                 var tmp = o.text, opentmp = false;
-                if (!keepspace || helpcode) {
+                if (helpcode) {
                     if (/^\/[\/\*]\s*\<\!--/.test(tmp)) {
                         opentmp = true;
                         if (/^\/\*/.test(tmp)) opentmp = 2;
@@ -1102,7 +1101,7 @@ var createString = function (parsed) {
             default:
                 if (o instanceof Object) {
                     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) {
+                    else if ((STRAP | EXPRESS | PROPERTY | COMMENT | VALUE) & lasttype && (STRAP | EXPRESS | PROPERTY | VALUE | LABEL) & o.type) {
                         result.push(" ");
                     }
                     else if (o.prev && o.type === STAMP && !/^([,;])$/.test(o.text)) {

package/coms/compile/downLevel.js

@@ -733,13 +733,13 @@ var killspr = function (body, i, _getobjname, killobj) {
     var index = 0;
     var spr = function () {
         var s = m;
-        s.text = s.text.replace(/^\.\.\./, '');
         m = skipAssignment(m);
-        var q = scanner2(`slice_["call"]()`);
-        rootenvs.slice_ = true;
+        s.text = s.text.replace(/^\.\.\./, '');
         var v = splice2(o, s, m);
         if (m) splice2(o, m, m = m.next);
         killobj(v);
+        var q = scanner2(`slice_["call"]()`);
+        rootenvs.slice_ = true;
         insert1(q[q.length - 1], null, ...v);
         return q;
     };
@@ -760,6 +760,23 @@ var killspr = function (body, i, _getobjname, killobj) {
     var next = o.next;
     if (o.entry === '(') {
         var r = snapExpressHead(o);
+        if (r.type === STRAP && r.text === "new") {
+            var qt = scanner2(`()`)[0];
+            r = r.next;
+            var b = body.lastIndexOf(r, i);
+            var ct = splice(body, b, i - b + 1, qt);
+            var qq = ct[ct.length - 1];
+            var qb = scanner2("[null,]")[0];
+            qb.push(...splice(qq, 0, qq.length, qb));
+            ct[ct.length - 1].unshift({ type: STAMP, text: ',' });
+            ct[ct.length - 1].unshift(...ct.slice(0, ct.length - 1).map(a => extend({}, a)));
+            ct.splice(ct.length - 1, 0, ...scanner2("['bind']['apply']"));
+            qt.push(...ct);
+            relink(qq)
+            relink(qb)
+            relink(qt)
+            return b;
+        }
         var rt = r.type === EXPRESS && r.text.replace(/^\.\.\./, '');
         var p = o.prev;
         if (r === o);

package/coms/compile/downLevel_test.js

@@ -19,7 +19,7 @@ assert(downLevel(`a(c**=d)`), 'a(c = power_(c, d))', true);
 assert(downLevel(`a(c.b.d**=d)`), 'a((_ = c.b, _.d = power_(_.d, d)))\r\nvar _', true);
 assert(downLevel(`a(c.b[a.b]**=d)`), 'a((_ = c.b, _[_0 = a.b] = power_(_[_0], d)))\r\nvar _, _0', true);
 assert(downLevel(`c.b[a.b]**=d`), '_ = c.b, _[_0 = a.b] = power_(_[_0], d)\r\nvar _, _0', true);
-// 声明及解构
+i++// 声明及解构
 assert(downLevel(`var [data, args, strs] = breakcode(data, occurs), strs = []`), 'var _ = breakcode(data, occurs), data = _[0], args = _[1], strs = _[2], strs = []\r\nvar _');
 assert(downLevel(`var [name, type, options] = piece, key, repeat;`), 'var name = piece[0], type = piece[1], options = piece[2], key, repeat;');
 assert(downLevel(`var [] = piece, key,[]= repeat;`), 'var key;');
@@ -80,6 +80,7 @@ assert(downLevel(`function (a=b,[c],d,e=f){}`), "function (a, arg1, d, e) { if (
 assert(downLevel(`function (arg1=b,[c],d,e=f){}`), "function (arg1, arg2, d, e) { if (arg1 === undefined) arg1 = b; var c = arg2[0]; if (e === undefined) e = f; }")
 i++// class降级
 assert(downLevel(`class a {}`), "function a() {}")
+var tmp = scanner2('export class a{a(){}}'); tmp.fix(); assert(downLevel.code(tmp).toString(), `exports.a = function (a) { a["prototype"].a = function () {}\r\nreturn a }(function a() {})`);
 assert(downLevel(`class a { static{ a.a=1}}`), "function a() {}; (function () { a.a = 1 }())")
 assert(downLevel(`if(a) a = 1; class a {}`), "if (a) a = 1; function a() {}")
 assert(downLevel(`async function(){if(a) a = 1; class a {}}`), `function () { return async_(
@@ -192,6 +193,8 @@ assert(downLevel(`=[a,b,...c,d,e,f]`), `var slice_ = Array["prototype"]["slice"]
 assert(downLevel(`=[a,b,...c,d,e,f,...g]`), `var slice_ = Array["prototype"]["slice"];\r\n= [a, b]["concat"](slice_["call"](c), [d, e, f], slice_["call"](g))`)
 assert(downLevel(`=[a,b,...c,d,...e]`), `var slice_ = Array["prototype"]["slice"];\r\n= [a, b]["concat"](slice_["call"](c), [d], slice_["call"](e))`)
 assert(downLevel(`a(...b)`), `a["apply"](null, b)`)
+assert(downLevel(`a(..."b,c".split(","))`), `a["apply"](null, "b,c".split(","))`)
+assert(downLevel(`new a(...args)`), `var slice_ = Array["prototype"]["slice"];\r\nnew (a['bind']['apply'](a, [null]["concat"](slice_["call"](args))))`)
 assert(downLevel(`a(c,d,e,...b(...c))`), `var slice_ = Array["prototype"]["slice"];\r\na["apply"](null, [c, d, e]["concat"](slice_["call"](b["apply"](null, c))))`)
 assert(downLevel(`a(c,d,e,...b.a(...c))`), `var slice_ = Array["prototype"]["slice"];\r\na["apply"](null, [c, d, e]["concat"](slice_["call"](b.a["apply"](b, c))))`)
 assert(downLevel(`a(c,d,e,...b.a.c(...c))`), `var slice_ = Array["prototype"]["slice"];\r\na["apply"](null, [c, d, e]["concat"](slice_["call"]((_ = b.a).c["apply"](_, c))))\r\nvar _`)
@@ -226,7 +229,7 @@ function () {
 return [8, 8]
 },
 function () {
-_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]
+_2 = Symbol["asyncIterator"]; _2 = os[_2]; if (_2) return [1, 0]; _2 = Symbol["iterator"]; _2 = os[_2]; if (_2) return [1, 0]; _2 = Array["prototype"]; _3 = Symbol["iterator"]; _2 = _2[_3]
 },
 function () {
 _0 = _2; _0 = _0["call"](os); _2 = _0["next"](); return [_2, 1]
@@ -258,13 +261,13 @@ if (!_2) return [1, 0]; _2 = _0["return"](); return [1, 0]
 function () {
 return [1, 9]
 })
-var _, _0, _2`)
+var _, _0, _2, _3`)
 assert(downLevel(`for await(var [o,s] of os) noSymbol`), `return async_(
 function () {
 return [11, 8]
 },
 function () {
-o; s; _5 = Symbol["asyncIterator"]; _5 = os[_5]; if (_5) return [1, 0]; _5 = Symbol["iterator"]; _5 = os[_5]; if (_5) return [1, 0]; _5 = Symbol["iterator"]; _5 = Array["prototype"][_5]
+o; s; _5 = Symbol["asyncIterator"]; _5 = os[_5]; if (_5) return [1, 0]; _5 = Symbol["iterator"]; _5 = os[_5]; if (_5) return [1, 0]; _5 = Array["prototype"]; _6 = Symbol["iterator"]; _5 = _5[_6]
 },
 function () {
 _0 = _5; _0 = _0["call"](os); _5 = _0["next"](); return [_5, 1]
@@ -276,16 +279,16 @@ function () {
 _5 = !_["done"]; if (!_5) return [5, 0]; _5 = _["value"]; return [_5, 1]
 },
 function (_4) {
-_5 = _4; _1 = _5; _6 = Symbol["iterator"]; _6 = _1[_6]; if (_6) return [1, 0]; _6 = Symbol["iterator"]; _6 = Array["prototype"][_6]
+_5 = _4; _1 = _5; _6 = Symbol["iterator"]; _6 = _1[_6]; if (_6) return [1, 0]; _6 = Array["prototype"]; _7 = Symbol["iterator"]; _6 = _6[_7]
 },
 function () {
-_6 = (_6); _2 = _6["call"](_1); _3 = undefined; _3 = _2["next"](); o = _3["value"]; _3 = _2["next"](); s = _3["value"]; _9 = !_3; if (_9) return [1, 0]; _9 = !_3["done"]
+_6 = (_6); _2 = _6["call"](_1); _3 = undefined; _3 = _2["next"](); o = _3["value"]; _3 = _2["next"](); s = _3["value"]; _10 = !_3; if (_10) return [1, 0]; _10 = !_3["done"]
 },
 function () {
-_9 = (_9); if (!_9) return [1, 0]; _9 = _2["return"]; _9 = isFunction(_9); if (!_9) return [1, 0]; _9 = _2["return"]()
+_10 = (_10); if (!_10) return [1, 0]; _10 = _2["return"]; _10 = isFunction(_10); if (!_10) return [1, 0]; _10 = _2["return"]()
 },
 function () {
-_3 = _9; _5 = (true)
+_3 = _10; _5 = (true)
 },
 function () {
 if (!_5) return [2, 0]; noSymbol; _5 = _0["next"](); return [_5, 1]
@@ -305,7 +308,7 @@ if (!_5) return [1, 0]; _5 = _0["return"](); return [1, 0]
 function () {
 return [1, 9]
 })
-var o, s, _, _0, _1, _2, _3, _5, _6, _7, _8, _9`);
+var o, s, _, _0, _1, _2, _3, _5, _6, _7, _8, _9, _10`);
 assert(downLevel(`for(o of os) noSymbol`), `for (_ = 0; _ < os["length"] && (o = os[_], true); _++) noSymbol\r\nvar _, _0`)
 assert(downLevel(`for(var o of os) Symbol`), `try { for (var o, _0 = os[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (o = _["value"], true); _ = _0["next"]()) Symbol } finally { if (_ && !_["done"] && isFunction(_0["return"])) _0["return"]() }\r\nvar _, _0`)
 assert(downLevel(`for(var o of os) Symbol`), `try { for (var o, _0 = os[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (o = _["value"], true); _ = _0["next"]()) Symbol } finally { if (_ && !_["done"] && isFunction(_0["return"])) _0["return"]() }\r\nvar _, _0`)
@@ -324,9 +327,9 @@ assert(downLevel("if(a){}[r, g, b] = rgb4s(r, g, b, s)"), "if (a) {} _ = rgb4s(r
 assert(downLevel(`{c,[c]:b,...a}=a`), `c = a.c, b = a[c], a = rest_(a, ["c", c])`)
 assert(downLevel(`async()=>name = require("./$split")(name)["join"]("/");`), `function () { return async_(
 function () {
-_0 = require("./$split"); _1 = _0(name); name = _1["join"]("/"); return [name, 2]
+_0 = require("./$split"); _0 = _0(name); name = _0["join"]("/"); return [name, 2]
 })
-var _0, _1 };`);
+var _0 };`);
 i++//异步或步进函数
 assert(downLevel(`function *(){yield *a}`), `function () { return aster_(
 function () {
@@ -348,7 +351,7 @@ function () {
 return [5, 8]
 },
 function () {
-a; _2 = Symbol["iterator"]; _2 = b[_2]; if (_2) return [1, 0]; _2 = Symbol["iterator"]; _2 = Array["prototype"][_2]
+a; _2 = Symbol["iterator"]; _2 = b[_2]; if (_2) return [1, 0]; _2 = Array["prototype"]; _3 = Symbol["iterator"]; _2 = _2[_3]
 },
 function () {
 _0 = _2; _0 = _0["call"](b); _ = _0["next"](); return [1, 0]
@@ -371,7 +374,7 @@ if (!_2) return [1, 0]; _2 = _0["return"](); return [1, 0]
 function () {
 return [1, 9]
 })
-var a, _, _0, _2 }`)
+var a, _, _0, _2, _3 }`)
 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/formatcode.js

@@ -14,7 +14,7 @@ function format(code, step) {
         var lowspace = rest.pop();
         var cp = code.prev;
         var cpp = cp && cp.prev;
-        if(cpp && cpp.type === STRAP && cpp.text==="switch"){
+        if (cpp && cpp.type === STRAP && cpp.text === "switch") {
             lowspace += step;
         }
         var space = lowspace + step;
@@ -37,10 +37,15 @@ function format(code, step) {
                         code.push({ type: SPACE, text: lowspace });
                     }
                 }
+                if (breakline && e.type === STAMP) {
+                    if (e.text === ':' && !e.inExpress) {
+                        if (code[code.length - 1].type === SPACE) code.pop();
+                    }
+                }
                 code.push(e);
                 if (e.type === SCOPED) rest.push(space, e);
             }
-            if (breakline && (e.type === STAMP && /^[,;]$/.test(e.text) || !code.isClass && !code.isObject)) hasCommaBefore = !code.isObject && e.text === ',', code.push({ type: SPACE, text: hasCommaBefore ? deepspace: space });
+            if (breakline && (e.type === STAMP && /^[,;]$/.test(e.text) || !code.isClass && !code.isObject)) hasCommaBefore = !code.isObject && e.text === ',', code.push({ type: SPACE, text: hasCommaBefore ? deepspace : space });
         }
         if (breakline) {
             var hasspaceend = code[code.length - 1].type === SPACE;

package/coms/compile/scanner2.js

@@ -154,13 +154,15 @@ class Code extends Array {
     // 提前处理属性
     break() {
         this.program.avoidMap = avoidMap;
-        this.program.detour(this.first);
+        var envs = this.program.detour(this.first);
+        if (this._scoped) extend(this.envs, envs);
         return this;
     }
     // 绕开低版本ie的异常属性
     detour(ie) {
         this.program.avoidMap = avoidMap;
-        this.program.detour(this.first, ie !== false);
+        var envs = this.program.detour(this.first, ie !== false);
+        if (this._scoped) extend(this.envs, envs);
         return this;
     }
     // 压缩

package/coms/compile/scanner2_test.js

@@ -111,6 +111,16 @@ function testUnicode() {
     var m = scanner(`\\u{0042}\\u0042=1`);
     console.log(m.toString())
 }
+function testComment() {
+    var m = scanner(`SDL_MAX_SINT8   ((Sint8)0x7F)           /* 127 */`);
+    console.log(m[m.length - 1].type === common.COMMENT);
+    m.comment = false;
+    console.log(common.createString(m));
+}
+function testQuote() {
+    var m = scanner(`(sizeof(("table")) / sizeof(("table")[0]))`);
+    console.log(m.toString());
+}
 Program.debug = true;
 // testSpeed();
 // testVariables();
@@ -124,6 +134,8 @@ Program.debug = true;
 // testJsxOnlyHtml();
 // testSpaceLess();
 // testArrow();
-testUnicode();
+// testUnicode();
+// testComment();
+testQuote();
 // var typescript = require("../typescript/index");
 // typescript.transpile(data.toString(), { noEmitHelpers: true });