efront 4.34.1 → 4.35.1

package/coms/compile/autoeval_test.js

@@ -9,8 +9,33 @@ var t = function (str, want) {
     var result = createString(code);
     assert(result, want);
 };
+
+var tc = function (str, want) {
+    var parseColor = color.parse4;
+    var toRGBA = color.stringify;
+    var macros = Object.create(null);
+    var color4 = function (name, a) {
+        if (a.length === 1) a = a[0].split(/[\s\,]+/);
+        var c = parseColor(name, ...a);
+        if (!c) return a;
+        return toRGBA(c);
+    };
+    macros.calc = a => a;
+    ["oklch", 'oklab', 'lch', 'lab', 'hwb', 'hsl', 'rgb'].forEach(n => {
+        macros[n] = function (from) {
+            console.log(n, arguments)
+            return color4(n, arguments);
+        }
+    });
+    var css = new Javascript;
+    css.number_reg = 素馨.number_reg;
+    var code = scanner2(str, css);
+    code = autoeval(code, macros);
+    var result = createString(code);
+    assert(result, want);
+}
 var tf = function (fullpath) {
-    var data = fs.readFileSync(fullpath).toString()
+    var data = require("fs").readFileSync(fullpath).toString()
     t(data, data);
 }
 t("1+1", "2");
@@ -26,7 +51,35 @@ t("(1+3,5,3+4)", "(4, 5, 7)");
 t("(1>>3,5,3+4)", "(0, 5, 7)");
 t("a=1,b=2;(a|b)&c", "a = 1, b = 2; 3 & c");
 t("(1+2).toString()", "3 .toString()");
-t("(1n+2n).toString()", "3n .toString()");
+t("(1n+2n).toString()", "3n.toString()");
+t("Math.log2(2)", "1");
+t("Math.log2(4)>Math.E", "false");
+t("[1,2,3,4][2]", "3");
+t("var log2=Math.log2;console.log(log2(4))", "var log2 = Math.log2; console.log(2)");
+t("var {log2}=Math; console.log(log2(4))", "var { log2 } = Math; console.log(2)");
 t("(-1).toString()", "(-1).toString()");
 t("(-(2n*324n)).toString()", "(-648n).toString()");
+t("a+ 2*3", "a + 6");
+t("a+ 2*3**2", "a + 18");
+t("a+ b*3**2", "a + b * 9");
+t("a+ 2*3**b", "a + 2 * 3 ** b");
+t("a+ 2*3 +c", "a + 6 + c");
+t("a+ 2*3 +4+c", "a + 10 + c");
+autoeval.debug = true;
+t("a- 2*3 +4+c", "a - 2 + c");
+t("a- 1 +4", "a + 3");
+t("a / 6 * 3", "a * 0.5");
+t("a * 6 / 3", "a * 2");
+t("a >>> 1 << 1", "a >>> 1 << 1");
+t("a >> 1 << 1", "a >> 1 << 1");
+t("a << 1 >>> 1", "a << 1 >>> 1");
+t("a = 1 >>> 1", "a = 0");
+t("a+ b*Math.sqrt(3**2)", "a + b * 3");
+t("Math.sqrt", "Math.sqrt");
+t("rgb(0xff 0xff 0xff)", "rgb(255 255 255)");
+tc("rgb(0xff 0xff 0xff)", "#fff");
+tc("hwb(120 0 0)", "#0f0");
+tc("hwb(120turn 0 0)", "#f00");
+tc("calc(10 / 20)", "0.5");
+tc("calc(10 / 20)", "0.5");
 // tf(path.join(__dirname, "../zimoli/spacechar_test.js"))

package/coms/compile/common.js

@@ -13,8 +13,8 @@ import {
     /*1024 */PROPERTY,
     /*2048 */ELEMENT,
 } from "./const.mjs";
