efront 3.36.6 → 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/basic_/Symbol.js

@@ -17,5 +17,16 @@ var Symbol = this.Symbol || function () {
     };
 
     Symbol.prototype = prototype;
+    Symbol.iterator = Symbol('iterator');
+    Symbol.asyncIterator = Symbol('asyncIterator');
+    Array.prototype[Symbol.iterator] = function () {
+        var arr = this, cx = 0, dx = arr.length;
+        return {
+            next() {
+                if (cx < dx) return { value: arr[cx++], done: false };
+                return { value: undefined, done: true };
+            }
+        }
+    };
     return Symbol;
 }();

package/coms/basic_/aster_.js

@@ -0,0 +1,35 @@
+class Generator {
+    constructor(f) {
+        this.state = "suspended";
+        this.exec = f;
+    };
+    throw(e) {
+        delete this.exec;
+        this.state = "closed";
+        throw e;
+    }
+    return(value) {
+        delete this.exec;
+        this.state = "closed";
+        return { value: undefined, done: true };
+    }
+    next() {
+        if (this.exec) {
+            var exec = this.exec;
+            delete this.exec;
+            delete this.value;
+            exec(this.return, this.throw, (value, exec) => {
+                this.value = value;
+                this.exec = exec;
+            });
+        }
+        return { value: this.value, done: !this.exec };
+    }
+}
+Generator.prototype[Symbol.iterator] = function () {
+    return this;
+};
+
+function aster_() {
+    return new Generator(exec_.bind(this, arguments));
+}

package/coms/basic_/asyncAster_.js

@@ -0,0 +1,50 @@
+class AsyncGenerator {
+    constructor(f) {
+        this.state = "suspended";
+        this.exec = f;
+    };
+    throw(e) {
+        delete this.exec;
+        this.state = "closed";
+        return Promise.reject(e);
+    }
+    return(value) {
+        delete this.exec;
+        this.state = "closed";
+        return Promise.resolve({ value: undefined, done: true });
+    }
+    next() {
+        if (this.exec) {
+            var exec = this.exec;
+            delete this.exec;
+            delete this.value;
+            return this.promise = new Promise(function (ok, oh) {
+                exec(function (result) {
+                    delete this.promise;
+                    ok(result);
+                    this.return(result);
+                }, function (error) {
+                    delete this.promise;
+                    oh(error);
+                    this.throw(error);
+                }, (value, exec) => {
+                    delete this.promise;
+                    ok({ value: value, done: !this.exec })
+                    this.value = value;
+                    this.exec = exec;
+                });
+            })
+        }
+        else if (this.promise) {
+            return this.promise.then(this.next, this.next);
+        }
+        return Promise.resolve({ value: undefined, done: true });
+    }
+
+}
+Generator.prototype[Symbol.asyncIterator] = function () {
+    return this;
+}
+function asyncAster_() {
+    return new AsyncGenerator(exec_.bind(this, arguments));
+}

package/coms/basic_/async_.js

@@ -1,62 +1,4 @@
-var exec = function (args, ok, oh) {
-    var p = null, index = 0, r, finished = false;
-    var next = function (arg) {
-        p = arg;
-        run();
-    };
-    var catches = [];
-    var thro = function (err) {
-        if (catches.length) {
-            [index, p] = catches[catches.length - 1]
-            index += p >>> 16;
-            p = err;
-            next();
-        }
-        else {
-            oh(err);
-        }
-    };
-    var retn = function (p) {
-        r = p;
-        finished = true;
-        if (catches.length) fina();
-        else ok(r);
-    };
-    var fina = function () {
-        // 仅在try或catch未结束时使用
-        [index, p] = catches[catches.length - 1];
-        index += (p >>> 16) + (p & 0xffff);
-        next();
-    };
-    var fine = function () {
-        catches.pop();
-        next();
-    }
-    var run = function () {
-        var args_length = args.length, i;
-        if (finished && !catches.length || index > args_length) return ok(r);
-        loop: while (index < args_length) {
-            try {
-                [p, i] = args[index](p) || [1, 0];
-            } catch (e) {
-                p = null;
-                thro(e);
-                break;
-            }
-            switch (i) {
-                case 0: index += p; break; // reflow
-                case 1: index += 1; break loop; // await p;
-                case 2: return finished = true, retn(p); // return p;
-                case 7: index++; catches.push([index, p]); break; // try start
-                case 9: return p ? fine() : fina(); // finally
-                default: throw "代码异常！";
-            }
-        }
-        if (p && isFunction(p.then)) p.then(next, thro);
-        else next(p);
-    };
-    next();
-};
+
 function async_() {
-    return new Promise(exec.bind(null, arguments));
+    return new Promise(exec_.bind(this, arguments));
 }

