efront 4.0.48 → 4.0.51

package/coms/basic/Matrix.js

@@ -438,3 +438,4 @@ function olinde(v, vector) {
     }
     return v;
 }
+Matrix.norm = norm;

package/coms/basic/decodeUTF16.js

@@ -1,7 +1,14 @@
-function decodeUTF16(buff, be = true) {
+function decodeUTF16(buff, be) {
     var dist = [];
-    var dec = be ? (a, b) => a << 8 | b : (a, b) => b << 8 | a;
-    for (var cx = 0, dx = buff; cx < dx; cx += 2) {
+    var LE = (a, b) => b << 8 | a;
+    var BE = (a, b) => a << 8 | b;
+    if (buff[0] === 0xfe && buff[1] === 0xff) {
+        be = true;
+    }
+    else if (buff[0] === 0xff && buff[1] === 0xfe) be = true;
+    else if (isEmpty(be)) be = false;
+    var dec = be ? BE : LE;
+    for (var cx = 0, dx = buff.length; cx < dx; cx += 2) {
         var m = dec(buff[cx], buff[cx + 1]);
         var t;
         if (m > 0b1101111111111111 || m < 0b1101100000000000) {

package/coms/basic/encodeUTF16.js

@@ -25,7 +25,7 @@ function numberUTF16LE(t, dist = []) {
     return dist;
 
 }
-function encodeUTF16(strings, be = true) {
+function encodeUTF16(strings, be = false) {
     var dist = [];
     var utf16 = be ? numberUTF16 : numberUTF16LE;
     for (var cx = 0, dx = strings.length; cx < dx; cx++) {

package/coms/basic/encodeUTF8.js

@@ -1,6 +1,7 @@
 var d = 0b10000000, s = 0b00111111;
+var keep0 = true;
 function numberUTF8(t, dist = []) {
-    if (t < 128) {//0b0xxxxxxx - 0b10xxxxxx
+    if (t < 128 && (keep0 || t > 0)) {//0b0xxxxxxx - 0b10xxxxxx
         dist.push(0b00000000 | t)
     }
     else if (t < 2048) {// 0b110xxxxx 10xxxxxx
@@ -43,11 +44,11 @@ function numberUTF8(t, dist = []) {
     }
     return dist;
 }
-function encodeUTF8(string) {
+function encodeUTF8(string, encode0) {
+    keep0 = !encode0;
     var dist = [], t;
     for (var cx = 0, dx = string.length; cx < dx; cx++) {
-        t = string.codePointAt(cx);
-        if (t > 0xffff) cx++;
+        t = string.charCodeAt(cx);
         numberUTF8(t, dist);
     }
     return dist;

package/coms/basic/isEmpty.js

@@ -1,5 +1,5 @@
 function isEmpty(value) {
-    if (value === '' || value === null || value === undefined || typeof value === 'number' && !isFinite(value)) return true;
+    if (value === '' || value === null || value === undefined || Number.isNaN(value)) return true;
     if (value instanceof Array && value.length === 0 || value.constructor === Object || !value.constructor) {
         for (var k in value) return false;
         return true;

package/coms/compile/Javascript.js

@@ -507,7 +507,21 @@ function detour(o, ie) {
         if (o) o = o.next;
     }
 };
-
+var _splice_keepspace = function (a, i) {
+    var res = splice.apply(null, arguments);
+    if (res.length) {
+        var start = res[0].prev;
+        var end = res[res.length - 1].next;
+        if (!start) start = 0;
+        else start = start.row;
+        if (end) end = end.row;
+        var delta = end - start;
+        if (delta > 0) {
+            splice(a, i, 0, { type: SPACE, text: Array(delta + 1).join('\r\n') });
+        }
+    }
+    return res;
+}
 var removeImport = function (c, i, code) {
     var next = c.next;
     var { used, envs, vars } = code;
@@ -591,7 +605,7 @@ var removeImport = function (c, i, code) {
         });
     });
     var u = { type: EXPRESS, text: name };
-    code.splice(i + 1, oi - i - 1, u);
+    _splice_keepspace(code, i + 1, oi - i - 1, u);
     used[name].push(u);
     return u;
 };

package/coms/compile/autoenum.js

@@ -133,13 +133,17 @@ function enumref(scoped) {
             for (var rk in rs) {
                 var os = rs[rk];
                 if (os.wcount !== 1 || os.length < 2) continue;
-                var eq = null;
+                var eq = null, em = null;
                 loop: for (var o of os) {
                     if (o.equal) {
                         if (o.equal.text !== '=') break;
                         if (o.queue.kind) break;
                         if (o.queue !== scoped.body) break;
                         if (inCondition(o)) break;
+                        if (o.enumref) {
+                            em = o.enumref;
+                            continue;
+                        }
                         o = o.equal.next;
                         var n = skipAssignment(o);
                         var exps = [];
@@ -154,6 +158,10 @@ function enumref(scoped) {
                         }
                     }
                     else {
+                        if (em) {
+                            o.enumref = em;
+                            continue;
+                        }
                         if (!eq) break;
                         o.type = eq.type;
                         o.isdigit = true;
@@ -172,7 +180,7 @@ function atuoenum(scoped) {
     enumref(scoped);
 }
 var exports = module.exports = function main(code) {
-    atuoenum(code.scoped)
+    atuoenum(code.scoped);
     return code;
 }
 exports.createRefId = createRefId;

package/coms/compile/autoenum_test.js

@@ -11,7 +11,9 @@ t("var a=1;console.log(a)", "var a = 1; console.log(1)");
 t("a.b = 2;console.log(a.b)", "a.b = 2; console.log(2)");
 t("a/*a*/.b = 2;console.log(a.b)", "a/*a*/.b = 2; console.log(2)");
 t("a.b = 2;console.log(a/*aaaa*/.b)", "a.b = 2; console.log(2)");
-t("a.b = 2;console.log(/*bbbb*/a.b)", "a.b = 2; console.log(/*bbbb*/2)");
+t("a.b = 2;console.log(/*bbbb*/a.b)", "a.b = 2; console.log(/*bbbb*/ 2)");
 t("var {a=1};console.log(a)", "var { a = 1 }; console.log(a)");
 t("if(c) a=1;console.log(a)", "if (c) a = 1; console.log(a)");
+t("console.log(a);a=1;", "console.log(a); a = 1;");
+t("console.log(a);var a=1;", "console.log(a); var a = 1;");
 // t(fs.readFileSync(path.join(__dirname,"../zimoli/spacechar_test.js")).toString())

package/coms/compile/cloneNode.js

@@ -0,0 +1,23 @@
+var { VALUE, QUOTED, EXPRESS, STRAP, relink } = require("./common");
+var cloneNode = function (o) {
+    var c = o;
+    if (c instanceof Array && !c.text) {
+        c = c.map(cloneNode);
+        c.entry = o.entry;
+        c.leave = o.leave;
+        c.type = o.type;
+        c.isExpress = o.isExpress;
+        relink(c);
+    }
+    else if (typeof c === 'object' && c instanceof Object) {
+        c = Object.assign({}, c);
+    }
+    else switch (typeof c) {
+        case "number": case "bigint": c = { type: VALUE, isdigit: !Number.isNaN(c), text: String(c) }; break;
+        case "boolean": case "undefined": c = { type: VALUE, text: String(c) }; break;
+        case "regexp": c = { type: QUOTED, text: String(c) }; break;
+        case "string": c = scanner2(c); break;
+        default: if (c === null) c = { type: VALUE, text: String(c) };
+    }
+    return c;
+};

package/coms/compile/common.js

@@ -1099,7 +1099,7 @@ var createString = function (parsed) {
                 result.push(o.leave);
                 break;
             default:
-                if (o instanceof Object) {
+                if (o && typeof o === "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 | LABEL) & o.type) {
                         result.push(" ");
@@ -1229,6 +1229,11 @@ var splice = function (queue, index, size, ...args) {
     setqueue(args, queue);
     return res;
 };
+var remove = function (o) {
+    var q = o.queue;
+    var i = q.indexOf(o);
+    if (i >= 0) splice(q, i, 1);
+};
 var replace = function (o, ...args) {
     var queue = o.queue;
     var i = queue.indexOf(o);
@@ -1280,6 +1285,7 @@ module.exports = {
     equal_reg,
     skipAssignment,
     getDeclared,
+    remove,
     createString,
     createScoped,
     createExpressList,

package/coms/compile/rescan.js

@@ -0,0 +1,33 @@
+var { SCOPED, EXPRESS, replace } = require("./common");
+
+var patchObject = function (code, objs) {
+    var rest = [code];
+    var m = null;
+    while (rest.length) {
+        var code = rest.pop();
+        for (var c of code) {
+            if (c.type === SCOPED) {
+                rest.push(c);
+                continue;
+            }
+            if (c.type === EXPRESS) {
+                if (m = /^#\\(\d+)$/.exec(c.text)) {
+                    var o = cloneNode(objs[+m[1]]);
+                    if (o instanceof Array) replace(c, ...o);
+                    else replace(c, o);
+                }
+            }
+        }
+    }
+}
+function rescan(strs, ...args) {
+    var dist = [];
+    var i = 0;
+    for (var s of strs) {
+        dist.push(s, '#\\' + i++);
+    }
+    if (i > args.length) dist.pop();
+    dist = scanner2(dist.join(' '));
+    patchObject(dist, args);
+    return dist;
+}

package/coms/compile/rescan_test.js

@@ -0,0 +1,3 @@
+var o = { name: 'o', text: 'replaced', abcd: 2023 };
+var a = rescan`1${1}${2}${o}`;
+console.log(a)

package/coms/compile/scanner2.js

@@ -208,7 +208,7 @@ function scan(text, type = "js", lastIndex = 0) {
     program.Code = Code;
     program.lastIndex = lastIndex;
     var res = program.exec(text);
-    res.program = program;
+    Object.defineProperty(res, "program", { value: program, enumerable: false })
     return res;
 }
 

package/coms/compile/unstruct.js

@@ -1,12 +1,14 @@
 var { SPACE, COMMENT, EXPRESS, STRAP, QUOTED, STAMP, SCOPED, VALUE, LABEL, canbeTemp: _canbeTemp, isEval, createString, skipAssignment, skipSentenceQueue, isHalfSentence, splice, relink, createExpressList, snapExpressHead, snapExpressFoot } = require("./common");
 var scanner2 = require("./scanner2");
-var RE = { type: STRAP, text: "@re" };// if (_) return
-var RZ = { type: STRAP, text: "@rz" };// if (!_) return
-var RD = { type: STRAP, text: "@rd" };// if (_) return
-var RETURN = { type: STRAP, text: "@ret" };// return;
-var THROW = { type: STRAP, text: "@throw" };// return;
-var YIELD = { type: STRAP, text: "@yield" };// return;
-var NEXT = { type: STRAP, text: "@next" };// return;
+var returnText = function () { return this.text };
+var NodeNotClone = o => Object.assign(Object.create(null), o, { toString: returnText });
+var RE = NodeNotClone({ type: STRAP, text: "@re" });// if (_) return
+var RZ = NodeNotClone({ type: STRAP, text: "@rz" });// if (!_) return
+var RD = NodeNotClone({ type: STRAP, text: "@rd" });// if (_) return
+var RETURN = NodeNotClone({ type: STRAP, text: "@ret" });// return;
+var THROW = NodeNotClone({ type: STRAP, text: "@throw" });// return;
+var YIELD = NodeNotClone({ type: STRAP, text: "@yield" });// return;
+var NEXT = NodeNotClone({ type: STRAP, text: "@next" });// return;
 var mount_break = function (body, cx, b1s, iscontinue) {
     var label;
     do {
@@ -77,7 +79,7 @@ var _try = function (body, cx, unblock, result, getname) {
         if (o.type === SCOPED && o.entry === "(") {
             var e = o.first;
             if (e) {
-                arg = scanner2(`${e.text}=${ret_ || "@"};`);
+                arg = rescan`${e}=${ret_ || "@"};`;
             }
             o = o.next;
         }
@@ -117,18 +119,28 @@ var _with = function (body, cx, unblock, result, getname) {
     evals.pop();
     return cx;
 };
+var _evals = function () {
+    var a = [];
+    if (evals.length) {
+        a.push(...evals[0]);
+        for (var cx = 1, dx = evals.length; cx < dx; cx++) {
+            a.push({ type: STAMP, text: ',' }, ...evals[cx]);
+        }
+    }
+    return a;
+}
 var _withget = function (text) {
     var index = text.indexOf('.');
     if (index < 0) index = text.length;
     var name = text.slice(0, index);
     var prop = text.slice(index);
-    return `withget_("${name}",[${evals.join(',')}],${name})${prop}`;
+    return rescan`withget_(${`"${name}"`},[${_evals()}],${name})${prop}`;
 };
 var _withset = function (text, tmpname, valname) {
     var index = text.indexOf(".");
     if (index < 0) index = text.length;
     var name = text.slice(0, index);
-    return `if(${tmpname}=with_("${name}",[${evals.join(",")}]))${tmpname}.${text}=${valname};else ${text}=${valname};`;
+    return rescan`if(${tmpname}=with_(${`"${name}"`},[${_evals()}]))${tmpname}.${text}=${valname};else ${text}=${valname};`;
 };
 var _switch = function (body, cx, unblock, result, getname) {
     var o = body[cx];
@@ -159,7 +171,7 @@ var _switch = function (body, cx, unblock, result, getname) {
         var q = ternary(block, getnextname, true);
         for (var q of q) if (q.length) pushstep(result, q);
         var qe = q;
-        if (qe.name) case_ = scanner2(`if(${qn}===${qe.name})return[]`), pushstep(result, case_);
+        if (qe.name) case_ = rescan`if(${qn}===${qe.name})return[]`, pushstep(result, case_);
         else default_ = case_ = scanner2(`return[]`), default_.ret_ = -2;
         var by = cy;
         m = o[cy];
@@ -248,7 +260,7 @@ var _for = function (body, cx, unblock, result) {
         var t = unblock(block1);
         if (t) {
             t = t && !t.await_ ? t.name : ret_;
-            var b = scanner2(`if(!${t})return []`);
+            var b = rescan`if(!${t})return []`;
             var be = b[b.length - 1];
             pushstep(result, b);
         }
@@ -281,13 +293,13 @@ var getCondition = function (o, unblock, not_) {
     if (not_) not = !not;
     if (f && f === o.last) {
         if (f.type & (EXPRESS | VALUE)) {
-            n = f.text;
+            n = cloneNode(f);
         }
         if (not && n) {
             if (f.type === VALUE) {
                 n = String(eval("!" + f.text));
             }
-            else n = "!" + n;
+            else n = rescan`!${n}`;
         }
     }
     if (!n) {
@@ -299,9 +311,9 @@ var getCondition = function (o, unblock, not_) {
             n = ret_;
         }
         else n = n.name;
-        if (not) n = "!" + n;
+        if (not) n = rescan`!${n}`;
     }
-    return n;
+    return cloneNode(n);
 }
 var _while = function (body, cx, unblock, result) {
     var o = body[cx];
@@ -310,7 +322,7 @@ var _while = function (body, cx, unblock, result) {
     o = o.next;
     while (body[cx] !== o) cx++;
     var i = result.length;
-    var b = scanner2(`if(${getCondition(o, unblock, true)})return []`);
+    var b = rescan`if (${getCondition(o, unblock, true)}) return []`;
     var be = b[b.length - 1];
     pushstep(result, b);
     relink(result[result.length - 1]);
@@ -321,7 +333,7 @@ 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 - i}, 0`));
     return cx;
 };
 var pushstep = function (result, step) {
@@ -334,7 +346,7 @@ var pushstep = function (result, step) {
     }
     else if (q.await_) {
         if (!step.awaited) {
-            step.unshift(...scanner2(`${q.name}=${ret_};`)), relink(step);
+            step.unshift(...rescan`${q.name}=${ret_};`), relink(step);
             step.awaited = true;
         }
         result.push(step);
@@ -343,6 +355,10 @@ var pushstep = function (result, step) {
         if (q.await__) step.awaited = true;
         result.push(step);
     }
+    else if (isempty(step, COMMENT)) {
+        q.push(...step);
+        step = q;
+    }
     else {
         if (needcomma(q)) q.push({ type: STAMP, text: ';' });
         if (!ishalf(q)) {
@@ -368,23 +384,23 @@ var patchstep = function (r, nextindex, h) {
         o = r[i];
         if (o.set) {
             var [m, _, b] = r.splice(i, 3);
-            r.splice(i, 0, ...scanner2(_withset(m.text, m.set, b.text)));
+            r.splice(i, 0, ..._withset(m.text, m.set, b.text));
         }
         else if (o.get) {
-            r.splice(i, 1, ...scanner2(_withget(b.text)));
+            r.splice(i, 1, ..._withget(b.text));
         }
     }
     var changed = false;
     for (i = r.length - 1; i >= h; i--) {
         o = r[i];
         if (o === RZ) {
-            x = scanner2(`if(!${name})return [${nextindex},0]`);
+            x = rescan`if (!${name}) return [${nextindex}, 0]`;
         }
         else if (o === RE) {
-            x = scanner2(`if(${name})return [${nextindex},0]`);
+            x = rescan`if (${name}) return [${nextindex}, 0]`;
         }
         else if (o === RD) {
-            x = scanner2(`if(${name}!==null&&${name}!== undefined)return [${nextindex},0]`);
+            x = rescan`if (${name}!== null && ${name}!== undefined) return [${nextindex}, 0]`;
         }
         else continue;
         changed = true;
@@ -414,13 +430,13 @@ var _do = function (body, cx, unblock, result) {
     o = o.next.next;
 
     if (label.continue) ifpatch(result), label.contat = result.length;
-    var b = scanner2(`if(${getCondition(o, unblock)})return [${i - result.length},0]`);
+    var b = rescan`if (${getCondition(o, unblock)}) return [${i - result.length}, 0]`;
     pushstep(result, b);
     while (body[cx] !== o) cx++;
     return cx + 1;
 };
 var stepReturn = function (value, type, q) {
-    var r = scanner2(`return [${value},${type}]`);
+    var r = rescan`return [${value}, ${type}]`;
     r.ret_ = type === 2 ? type : true;
     if (q && q.length) r.name = q[q.length - 1].name;
     return r;
@@ -432,9 +448,9 @@ var isretn = function (o) {
     return o === RETURN || o === NEXT || o === YIELD || o === THROW;
 }
 var _return = function (r) {
-    var name = r.name;
     var e = r[r.length - 1];
     if (!isretn(e)) return;
+    var name = r.name;
     r.pop();
     r.ret_ = !ishalf(r);
     var x;
@@ -442,7 +458,7 @@ var _return = function (r) {
         x = stepReturn(name, 2);
     }
     else if (e === THROW) {
-        x = scanner2(`throw ${name}`);
+        x = rescan`throw ${name}`;
     }
     else if (e === YIELD) {
         x = stepReturn(name, 3);
@@ -507,7 +523,7 @@ var _invoke = function (t, getname) {
         }
         if (needbreak(o)) {
             var s = splice(t, bx, cx + 1 - bx);
-            if (cx > 0) s.name = s[0].text;
+            if (cx > 0) s.name = [cloneNode(s[0])];
             else s.name = qname;
             queue.push(s);
             cx = bx - 1;
@@ -547,7 +563,7 @@ var _invoke = function (t, getname) {
                 if (!iseval || m[m.length - 1] === o.last) {
                     var q = toqueue(m, getdeepname, 1);
                     var qe = q[q.length - 1];
-                    splice(o, by, ey - by, ...qe ? scanner2(qe.name) : []);
+                    splice(o, by, ey - by, ...qe ? cloneNode(qe.name) : []);
                     cy = by + 1;
                 }
                 else {
@@ -575,7 +591,7 @@ var _invoke = function (t, getname) {
                     var fs = splice(t, hx, cx + 1 - hx, { type: EXPRESS, text: getname(nameindex) });
                     fs.unshift(...scanner2(`${getname(nameindex)}=`));
                     relink(fs);
-                    fs.name = getname(nameindex);
+                    fs.name = [{ text: getname(nameindex), type: EXPRESS }];
                     pushstep(result, fs);
                     cx = hx - 1;
                 }
@@ -634,12 +650,9 @@ var patchname = function (d, getname) {
     var de = d[d.length - 1];
     if (de && !de.name) {
         splice(de, 0, 0, { type: EXPRESS, text: getname(0) }, { type: STAMP, text: "=" });
-        de.name = getname(0);
+        de.name = [{ text: getname(0), type: EXPRESS }];
     }
 };
-var clone = function (o) {
-    return Object.assign(o instanceof Array ? [] : {}, o, { prev: null, next: null });
-};
 var popass = function (explist) {
     var asn = explist.pop();
     var n;
@@ -656,7 +669,7 @@ var popass = function (explist) {
     }
     else {
         n = asn && asn.name;
-        asn = [{ type: EXPRESS, text: n }];
+        asn = n;
     }
     return [asn, n];
 }
@@ -679,7 +692,7 @@ var popexp = function (explist) {
     }
     else {
         n = asn.name;
-        asn = scanner2(n);
+        asn = cloneNode(n);
     }
     return [asn, n];
 }
@@ -722,11 +735,12 @@ var ternary = function (body, getname, ret) {
                 }
                 pushstep(d, stepReturn(1, 0, d));
                 pushstep(c, stepReturn(d.length + 1, 0, c));
-                pushstep(explist, scanner2(`if(${getCondition(b, function (b) {
+                pushstep(explist, rescan`if (${getCondition(b, function (b) {
                     b = ternary(b, getnextname, true);
                     for (var b of b) pushstep(explist, b);
                     return b;
-                }, true)})return [1,0]`));
+                }, true)
+                    }) return [1, 0]`);
                 var q = explist[explist.length - 1];
                 var qi = explist.length - 1;
                 var qe = q[q.length - 1];
@@ -748,7 +762,7 @@ var ternary = function (body, getname, ret) {
             var ass = toqueue(body.slice(equalsend, cx), getnextname, false);
             var [ass1, n = ++eqused] = popass(ass);
             exphead.push(...ass);
-            equals.push(...ass1, o);
+            equals.push(...cloneNode(ass1), o);
             if (!question.length) equalsend = cx + 1, equcount++;
             if (o.text.length > 1) hascalcequ = true;
         }
@@ -775,7 +789,7 @@ var ternary = function (body, getname, ret) {
     relink(equals);
     explist.unshift(...exphead);
     var q = explist[explist.length - 1];
-    // if (!q) throw `语法错误: <red>${createString(body)}</red> \r\n行列位置: ${equals[0].row}:${equals[0].col}`
+    // if (!q) throw `语法错误: <red>${createString(body)}</red> \r\n行列位置: ${ equals[0].row }:${ equals[0].col }`
     var n = q.name;
     var i = equals.length - 1;
     var isSimpleAssign = true;
@@ -796,23 +810,23 @@ var ternary = function (body, getname, ret) {
         var eq = equals[i];
         if (isSimpleAssign) isSimpleAssign = ret !== 1 && canbeTemp(ass);
         if (isSimpleAssign && eq.text === '=') {
-            [asn, n = createString(ass)] = popexp(explist);
+            [asn, n = cloneNode(ass)] = popexp(explist);
         }
-        else if (n) var asn = scanner2(n);
+        else if (n && !isempty(n, SPACE | COMMENT)) var asn = n;
         else asn = explist.pop();
         var an = '';
         if (eq.text.length > 1) {
             var punc = eq.text.slice(0, eq.text.length - 1);
-            var bdtmp = [...ass.map(clone), { type: STAMP, text: punc }, ...asn];
+            var bdtmp = [...ass.map(cloneNode), { type: STAMP, text: punc }, ...asn];
             relink(bdtmp);
             var explist2 = _express(bdtmp, getnextname, true);
             if (isSimpleAssign) {
-                [asn, an = createString(ass)] = popexp(explist2);
+                [asn, an = cloneNode(ass)] = popexp(explist2);
             }
             else {
                 var q2 = explist2[explist2.length - 1];
                 an = q2.name;
-                asn = scanner2(an);
+                asn = cloneNode(an);
             }
             for (var e of explist2) pushstep(explist, e);
             eq.text = "=";
@@ -821,7 +835,7 @@ var ternary = function (body, getname, ret) {
         ass.push(equals[i], ...asn);
         relink(ass);
         if (evals.length) ass[0].set = getnextname(0);
-        ass.name = an;
+        if (an) ass.name = cloneNode(an);
         patchstep(ass, ass.length, 0);
         pushstep(explist, ass);
         isSimpleAssign = false;
@@ -912,7 +926,7 @@ var canbeOnce = function (body) {
 var _express = function (body, getname, ret) {
     if (canbeTemp(body)) {
         var q = [];
-        q.name = createString(body);
+        q.name = cloneNode(body);
         return [q];
     }
     var result = [];
@@ -976,8 +990,8 @@ var _express = function (body, getname, ret) {
                     else if (iw === 3) q.push(YIELD);
                 }
             }
-            var name = getname(nameindex);
-            q.name = name;
+            var name = [{ text: getname(nameindex), type: EXPRESS }];
+            q.name = cloneNode(name);
             if (isor) {
                 if (o.text === '||') {
                     q.push(RE);
@@ -991,7 +1005,7 @@ var _express = function (body, getname, ret) {
                 hasor = true;
                 nameindex = 0;
             } else {
-                var n = scanner2(name);
+                var n = cloneNode(name);
                 n.index = nameindex;
                 n.push(pb);
                 nameindex++;
@@ -1038,7 +1052,7 @@ var _express = function (body, getname, ret) {
             q.push(...b);
         }
     }
-    if (needname) q.name = getname(nameindex);
+    if (needname) q.name = [{ text: getname(nameindex), type: EXPRESS }];
     relink(q);
     if (isFunctionOnly(q, 2)) {
         result = [q];
@@ -1114,7 +1128,7 @@ function toqueue(body, getname, ret = false, result = []) {
             var p = result[findex];
             if (p.ifbrk) {
                 p.pop();
-                p.push(scanner2(`[${result.length - findex},0]`)[0]);
+                p.push(scanner2(`[${result.length - findex}, 0]`)[0]);
                 relink(p);
             }
         }
@@ -1262,10 +1276,10 @@ function toqueue(body, getname, ret = false, result = []) {
                 var n = getCondition(o, unblock, !isbr);
                 o = o.next;
                 if (isbr) {
-                    var c = scanner2(`if(${n})`);
+                    var c = rescan`if (${n})`;
                 }
                 else {
-                    var c = scanner2(`if(${n})return [0,0]`);
+                    var c = rescan`if (${n}) return [0, 0]`;
                 }
                 var ce = c[3];
                 pushstep(result, c);
@@ -1328,7 +1342,7 @@ function toqueue(body, getname, ret = false, result = []) {
         }
         else {
             var q = b[b.length - 1];
-            if (q && !q.length && q.name) pushstep(result, scanner2(q.name));
+            if (q && !q.length && q.name) pushstep(result, cloneNode(q.name));
         }
         retn = false;
     } while (cx < body.length);

package/coms/compile/unstruct_test.js

@@ -110,7 +110,7 @@ test("throw a", 'throw a', true);
 test("throw a,b", 'a; throw b', true);
 test("return a,b", 'a; return [b, 2]', true);
 test("return a\r\n", 'return [a, 2]', true);
-test("return a\r\n+b/*c*/;", '_ = a\r\n+ b; /*c*/ return [_, 2]', true);
+test("return a\r\n+b/*c*/;", '_ = a\r\n+ b/*c*/; return [_, 2]', true);
 test("debugger", 'debugger', true);
 test("a(b,b+=1)", '_ = b; _0 = b + 1; b = _0; a(_, _0)', true);
 test("while(a){if(b){if(c);else d;continue;}}", 'if (!a) return [4, 0]; if (!b) return [3, 0]; if (!c) return [1, 0]; return [2, 0];\r\n d; return [1, 0];\r\n return [-2, 0];\r\n return [-3, 0]', true);