efront 4.0.19 → 4.0.22

package/coms/compile/common.js

@@ -12,7 +12,8 @@ const [
     /* 512 */LABEL,
     /*1024 */PROPERTY,
 ] = new Array(20).fill(0).map((_, a) => 1 << a);
-var number_reg = /^(0x[0-9a-f]+|0b\d+|0o\d+|(\d*\.\d+|\d+\.?))(e[\+\-]?\d+|[mn])?$/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]+|0b\d+|0o\d+)(?:_[0-9a-f]+)*|(?:(?:(?:\d+_)*\d+|\d*)\.\d+(?:_\d+)*|(?:\d+_)*\d+\.?))(?:e[\+\-]?\d+(?:_\d+)*|[mn])?$/i;
 var equal_reg = /^(?:[\+\-\*\/~\^&\|%]|\*\*|>>>?|<<)?\=$|^(?:\+\+|\-\-)$/;
 var skipAssignment = function (o, cx) {
     var next = arguments.length === 1 ? function () {
@@ -361,7 +362,7 @@ var snapExpressFoot = function (o) {
             n = o.next;
         }
         if (!n) break;
-        if (n.type === SCOPED && o.entry !== '{'
+        if (n.type === SCOPED && (o.entry !== '{' || o.isObject)
             || /\.$/.test(o.text) && !o.isdigit
             || n.type === EXPRESS && /^\??\.[^\.]/.test(n.text)
             || n.type === QUOTED && (n.length || /^\`/.test(n.text))
@@ -389,6 +390,7 @@ var mustBeYield = function (o) {
 var createScoped = function (parsed, wash) {
     var used = Object.create(null); var vars = Object.create(null), lets = vars;
     var scoped = [], funcbody = scoped, argscope = scoped, thisscope = scoped;
+    funcbody.isroot = true;
     scoped.body = parsed;
     scoped.isfunc = true;
     var run = function (o, id, body) {
@@ -439,25 +441,10 @@ var createScoped = function (parsed, wash) {
                 case VALUE:
                     if (o.isdigit) break;
                 case EXPRESS:
+                    // if (o.text === 'readFileAsync') console.log(o)
                     if (o.prev && o.prev.type === EXPRESS) {
                         if (/\.$/.test(o.prev.text)) break;
                     }
-                    if (o.text === 'await' && funcbody.async !== false) {
-                        o.type = STRAP;
-                        funcbody.async = true;
-                        continue;
-                    }
-                    if (o.text === 'yield') {
-                        if (funcbody.aster === true) {
-                            o.type = STRAP;
-                            continue;
-                        }
-                        if (mustBeYield(o)) {
-                            o.type = STRAP;
-                            funcbody.aster = true;
-                        }
-                        continue;
-                    }
                     if (o.next && o.next.type === STAMP && o.next.text === "=>") {
                         isScope = true;
                         isArrow = true;
@@ -487,43 +474,29 @@ var createScoped = function (parsed, wash) {
 
                 case STRAP:
                     var s = o.text;
+                    var m = null;
                     switch (s) {
                         case "return":
                             if (!funcbody.return) funcbody.return = [];
                             funcbody.return.push(o);
                             break;
                         case "await":
-                            if (funcbody.async === false) {
-                                o.type = EXPRESS;
-                                continue;
-                            }
-                            funcbody.async = funcbody.await = true;
-                            break;
-                        case "yield":
-                            if (!funcbody.aster) {
-                                var mustyield = undefined;
-                                var tmp = id;
-                                if (body) while (body[++tmp] !== o.next) {
-                                    if (body[tmp].type === SPACE) {
-                                        mustyield = false;
-                                        break;
-                                    };
-                                }
-                                if (mustyield !== false) mustyield = mustBeYield(o);
-                                if (mustyield) funcbody.aster = true;
-                                continue;
-                            }
-                            funcbody.yield = true;
                             break;
                         case "as":
                         case "from":
                             break;
-                        case "var":
-                        case "import":
-                            var m = vars;
                         case "let":
                         case "const":
-                            m = m || lets;
+                            m = lets;
+                            if (!o.next || o.next.type !== EXPRESS && (o.next.type !== SCOPED || o.next.entry === "(")) {
+                                o.type = EXPRESS;
+                                continue;
+                            }
+                        case "import":
+                            if (!o.next || o.next.type === QUOTED) break;
+                        case "var":
+                            m = m || vars;
+                            if (s === 'var' && m !== vars) console.log(m === vars, m === lets, s);
                             var [declared, used0, o0, skiped] = getDeclared(o.next, s);
                             while (skiped.length) {
                                 var o1 = run(skiped[0], 0);
@@ -566,8 +539,9 @@ var createScoped = function (parsed, wash) {
                             break;
                         case "for":
                             o = o.next;
-                            if (o.type === STRAP && o.text === 'await') {
-                                funcbody.async = funcbody.await = true;
+                            if (o.type !== SCOPED && o.text === 'await') {
+                                if (o.type === EXPRESS) o.type = STRAP;
+                                funcbody.await = funcbody.async = true;
                                 o = o.next;
                             }
                             isScope = true;
@@ -627,11 +601,11 @@ var createScoped = function (parsed, wash) {
                     lets = vars;
                     if (isFunction) {
                         vars.this = true, vars.arguments = true;
-                        scoped.aster = isAster;
+                        scoped.yield = scoped.aster = isAster;
                         thisscope = scoped;
                         argscope = scoped;
                     }
-                    scoped.async = isAsync;
+                    scoped.await = scoped.async = isAsync;
                     scoped.isfunc = true;
                     isFunction = true;
                     if (function_obj) function_obj.scoped = scoped;
@@ -743,7 +717,7 @@ var createScoped = function (parsed, wash) {
                     } while (o);
                 }
                 var map = isFunction ? vars : lets;
-                var keepscope = !!scoped.body || !!scoped.head;
+                var keepscope = !!scoped.body || !!scoped.head || isArrow;
                 if (!keepscope) for (var k in map) {
                     keepscope = true;
                     break;
@@ -772,7 +746,6 @@ var createScoped = function (parsed, wash) {
                 }
                 if (isClass) delete lets.super, delete lets.this, thisscope = _thisscope;
                 if (isFunction) {
-                    if (used.yield) _scoped.yield = false;
                     funcbody = _funcbody;
                     if (!isArrow) {
                         delete vars.this;
@@ -801,11 +774,19 @@ var createScoped = function (parsed, wash) {
         }
     }
     if (vars.yield) scoped.yield = false;
+    if (vars.await) scoped.await = false;
     if (scoped.yield !== false && envs.yield) {
-        scoped.yield = true;
+        used.yield.forEach(o => o.type = STRAP);
+        scoped.yield = scoped.aster = true;
         delete envs.yield;
         delete used.yield;
     }
+    if (scoped.await !== false && envs.await) {
+        used.await.forEach(o => o.type = STRAP);
+        scoped.await = scoped.async = true;
+        delete envs.await;
+        delete used.await;
+    }
     delete envs.eval;
     scoped.envs = envs;
     return scoped;
@@ -835,6 +816,19 @@ var getDeclared = function (o, kind, queue) {
             }
         }
         switch (o.type) {
+            case SCOPED:
+                if (snapExpressFoot(o) === o) {
+                    var [d, u, _, s] = getDeclared(o.first, kind, o);
+                    while (s.length) skiped.push.apply(skiped, s.splice(0, 1024));
+                    mergeTo(used, u);
+                    if (d.length || d.attributes.length) declared.push(d);
+                    if (!prop) prop = declared["..."] ? declared["..."][1] - index : `[${index}]`;
+                    d.entry = o.entry;
+                    o.kind = kind;
+                    attributes.push([prop, d]);
+                    o = o.next;
+                    break;
+                }
             case STAMP:
                 if (o.text === "*" && o.next) {
                     if (o.next.type === STRAP && o.next.text === 'as') {
@@ -854,10 +848,12 @@ var getDeclared = function (o, kind, queue) {
             case EXPRESS:
             case STRAP:
             case VALUE:
-                var n = o.text.replace(/^\.\.\.|\.\.\.$/g, '');
-                declared.push(n);
-                var isdots = n !== o.text;
-                if (!isdots && !prop) {
+                var isrest = /^\.\.\./.test(o.text);
+                var n = o;
+                var k = o.text;
+                if (isrest) declared.push(k = k.slice(3))
+                else if (o.text) declared.push(k);
+                if (!isrest && !prop) {
                     if (queue && queue.entry === '{') {
                         if (o.type & (EXPRESS | STRAP)) {
                             if (/^\[/.test(o.text)) prop = o.text;
@@ -870,22 +866,14 @@ var getDeclared = function (o, kind, queue) {
                     }
                     else prop = declared["..."] ? declared["..."][1] - index : `[${index}]`;
                 }
-                if (isdots) declared["..."] = [n, index];
-                else attributes.push([prop, n]);
-                o.kind = kind;
-                saveTo(used, n, o);
-                o = o.next;
-                break;
-            case SCOPED:
-                var [d, u, _, s] = getDeclared(o.first, kind, o);
-                while (s.length) skiped.push.apply(skiped, s.splice(0, 1024));
-                mergeTo(used, u);
-                declared.push(d);
-                if (!prop) prop = declared["..."] ? declared["..."][1] - index : `[${index}]`;
-                d.entry = o.entry;
+                var f = snapExpressFoot(o);
+                if (k) saveTo(used, k, o);
+                var s = [o];
+                while (o !== f) o = o.next, s.push(o);
+                if (isrest) declared["..."] = [s, index];
+                else attributes.push([prop, s]);
                 o.kind = kind;
-                attributes.push([prop, d]);
-                o = o.next;
+                o = f.next;
                 break;
             default:
                 console.log(o);
@@ -896,13 +884,7 @@ var getDeclared = function (o, kind, queue) {
             case STRAP:
                 if (/^(in|of)$/.test(o.text)) {
                     o = o.next;
-                    var o0 = skipAssignment(o);
-                    do {
-                        skiped.push(o);
-                        o = o.next;
-                    } while (o !== o0);
-                    o = o0;
-                    break;
+                    break loop;
                 }
                 break loop;
             case STAMP:
@@ -910,6 +892,7 @@ var getDeclared = function (o, kind, queue) {
                     o.prev.equal = o;
                     o = o.next;
                     var o0 = skipAssignment(o);
+                    if (isrest) throw "余集变量不能有默认值";
                     attributes[attributes.length - 1].push(queue, o, o0);
                     while (o !== o0) {
                         skiped.push(o);
@@ -940,7 +923,9 @@ var mapDeclared = function (map, declared) {
     }
     return map;
 };
+var { uncode } = require("../basic/strings");
 var saveTo = function (used, k, o) {
+    k = uncode(k);
     if (!(used[k] instanceof Array)) used[k] = [];
     used[k].push(o);
 };
@@ -1007,8 +992,11 @@ var relink = function (list) {
     return list;
 };
 var setqueue = function (list, queue = list) {
-    var v = { value: queue }
-    for (var o of list) Reflect.deleteProperty(o, 'queue'), Reflect.defineProperty(o, 'queue', v);
+    /**
+     * @type {PropertyDescriptor}
+     */
+    var v = { value: queue, configurable: true, enumerable: false };
+    for (var o of list) delete o.queue, Object.defineProperty(o, 'queue', v);
 };
 
 var createString = function (parsed) {
@@ -1025,7 +1013,6 @@ var createString = function (parsed) {
             ) {
                 if (o.type !== EXPRESS || !/^(\.[^\.]|\[)/.test(o.text) && !prev.tag && !o.tag) {
                     result.push(" ");
-                    if (createString.debug && !o.text) console.log(o.type, o.text, o)
                     lasttype = SPACE
                 }
             }
@@ -1246,6 +1233,17 @@ var replace = function (o, ...args) {
     var i = queue.indexOf(o);
     if (i >= 0) splice(queue, i, 1, ...args);
 };
+var isEval = function (o) {
+    if (o.entry === "[") {
+        var h = snapExpressHead(o);
+        return o !== h;
+    }
+    else if (o.entry === '(') {
+        var h = snapExpressHead(o);
+        return o === h;
+    }
+    return false;
+};
 
 module.exports = {
     /*   1 */COMMENT,
@@ -1272,6 +1270,7 @@ module.exports = {
     skipSentenceQueue,
     needBreakBetween,
     saveTo,
+    isEval,
     rename,
     relink,
     setqueue,