package/coms/basic_/exec_.js

@@ -0,0 +1,62 @@
+var exec = function (args, ok, oh, int) {
+    var p = null, index = 0, r, finished = false, t = this;
+    var next = function (arg) {
+        p = arg;
+        run();
+    };
+    var catches = [];
+    var thro = function (err) {
+        if (catches.length) {
+            [index, p] = catches[catches.length - 1]
+            index += p >>> 16;
+            p = err;
+            next();
+        }
+        else {
+            oh(err);
+        }
+    };
+    var retn = function (p) {
+        r = p;
+        finished = true;
+        if (catches.length) fina();
+        else ok(r);
+    };
+    var fina = function () {
+        // 仅在try或catch未结束时使用
+        [index, p] = catches[catches.length - 1];
+        index += (p >>> 16) + (p & 0xffff);
+        next();
+    };
+    var fine = function () {
+        catches.pop();
+        next();
+    }
+    var run = function () {
+        var args_length = args.length, i;
+        if (finished && !catches.length || index > args_length) return ok(r);
+        while (index < args_length) {
+            try {
+                [p, i] = args[index].call(t, p) || [1, 0];
+            } catch (e) {
+                p = null;
+                thro(e);
+                break;
+            }
+            switch (i) {
+                case 0: index += p; break; // reflow
+                case 1:
+                    index++; // await p;
+                    if (p && isFunction(p.then)) return p.then(next, thro);
+                    else return next(p);
+                case 2: return finished = true, retn(p); // return p;
+                case 3: return index++, int(p, next); // yield p;
+                case 7: index++; catches.push([index, p]); break; // try start
+                case 9: return p ? fine() : fina(); // finally
+                default: throw "代码异常！";
+            }
+        }
+        retn();
+    };
+    next();
+};

package/coms/compile/Javascript.js

@@ -33,7 +33,7 @@ function,continue,debugger
 instanceof`.trim().split(/[,\s]+/);
 class Javascript extends Program {
     straps = straps;
-    value_reg = /^(false|true|null|Infinity|NaN|undefined|arguments|this|eval|super)$/
+    value_reg = /^(false|true|null|Infinity|NaN|undefined)$/
     transive_reg = /^(new|var|let|const|yield|void|in|of|typeof|delete|case|return|await|export|default|instanceof|throw|extends|import|from)$/
     strapexp_reg = /^(new|void|typeof|delete|class|function|await)/;
     forceend_reg = /^(return|yield|break|continue|debugger)$/;
@@ -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

@@ -101,8 +101,11 @@ var skipAssignment = function (o, cx) {
                 next();
                 break;
             }
-        case VALUE:
         case QUOTED:
+            if (needpunc && /^`/.test(o.text || o.entry)) {
+                needpunc = false;
+            }
+        case VALUE:
             if (needpunc) break loop;
             needpunc = true;
             next();
@@ -279,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) {
@@ -421,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;
@@ -505,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/createExpressList_test.js

@@ -16,4 +16,5 @@ test('try{}catch{}finally{} if(m)c=d+a;else aa debugger\r\n a')
 test('try{}catch{}\r\nfinally{}\r\n if(m)c=d+a;else aa debugger\r\n a')
 test('var a')
 test('var a,b,c=1;')
-test('a:')
+test('a:')
+test('a`b`,a`aa{s}`,c;')

package/coms/compile/downLevel.js

@@ -664,12 +664,8 @@ var killobj = function (body, getobjname, getname_, setsolid, deep = 0) {
         o = o.next;
     }
 };
