efront 4.35.5 → 4.35.6

package/coms/compile/autoeval.js

@@ -21,7 +21,7 @@ var punc_2 = {
         return +n + s;
     },
     "/"(n, s) {
-        if (!n) return;
+        if (!n || s) return;
         return 1 / n + s;
     }
 };
@@ -51,9 +51,6 @@ var punc_3 = {
         return (n1 >> n2) + s;
     },
     "<<"(n1, n2, s) {
-        if (s && n1.length + +n2 > 15) {
-            return BigInt(n1) << BigInt(n2) + s;
-        }
         return (n1 << n2) + s;
     },
     ">"(n1, n2, s) {
@@ -99,6 +96,7 @@ function calc_(arg1, punc, arg2) {
         var [, n, s] = match;
         var f = punc_s && punc in punc_s ? punc_s[punc] : punc_2[punc];
         if (!f) return;
+        if (s === 'n' && n.length > 15) n = BigInt(n);
         return f(n, s, arg2);
     }
     var match1 = nreg.exec(arg1);
@@ -138,7 +136,12 @@ function calc_(arg1, punc, arg2) {
                     s = 'i'; s2 = '';
                     break a;
             }
-            if (s === s2) return f(n1, n2, s);
+            if (s === s2) {
+                if (s === 'n') {
+                    if (n1.length + n2.length > 15) n1 = BigInt(n1), n2 = BigInt(n2);
+                }
+                return f(n1, n2, s);
+            }
             return;
         }
         return f(n1, n2, s || s2);
@@ -147,6 +150,10 @@ function calc_(arg1, punc, arg2) {
         // 除法不考虑虚数
         if (s === s2) {
             if (/^[lmnuf]+$/i.test(s)) {
+                if (/^[lnu]+$/.test(s)) {
+                    n1 = BigInt(n1);
+                    n2 = BigInt(n2);
+                }
                 return f(n1, n2, s);
             }
             return f(n1, n2, "");
@@ -156,6 +163,18 @@ function calc_(arg1, punc, arg2) {
         return f(n1, n2, s);
     }
     if (s !== s2) return;
+    if (s === 'n') {
+        switch (punc) {
+            case "**":
+                if (n1.length * n2 > 15) n1 = BigInt(n1), n2 = BigInt(n2);
+                break;
+            case "<<":
+                if (n1.length + +n2 > 15) n1 = BigInt(n1), n2 = BigInt(n2);
+                break;
+            default:
+                if (n1.length > 15 || n2.length > 15) n1 = BigInt(n1), n2 = BigInt(n2);
+        }
+    }
     return f(n1, n2, s);
 }
 

package/coms/compile/autoeval_test.js

@@ -90,4 +90,8 @@ t("1<<0", '1');
 t("1<<3", '8');
 t("(1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0)",'1335')
 t("(1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0)","7973")
-t("(1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1)","21522")
+t("(1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1)","21522")
+t('1n<<32n','4294967296n');
+t('4294967296n*4294967296n','18446744073709551616n');
+t('4294967296n*2147483648n','9223372036854775808n');
+t('0x20000000n*0x1000000n','9007199254740992n');

package/coms/compile/bracket.js

@@ -0,0 +1,51 @@
+var { SCOPED, STAMP, STRAP, COMMENT, SPACE, EXPRESS, rehead, snapExpressFoot } = require("./common");
+var powermap = require("./powermap");
+var wrapb = function (t) {
+    var t = cache.pop();
+    if (t.length > 2) {
+        t.entry = '(';
+        t.leave = ')';
+        t.type = SCOPED;
+        var e = t.pop();
+        rehead(t), t = [t, e];
+    }
+    return t;
+}
+function b(body) {
+    var result = [];
+    var cache = [];
+    var pp = 0;
+    var q = [];
+    var bx = body.indexOf(body.first);
+    if (bx < 0) return;
+    for (var cx = bx, dx = body.length; cx < dx; cx++) {
+        var o = body[cx];
+        if (o.type & (COMMENT | SPACE)) continue;
+        if (o.type & (STRAP | STAMP) && o.text in powermap) {
+            var p = powermap[o.text];
+            if (o.unary) p = powermap["!"];
+            var b = body.slice(bx, cx + 1);
+            b = wrapb(b);
+            bx = cx + 1;
+            b.deep = cache.length;
+            if (p > cache[cache.length - 1] || p >= powermap["!"]) {
+                cache.push(b, p);
+                continue;
+            }
+            q.push(...b);
+            var pb = b.pop();
+            while (cache.length && cache[cache.length - 1] >= p) {
+                var p0 = cache.pop();
+                var t = cache.pop();
+            }
+        }
+    }
+    return result;
+}
+function c(exp) {
+
+}
+function bracket(exp) {
+    exp = b(exp);
+    return exp;
+}

package/coms/compile/bracket_test.js

@@ -0,0 +1,9 @@
+var test = function (a, e) {
+    var c = scanner2(a);
+    var b = bracket(c);
+    var d = common.createString(b);
+    assert(d, e);
+};
+test('a', 'a')
+test('a+b', 'a + b')
+test('a+b*c', 'a + (b * c)')

package/coms/compile/createvm.js

@@ -0,0 +1,35 @@
+import { COMMENT, SPACE, EXPRESS, createExpressList, equal_reg } from "./common";
+function createvm(code) {
+    var argNames = [];
+    var envs = code.envs;
+    var vars = code.vars;
+    var queue = unstruct(code, function (i) {
+        var name = i > 0 ? "@" + i : "@";
+        if (i >= argNames.length) argNames[i] = name;
+        return name;
+    }, true);
+    var splitName = function (name) {
+        var m = /[\.\[]/.exec(name);
+        if (m) {
+            var res = [name.slice(0, m.index)];
+            name = name.slice(m.index + m.length);
+        }
+        return [name];
+    }
+    var data = queue.map(q => {
+        for (var o of q) {
+            if (/^@/.test(o.text)) continue;
+            if (o.type === EXPRESS && !/^\./.test(o.text)) {
+                var n = o.next;
+                if (n && n.equal_reg.test(n.text)) {
+                    var expname = splitName(o.text);
+                    o.text = `get@(${expname.pop()})`;
+                    o.rest = expname;
+                }
+            }
+        }
+        return `function (get@,){${createString(q)}}`;
+    })
+    var vm = scanner2(`var ${argNames.concat(Object.keys(vars)).join(',')};\r\n#async()`);
+
+}

package/coms/compile/createvm_test.js

@@ -0,0 +1,7 @@
+var test = function (data) {
+    var code = scanner2(data);
+    code = createvm(code);
+    console.log(code.toString());
+}
+test('a');
+test('a=b');