-// --------------//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[01]+|0o?[0-7]+)(?:_[0-9a-f]+)*|(?:(?:(?:\d+_)*\d+|\d*)\.\d+(?:_\d+)*|(?:\d+_)*\d+\.?))(?:e[\+\-]?\d+(?:_\d+)*|[hijklmnu]+)?/i;
+// --------------//1//2//////////////////////////////////////////////////22////////////2//2//3//4//////4////////3/////3//////3//3//////3///////211/////////////2//////2/////////////1//
+var number_reg = /^(?:(?:0x[0-9a-f]+|\d[0-9a-f]*h|0b[01]+|0o[0-7]+)(?:_[0-9a-f]+)*|(?:(?:(?:\d+_)*\d+|\d*)\.\d+(?:_\d+)*|(?:\d+_)*\d+\.?))(?:e[\+\-]?\d+(?:_\d+)*)?(?:[ijklmnufl]+)?/i;
 var equal_reg = /^(?:[\+\-\*\/~\^&\|%]|\*\*|>>>?|<<)?\=$|^(?:\+\+|\-\-)$/;
 var needhead_reg = /^\?|^\.(?:[^\.]|$)|^\[/;
 var needfoot_reg = /(\:\:|\.)$/;
@@ -173,16 +173,17 @@ var skipAssignment = function (o, cx) {
                 else condition = true;
             }
             else if (o.text === 'do') {
-                skipLabel();
-                next();
-                next();
                 next();
+                skipLabel();
+                next();// {}
+                next();// while
+                next();// ()
             }
             else if (o.text === 'for') {
                 next();
                 if (o.type === STRAP && o.text === 'await') next();
+                next();// ()
                 skipLabel();
-                next();
             }
             else if (o.text === "class") {
                 next();
@@ -239,9 +240,15 @@ function skipFunction(o) {
     }
     return o;
 }
+var snapLabel = function (o) {
+    var p = getprev(o);
+    while (p && p.type === LABEL) o = p, p = getprev(o);
+    return o;
+}
 var getDoBeforeWhile = function (while_) {
     var p = getprev(while_);
     if (!p || p.type !== SCOPED || p.entry !== '{') return;
+    p = snapLabel(p);
     p = getprev(p);
     if (p.type === STRAP && p.text === "do") return p;
 };
@@ -251,7 +258,7 @@ var getIfElseHead = function (if_) {
         if_ = p;
         p = getprev(if_);
         if (!p || p.type !== STRAP || p.text !== 'else') {
-            return if_;
+            return snapLabel(if_);
         }
         while (p && (p.type !== STRAP || p.text !== 'if')) p = getprev(p);
     } while (p);
@@ -262,20 +269,20 @@ var getContitionHeadBeforeScoped = function (p, nodo) {
     if (pp.text === 'await') {
         pp = getprev(pp);
         if (pp?.type === STRAP && pp.text === "for") {
-            return pp;
+            return snapLabel(pp);
         };
     }
     else switch (pp.text) {
         case "with":
         case "for":
-            return pp;
+            return snapLabel(pp);
         case "while":
             p = getDoBeforeWhile(pp);
             if (p) {
                 if (nodo) return;
-                return p;
+                return snapLabel(p);
             }
-            return pp;
+            return snapLabel(pp);
         case "if":
             return getIfElseHead(pp);
     }
@@ -303,6 +310,10 @@ function snapAssignmentHead(o) {
     // 只检查一级
     while (o && getprev(o)) {
         var p = getprev(o);
+        while (p.type === LABEL) {
+            p = getprev(p);
+            if (!p) return o;
+        }
         if (o.entry === '(') {
             if (p.type & ~(STAMP | STRAP)) {
                 o = p;
@@ -344,7 +355,7 @@ function snapAssignmentHead(o) {
                 o = p;
                 continue;
             }
-            if (p.entry === "(" && o.type === SCOPED) {
+            if (p.entry === "(" && o.type & (SCOPED | LABEL)) {
                 var pp = getContitionHeadBeforeScoped(p, true);
                 if (pp) { o = pp; break; }
                 var pp = getFunctionHeadBeforeScoped(p);
@@ -358,7 +369,7 @@ function snapAssignmentHead(o) {
             break;
         }
         if (p.type === STRAP) {
-            if (/^(?:new|void|typeof|delete|await|class|function|async)$/.test(p.text)) {
+            if (/^(?:new|void|do|typeof|delete|await|class|function|async)$/.test(p.text)) {
                 o = p;
                 continue;
             }
@@ -906,7 +917,7 @@ var createScoped = function (parsed, wash) {
                     }
                 }
                 var map = isFunction ? vars : lets;
-                var keepscope = !!scoped.body || !!scoped.head;
+                var keepscope = isFunction || !!scoped.body || !!scoped.head;
                 if (!keepscope) for (var k in map) {
                     keepscope = true;
                     break;
@@ -1524,7 +1535,7 @@ var createString = function (parsed) {
                                 ) result.push(";");
                             }
                         }
-
+                        else if (o.ion);
                         else if (!/^(\+\+|\-\-)$/.test(o.text) || p.type & (STAMP | STRAP)) {
                             if (patchspace && lasttype !== SPACE && !o.needle) result.push(" ");
                         }
@@ -1718,6 +1729,7 @@ var pickArgument = function (o) {
         p = t;
         t = getprev(t);
     }
+    res.reverse();
     while (o && (o.type !== STAMP || !/^[,;]$/.test(o.text))) {
         res.push(o);
         var n = o;

package/coms/compile/common_test.js

@@ -21,6 +21,12 @@ testPickSentence(`if(a)return a=yield 1`, 6, "return a = yield 1")
 testPickSentence(`if(a)return\r\na=yield 1`, 6, "a = yield 1")
 testPickSentence(`if(a)return\r\na=yield 1`, 3, "return\r\n")
 testPickSentence(`if(a)import(a)`, 3, "import(a)")
+testPickSentence(`for(;;) a:{import(a)}`, 2, "for (;;) a: { import(a) }")
+testPickSentence(`for(;;) a:{import(a)}`, 3, "for (;;) a: { import(a) }")
+testPickSentence(`while() a:{import(a)}`, 3, "while () a: { import(a) }")
+testPickSentence(`do a:{}while() a:{import(a)}`, 2, "do a: {} while ()")
+testPickSentence(`do a:{}while() a:{import(a)}`, 4, "do a: {} while ()")
+testPickSentence(`do a:{}while() a:{import(a)}`, 5, "a: { import(a) }")
 testPickSentence(`import(b)import(a)`, 3, "import(a)")
 testPickSentence(`1+import(a)`, 3, "1 + import(a)")
 testPickSentence(`1+await import(a)`, 3, "1 + await import(a)")
@@ -48,5 +54,9 @@ function testCreateScope(code) {
     code = scanner2(code);
     common.createScoped(code);
 }
-
-testCreateScope(`class a{ static barch = new arch('b')}`)
+testCreateScope(`class a{ static barch = new arch('b')}`)
+assert(common.number_reg.test("00080000h"), true)
+assert(common.number_reg.test("1.1920928955078125e-07F"), true)
+assert(new RegExp(common.number_reg.source.replace(/^\^|\$$/g, ''), 'ig').exec("00080000h"), ["00080000h"])
+assert(new RegExp(common.number_reg.source.replace(/^\^|\$$/g, ''), 'ig').exec("2A3h"), ["2A3h"])
+assert(new RegExp(common.number_reg.source.replace(/^\^|\$$/g, ''), 'ig').exec("1.1920928955078125e-07F"), ["1.1920928955078125e-07F"])

package/coms/compile/downLevel.js

@@ -1,7 +1,11 @@
 var scanner2 = require("./scanner2");
 var strings = require("../basic/strings");
 var Program = scanner2.Program;
-var { STAMP, SCOPED, STRAP, EXPRESS, mergeTo, pickAssignment, COMMENT, SPACE, PROPERTY, VALUE, LABEL, QUOTED, snapExpressFoot, isEval, canbeTemp, rename, isHalfSentence, skipFunction, getDeclared, skipAssignment, skipSentenceQueue, createScoped, createString, splice, relink, rolink, pickSentence, snapExpressHead, needBreakBetween } = require("./common");
+var {
+    STAMP, SCOPED, STRAP, EXPRESS,
+    mergeTo, pickAssignment,
+    COMMENT, SPACE, PROPERTY, VALUE, LABEL, QUOTED,
+    snapExpressFoot, isEval, canbeTemp, rename, isHalfSentence, skipFunction, getDeclared, skipAssignment, skipSentenceQueue, createScoped, createString, splice, relink, rolink, pickSentence, snapExpressHead, needBreakBetween } = require("./common");
 var splice2 = function (q, from, to, ...a) {
     var cx = q.indexOf(from);
     if (cx < 0) throw console.log(splice2.caller, console.format(`\r\n<red2>${i18n`自`}</red2>`), from && createString([from]), console.format(`\r\n<yellow>${i18n`至`}</yellow>`), to && createString([to]), console.format(`\r\n<cyan>${i18n`码列`}</cyan>`), createString(pickSentence(from))), i18n`结构异常`;
@@ -538,6 +542,7 @@ var getprop = function (o, m) {
             prop.value = scanner2(prop.name);
             if (m.next) insert1(prop.value, null, { type: STAMP, text: ',' });
         }
+        if (m.hidden) prop.hidden = true;
         if (prop.get || prop.set) {
             if (!/^[\d\.'"\[]/.test(prop.name)) prop.name = strings.encode(prop.name);
         }
@@ -604,7 +609,6 @@ var killcls = function (body, i, letname_, getname_, killobj) {
     var o = body[i];
     var ishalf = isHalfSentence(body, i - 1);
     var hasnew = o.prev && o.prev.type === STRAP && o.prev.text === 'new';
-    var start = o;
     var decName = !o.isExpress && o.next.type === EXPRESS && o.next.text;
     var isExpress = o.isExpress;
     while (o) {
@@ -628,6 +632,7 @@ var killcls = function (body, i, letname_, getname_, killobj) {
     var func = scanner2("(function(){}())")[0];
     var [, head, defines, invokes] = func;
     var foot = [];
+    var hiddens = null;
     var base = '';
     if (o) {
         var next = o;
@@ -648,15 +653,50 @@ var killcls = function (body, i, letname_, getname_, killobj) {
         var clz = { name };
         if (!clz.name) clz.name = letname_("cls" + index);
         var tempname = null;
+        var hiddens = null;
+        var staticHidden = null;
         while (m) {
             var [prop, m] = getprop(o, m);
-            if (!prop.value.length) prop.value = scanner2('undefined;');
+            var pvalue = prop.value;
+            if (!pvalue.length || pvalue.length === 1 && pvalue[0].text === ';') prop.value = scanner2('undefined;');
             else if (!prop.sfunc) killobj(prop.value);
+            if (!tempname && (prop.get || prop.set)) tempname = getname_("tmp");
+            if (prop.hidden) {
+                if (!rootenvs["#"]) {
+                    rootenvs["#"] = true;
+                }
+                if (prop.static) {
+                    if (!staticHidden) {
+                        clz.hidden = letname_('hiden' + index);
+                        staticHidden = [];
+                        insert1(foot, null, ...scanner2(`#["set"](${clz.name},{});`));
+                    }
+                    setprop(prop, `#["get"](${clz.name})`, static_, foot, tempname);
+                }
+                else {
+                    if (!hiddens) {
+                        hiddens = [];
+                        insert1(assign, null, ...scanner2(`#["set"](this,{});`));
+                    }
+                    if (!hiddens[prop.name]) {
+                        hiddens[prop.name] = prop.name;
+                    }
+                    if (prop.get || prop.set) {
+                        setprop(prop, `#["get"](this)`, define_, assign, tempname);
+                    }
+                    else if (prop.sfunc !== false) {
+                        setprop(prop, `#["get"](this)`, define_, assign);
+                    }
+                    else {
+                        insert1(assign, null, ...scanner2(`#["get"](this)${prop.name}=`), ...prop.value);
+                    }
+                }
+                continue;
+            }
             var k = prop.static ? clz.name : `${clz.name}["prototype"]`;
             var d = prop.static ? static_ : define_;
             if (prop.get || prop.set || prop.static) {
                 if (prop.name) {
-                    if ((prop.get || prop.set) && !tempname) tempname = getname_("tmp");
                     setprop(prop, k, d, defines, tempname);
                 }
                 else if (prop.static) {
@@ -732,11 +772,11 @@ var killcls = function (body, i, letname_, getname_, killobj) {
         if (clz.name) insert1(head, null, ...scanner2(`${head.length ? ',' : ''}${clz.name}`));
         index++;
     }
-    insert1(defines, null, ...foot);
+    if (foot.length) insert1(defines, null, ...foot);
     var s = i;
     i = body.indexOf(o, i);
     if (i < 0) i = body.length;
-    if (head.length > 1 || start.isExpress && (defines.length) || ishalf && defines.length) {
+    if ((ishalf || head.length > 1 || decName !== clz.name) && defines.length) {
         splice(defines, defines.length, 0, ...scanner2(`\r\nreturn ${clz.name}`))
         if (decName) splice(func, 0, 0, ...scanner2(`var ${decName}=`));
         if (hasnew) splice(body, s, i - s, func);
@@ -1080,7 +1120,15 @@ var killobj = function (body, getobjname, getletname, getname_, letname_, deep =
             }
         }
         else if (o.type === EXPRESS) {
-            if (o.text === 'new.target') o.text = 'undefined';
+            if (o.hidden) {
+                if (!rootenvs["#"]) {
+                    rootenvs["#"] = true;
+                }
+                var varname = o.hidden;
+                o.text = o.text.slice(varname.length);
+                insert1(body, o, ...scanner2(`#["get"](${varname})`));
+                i = body.indexOf(o, i);
+            }
         }
         i++;
     }
@@ -1923,6 +1971,11 @@ var downcode = downLevel.code = function (code) {
         if (!code.vars[slice_]) splice(code, 0, 0, ...scanner2(`var ${slice_} = Array["prototype"]["slice"];\r\n`));
         code.vars[slice_] = true;
     }
+    if (rootenvs["#"]) {
+        delete rootenvs["#"];
+        if (!code.vars["#"]) splice(code, 0, 0, ...scanner2(`var # = new WeakMap`));
+        if (!rootenvs.WeakMap) rootenvs.WeakMap = true;
+    }
     rootenvs = null;
     patchMark = patchMark_;
     return code;

package/coms/compile/downLevel_test.js

@@ -27,7 +27,8 @@ assert(downLevel(`var [] = piece, key,[]`), 'var key');
 assert(downLevel(`const`), 'const');
 assert(downLevel(`let`), 'let');
 assert(downLevel(`var`), '');
-assert(downLevel(`new.target`), 'undefined');
+assert(downLevel(`new.target`), 'new.target');
+assert((tmp = scanner2(`new.target`), tmp.detour(), downLevel.code(tmp).toString()), 'undefined');
 assert(downLevel(`{let a; function b(){a};return;}`), `if (tmp = 0, tmp0 =function (a) { a; function b() { a }; return tmp = 1, void 0; }(a)) { if (tmp === 1) return tmp0; }
 var tmp, a, tmp0`);
 assert(downLevel(`const a,b,c`), 'var a, b, c');
@@ -90,6 +91,7 @@ a = function () {}; if (!a) return [1, 0]; a = 1; return [1, 0]
 var a, _0 }`)
 assert(downLevel(`if(a) class b{ c(){}};`), `if (a) var b = function (b) { b["prototype"].c = function () {}\r\nreturn b }(function b() {});`)
 assert(downLevel(`class a {a=1}`), "function a() { this.a = 1 }")
+assert(downLevel(`class a {#a=1}`), "function a() { this.#a = 1 }")
 assert(downLevel(`class a {a=1; b(){}}`), `function a() { this.a = 1; }; a["prototype"].b = function () {}`)
 assert(downLevel(`=class a {a=1; b(){}}`), `= function (a) { a["prototype"].b = function () {}\r\nreturn a }(function a() { this.a = 1; })`)
 assert(downLevel(`var a=class {a=1; static b=2 b(){}};`), `var a = function (cls0) { cls0.b = 2\r\ncls0["prototype"].b = function () {}\r\nreturn cls0 }(function () { this.a = 1; });`)
@@ -98,7 +100,8 @@ assert(downLevel(`class a {static b(){}}`), "function a() {}; a.b = function ()
 assert(downLevel(`class a extends b{}`), `function a() {
 var this_ = b["apply"](this, arguments) || this;
 return this_ }; &extends(a, b)`);
-assert(downLevel(`class a extends class b{}{}`), `var a = function (b, a) { &extends(a, b)\r\nreturn a }(function b() {}, function a() {
+assert(downLevel(`class a extends class b{}{}`), `var a = function (b, a) { &extends(a, b)
+return a }(function b() {}, function a() {
 var this_ = b["apply"](this, arguments) || this;
 return this_ })`);
 assert(downLevel(`class a {get a(){}}`), `function a() {};
@@ -430,7 +433,7 @@ function (_) {
 _0 = _; return [1, 0]
 })
 var _0 }`)
-assert(downLevel(`async function(a){ for(var i=1;i<2;i++) await 1 }`), `function (a) { return &async(\r\nfunction () {\r\ni = 1; return [1, 0]\r\n},\r\nfunction () {\r\n_0 = i < 2; if (!_0) return [2, 0]; _0 = 1; return [_0, 1]\r\n},\r\nfunction (_) {\r\n_0 = _; _0 = i++; return [-1, 0]\r\n})\r\nvar i, _0 }`)
+assert(downLevel(`async function(a){ for(var i=1;i<2;i++) await 1 }`), `function (a) { return &async(\r\nfunction () {\r\ni = 1; return [1, 0]\r\n},\r\nfunction () {\r\n_0 = i < 2; if (!_0) return [2, 0]; _0 = 1; return [_0, 1]\r\n},\r\nfunction (_) {\r\n_0 = _; i++; return [-1, 0]\r\n})\r\nvar i, _0 }`)
 assert(downLevel('async function(){ if(b); else {if (a){}else{location = getRequestProtocol(url) + "//" + location;}}}'), `function () { return &async(
 function () {
 if (!b) return [1, 0]; return [3, 0]
@@ -470,7 +473,6 @@ c.fix(); i++
 c.break(); i++
 assert(c.toString(), `\r\n    if (search["length"]) return null;\r\n    return path["join"](...pathlist);\r\n`);
 assert(downLevel.code(c).toString(), `\r\n    if (search["length"]) return null;\r\n    return path["join"]["apply"](path, pathlist);\r\n`);
-downLevel.debug = true; i++;
 assert(downLevel(`Symbol;var c = (a.data || (a.data = {})).transition = no(this);`), 'Symbol; var c = (a.data || (a.data = {})).transition = no(this);', true);
 assert(downLevel(`[a.b]=[1]`), 'a.b = [1][0]')
 assert(downLevel(`[a[b]]=[1]`), 'a[b] = [1][0]')
@@ -516,15 +518,27 @@ assert(downLevel(`a(a,)`), `a(a)`);
 assert(downLevel(`class{a=[...presets.source]}`), `var &slice = Array["prototype"]["slice"];
 function () { this.a = &slice["call"](presets.source) }`);
 assert(downLevel(`class{a=a=>a}`), `function () { this.a = function (a) { return a } }`);
+downLevel.debug = true; i++;
+assert(downLevel(`class{a}`), "function () { this.a = undefined; }");
+assert(downLevel(`class{a;}`), "function () { this.a = undefined; }");
+assert(downLevel(`class{#a;a(){a=this.#a}}`), `function (cls0) { cls0["prototype"].a = function () { a = this.#a }
+return cls0 }(function () { this.#a = undefined; })`);
+tmp = scanner2(`class{#a;a(){a=this.#a}}`), tmp.detour(), i++;
+assert(downLevel.code(tmp).toString(), `var # = new WeakMap function (cls0) { cls0["prototype"]["a"] = function () { a = #["get"](this)["#a"] }
+return cls0 }(function () { #["set"](this, {}); #["get"](this)["#a"] = undefined; })`);
+downLevel.debug = false; i++;
 assert(downLevel(`class{ get a(){[...a]}}`), `var &slice = Array["prototype"]["slice"];
-function () {};
+function (cls0) {
 Object["defineProperty"](cls0["prototype"], "a", (tmp = {}, tmp["get"] = function () { &slice["call"](a) }, tmp))
+return cls0 }(function () {})
 var tmp`);
 assert(downLevel(`class{ get (){[...a]}}`), `var &slice = Array["prototype"]["slice"];
-function () {}; cls0["prototype"].get = function () { &slice["call"](a) }`);
-assert(downLevel(`class{ async get  a(){[...a]}}`), `var &slice = Array["prototype"]["slice"];
-function () {};
+function (cls0) { cls0["prototype"].get = function () { &slice["call"](a) }
+return cls0 }(function () {})`);
+assert(downLevel(`class{ async get a(){[...a]}}`), `var &slice = Array["prototype"]["slice"];
+function (cls0) {
 Object["defineProperty"](cls0["prototype"], "a", (tmp = {}, tmp["get"] = function () { &slice["call"](a) }, tmp))
+return cls0 }(function () {})
 var tmp`);
 assert(downLevel(`a=class{ static a(){[...a]}}`), `var &slice = Array["prototype"]["slice"];
 a = function (cls0) { cls0.a = function () { &slice["call"](a) }

package/coms/compile/powermap.js

@@ -10,10 +10,10 @@ var powermap = {
     '=,+=,-=,*=,/=,%=,|=,&=,^=,||=,&&=,??=,<<=,>>=,>>>=,**=,~=,:=,?,:,=>'/* 1 */,
     '&&,||,^^,??'/* 3 */, '|,^'/* 4 */, '&'/*5*/,
     'instanceof,in,==,>=,<=,>,<,!=,!==,===,!in,!instanceof'/* 6 */,
-    '>>,>>>,<<'/* 7 */, '+,-'/* 8 */, '*,/,%'/* 9 */, '**'/* 10 */,
+    '>>,>>>,<<'/* 7 */, '+,-'/* 8 */, '*,/,%,\\'/* 9 */, '**'/* 10 */,
     '++,--'/* 11 */,
     "typeof,await,yield,delete,void,..."/*12*/,
-    '!,~,#,new'/* 13 */,
+    "',!,~,#,new"/* 13 */,
     "::,?.,->,."/*14*/,
 ].forEach((pp, i) => {
     pp.split(",").forEach(p => {

package/coms/compile/rescan.js

@@ -11,7 +11,7 @@ var patchObject = function (code, objs) {
                 continue;
             }
             if (c.type === EXPRESS) {
-                if (m = /^&(\d+)$/.exec(c.text)) {
+                if (m = /^\\(\d+)$/.exec(c.text)) {
                     var o = cloneNode(objs[+m[1]], keep);
                     if (o instanceof Array) replace(c, ...o);
                     else replace(c, o);
@@ -25,7 +25,7 @@ function rescan(strs, ...args) {
     var i = 0;
     for (var s of strs) {
         if (s) dist.push(s, ' ');
-        dist.push('&' + i++, " ");
+        dist.push('\\' + i++, " ");
     }
     dist.pop();
     if (i > args.length) dist.pop();

package/coms/compile/scanner2.js

@@ -197,13 +197,37 @@ class Code extends Array {
         compress(this.scoped);
         return this;
     }
+    getNodeAt(row, col) {
+        return getNodeAt(this, row, col);
+    }
     relink(list = this) {
         relink(list);
         setqueue(list);
         return list;
     }
 }
-
+function getNodeAt(code, row, col) {
+    for (var cx = 0, dx = code.length; cx < dx;) {
+        var ci = cx + dx >>> 1;
+        var o = code[ci];
+        var r = o.row;
+        if (r < row || r === row && o.col < col) cx = ci + 1;
+        else dx = ci;
+    }
+    if (cx > 0) cx--;
+    dx = code.length;
+    while (cx < dx) {
+        var o = code[cx];
+        if (o.row === row && o.col === col) return o;
+        var n = code[++cx];
+        if (n?.row === row) {
+            if (n.col === col) return n;
+            if (n.col < col) continue;
+        }
+        if (o.length) return getNodeAt(o, row, col);
+        return o;
+    }
+}
 var avoidMap = null;
 var typeMap = Object.create(null);
 function scan(text) {

package/coms/compile/translate.js

@@ -17,6 +17,7 @@ var patchTranslate = function (c, raw) {
             var text = raw ? c.text.slice(1, c.text.length - 1) : strings.decode(c.text).replace(/\r\n|\r|\n/g, '\r\n');
             c.translate = text;
         }
+        else c.translate = '';
     }
 
 }
@@ -46,7 +47,7 @@ function getAllText(code, dest = []) {
     return dest;
 }
 
-var [手动, 字段名] = Array(2).fill(0).map((_, i) => i + 1);
+var [手动, 字段名, 公式] = Array(3).fill(0).map((_, i) => i + 1);
 function getI18nPrefixedText(code, dist = []) {
     var { used, envs } = code;
     var get = function (arr, f, t) {
@@ -54,7 +55,7 @@ function getI18nPrefixedText(code, dist = []) {
             if (!n || n.type !== QUOTED || n.length && n.entry !== '`') continue;
             var c = n;
             c.transtype = t;
-            patchTranslate(c, t === 字段名);
+            patchTranslate(c, t >= 字段名);
             f(c);
         }
     };
@@ -72,6 +73,10 @@ function getI18nPrefixedText(code, dist = []) {
         c.warn = false;
         dist.push(c);
     }, 字段名);
+    if (envs.math) get(used.math.filter(o => o.text === 'math').map(o => o.next), c => {
+        c.formula = 算式(c.translate);
+        dist.push(c);
+    }, 公式);
     return dist;
 }
 var ctn = function (tt, t) {
@@ -120,8 +125,8 @@ function translate([imap, supports], code) {
         return m;
     };
     var used = code.used;
-    for (var t of texts) {
-        if (t.transtype === 手动) {
+    for (var t of texts) switch (t.transtype) {
+        case 手动:
             var p = t.prev;
             if (p.type === SCOPED) {
                 p.prev.text = 'i18n.lang';
@@ -131,8 +136,8 @@ function translate([imap, supports], code) {
             var tt = t.translate;
             var tn = ctn(getm(tt, t.nodup), t);
             replace(t, ...tn);
-        }
-        else if (t.transtype === 字段名) {
+            break;
+        case 字段名:
             var i = t.queue.indexOf(t.prev);
             var e = t.queue.indexOf(t, i);
             if (t.warn === false) {
@@ -204,7 +209,13 @@ function translate([imap, supports], code) {
             relink(tn);
             Object.defineProperty(tn, 'queue', { value: t.queue });
             splice(t.queue, i, e + 1 - i, tn);
-        }
+            break;
+        case 公式:
+            var JJSON = require('../basic_/JSON');
+            var formula = t.formula.iscup ? t.formula.map(a => JJSON.toJS(a)).join(",") : JJSON.toJS(t.formula);
+            var node = scanner2(`(${formula})`)[0];
+            replace(t, node);
+            break;
     }
     if (used.refilm && !used.refilm.length) {
         delete code.envs.refilm;

package/coms/compile/unstruct.js

@@ -259,7 +259,7 @@ var _for = function (body, cx, unblock, result) {
     while (cy < o.length && o[cy] !== m) cy++;
     var block = getblock(o, cy);// init
     cy += block.length + 1;
-    unblock(block);
+    unblock(block, false);
     if (result.length) pushstep(result, stepReturn(1, 0));
     var block1 = getblock(o, cy);// condition
     cy += block1.length + 1;
@@ -280,7 +280,7 @@ var _for = function (body, cx, unblock, result) {
     var i = result.length;
     unblock(block_);
     if (label.continue) ifpatch(result), label.contat = result.length;
-    unblock(block2);
+    unblock(block2, false);
     var loopback = stepReturn(0, 0);
     var le = loopback[loopback.length - 1];
     pushstep(result, loopback);
@@ -783,6 +783,19 @@ var uncurve = function (c) {
     }
     return c;
 };
+var getChanged = function (bd) {
+    var changed = Object.create(null);
+    var rest = [bd];
+    while (rest.length) {
+        var o = rest.pop();
+        if (o.length) rest.push.apply(rest, o);
+        else if (o.type === EXPRESS) {
+            if (o.equal) changed[o.text] = true;
+        }
+    }
+    return changed;
+};
+
 var ternary = function (body, getname, ret) {
     var eqused = 0;
     var getnextname = function (i) {
@@ -867,6 +880,35 @@ var ternary = function (body, getname, ret) {
             explist = [r];
         }
         else {
+            if (equalsend > skip) {
+                var subs = [];
+                for (var cx = 0, dx = equals.length; cx < dx; cx++) {
+                    var h = equals[cx];
+                    if (h.type === EXPRESS) {
+                        var n = h.next;
+                        if (n?.type === SCOPED && n.entry === '[') {
+                            var f = n.first;
+                            if (f && f === n.last) {
+                                subs.push(n);
+                            }
+                        }
+                    }
+                }
+                if (subs.length) {
+                    var changed = getChanged(bd);
+                    for (var n of subs) {
+                        var f = n.first;
+                        if (f.type === EXPRESS && f.text in changed) {
+                            var name = getnextname(0);
+                            ++eqused;
+                            var o = n.first = n.last = { type: EXPRESS, text: name };
+                            o.queue = n;
+                            n.splice(0, n.length, o);
+                            exphead.push([{ type: EXPRESS, text: name }, { type: STAMP, text: "=" }, f, { type: STAMP, text: ';' }]);
+                        }
+                    }
+                }
+            }
             explist = _express(bd, getnextname, equalsend > skip || ret);
         }
     }