-var import_ = function () { };
-var export_ = function () { };
 
 // 字面量 false|true|null|Infinity|NaN|undefined|arguments|this|eval|super
-var unfalse = function () { };
-var unyield = function () { };
 var power_map = {};
 [
     '=,+=,-=,*=,/=,%=,|=,&=,^=,**=,~=',
@@ -691,11 +687,11 @@ var getsync = function (m) {
     if (m.type === SCOPED && m.await) return null;
     var n = skipAssignment(m);
     while (m !== n) {
-        if (m.await || m.type === STRAP && m.text === 'await') return null;
+        if (m.await || m.type === STRAP && /^(yield|await)$/.test(m.text)) return null;
         m = m.next;
     }
 };
-var isawait = function (o) {
+var ises3 = function (o) {
     if (o && o.type === SCOPED && o.entry === "{") {
         if (!o.await) return false;
     }
@@ -710,9 +706,9 @@ var isawait = function (o) {
     return false;
 }
 var unforin = function (o, body, getnewname_) {
-    // 仅处理有 await 的代码
+    // 仅处理有 await 或 yield 的代码
     if (!o.await) {
-        if (!isawait(o.next)) return;
+        if (!ises3(o.next)) return;
     }
     var m = o.first;
     var hasdeclare = false;
@@ -743,6 +739,11 @@ var unforin = function (o, body, getnewname_) {
 };
 
 var unforof = function (o, getnewname, used) {
+    var hasawait = false;
+    if (o.type === STRAP && o.text === 'await') {
+        hasawait = true;
+        o = o.next;
+    }
     var m = o.first;
     var hasdeclare = false;
     if (m.type === STRAP) {
@@ -761,7 +762,7 @@ var unforof = function (o, getnewname, used) {
         insert1(o, m, ...scanner2(d.map(a => a.text).join(",")));
     }
     var iname = getnewname();
-    insert1(o, m, ...scanner2(`${iname}=0`));
+    var gname = getnewname();
     var oname;
     if (!f.next && f.type === EXPRESS && !/\./.test(f.text) && used[f.text].length === 1) {
         splice1(o, m);
@@ -774,12 +775,7 @@ var unforof = function (o, getnewname, used) {
         insert1(o, null, ...scanner2(`,${oname}=`));
         insert1(o, null, ...mo);
     }
-    insert1(o, null, ...scanner2(`;${iname}<${oname}.length&&`));
-    var q = scanner2(`(=${oname}[${iname}],true)`)[0];
-    insert1(q, q[0], p);
-    insert1(o, null, q);
-    insert1(o, null, ...scanner2(`;${iname}++`));
-
+    insert1(o, null, ...scanner2(`${gname}=${hasawait ? `${oname}[Symbol.asyncGenerator]||${oname}[Symbol.generator]` : `${oname}[Symbol.generator]||${oname}[Symbol.asyncGenerator]`}||Array.prototype[Symbol.asyncGenerator].bind(${oname}),${gname}=${gname}(),${iname}=${hasawait ? "await " : ''}${gname}.next();${p.text}=${iname}.value,!${iname}.done;${iname}=${gname}.next();`));
 };
 var unarrow = function (body, o, killobj, getname_) {
     var p = o.prev;
@@ -961,10 +957,10 @@ var down = function (scoped) {
         if (argcodes.length) precode(argcodes.join(";") + ";");
         if (scoped.body) scoped.body.keeplet = false, killobj(scoped.body, gettmpname, _getname, setsolid);
         scoped.forEach(kill);
-        if (scoped.async) {
+        if (scoped.async || scoped.yield) {
             var argname = _getname("_");
             var code = unawait(scoped.body, _getname, argname);
-            var body = scanner2(`return async_()`);
+            var body = scanner2(`return ${[, "aster_", "async_", "asyncAster_"][scoped.async << 1 | scoped.yield]}()`);
             code.forEach(function (c) {
                 var f = scanner2(`function(${body[2].length ? argname : ''}){}`);
                 if (!c.length) insert1(f[2], null, ...scanner2('return []'));