efront 4.35.5 → 4.35.7

package/coms/basic/JSAM_test.js

@@ -11,10 +11,10 @@ var test_self = function () {
     test(null) // null;
     test(undefined); // 空字符串
     test(1); // 1
-    test([0]); 
+    test([0]);
     test(["00"]);
-    test({"0":"00"});
-    test({"00":"00"});
+    test({ "0": "00" });
+    test({ "00": "00" });
     test(true); // true
     test(false); // false 
     test(NaN); // NaN 
@@ -353,10 +353,8 @@ function test_encode() {
 function JSAM_test() {
     test_self();
     test_json();
-    JSAM.debug = true;
     test_deep();
     test_parse();
-    JSAM.debug = false;
     test_time();
     test_encode();
 }

package/coms/basic/math.js

@@ -140,7 +140,7 @@ var funcmap = {
     log(x, n) {
         return `<msub><mo>log</mo>${n}</msub>${x}`
     },
-    ln(x){
+    ln(x) {
         return `<mo>ln</mo>${x}`
     },
     "div"(...args) {
@@ -326,7 +326,7 @@ function toString(obj, p, deep) {
         var origin = obj[k];
         if (k === '..') {
             var [prefix, rep, dots, e] = origin;
-            prefix = String(prefix);
+            prefix = String(prefix).replace(/^\-/, '–');
             if (typeof rep === 'number') rep = String(rep);
             if (rep && !/\./.test(prefix)) prefix += '.';
             if (typeof e === 'number') e = String(e);
@@ -340,7 +340,7 @@ function toString(obj, p, deep) {
             else rep = mn(rep);
             if (dots) dots = mn(dots);
             else dots = '';
-            if (e) e = `<mo>×</mo><msup><mn>10</mn><mn>${e}</mn></msup>`;
+            if (e) e = `<mo>×</mo><msup><mn>10</mn><mn>${String(e).replace(/^\-/, '–')}</mn></msup>`;
             else e = '';
             prefix = mn(prefix);
             return mrow([prefix, rep, dots, e].join(''), e ? p >= pmap["*"] : false, deep);

package/coms/basic/strings.js

@@ -5,7 +5,6 @@ var escapeMap = {
     "\b": "\\b",
     "\f": "\\f",
     "\v": "\\u000b",
-    "\\": "\\\\",
     "\u2028": "\\u2028",
     "\u2029": "\\u2029",
 };

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/wraphtml.js

@@ -1,3 +1,3 @@
 function wrapHtml(htmldata) {
-    return htmldata ? "`" + String(htmldata).trim().replace(/>\s+</g, "><").replace(/\\[^`]/g, "\\$&") + "`" : '``';
+    return htmldata ? `\`${String(htmldata).replace(/>\s+</g, "><").trim()}\`` : '``';
 }

package/coms/compile//347/256/227/345/274/217.js

@@ -6,7 +6,7 @@ const {
     createString,
 } = require("./common");
 var powermap = require("./powermap");
-var number_rep = /^[+-]?([\d\.]+)(?:e([+-]?\d+))?$/;
+var number_rep = /^([+-]?[\d\.]+)(?:e([+-]?\d+))?$/;
 class Math extends Program {
     number_reg = /^(\d+(?:\.\d+){0,2}|(?:\.\d+){1,2}|(?:\d+\.){1,3})\.*(?:e[+-]?\d+)?$/;
     powermap = Object.assign({}, powermap);

package/coms/compile//347/256/227/345/274/217_test.js

@@ -1,5 +1,6 @@
 var JSON = require('../basic_/JSON')
 var t = function (text, want) {
+    算式.debug = t.debug;
     var obj = 算式(text);
     if (t.debug) console.log(JSON.toJS(obj, null, 4))
 };
@@ -23,8 +24,9 @@ t(`H[+]`)
 t(`H[2-]`)
 t(`H'*1`)
 t(`cos(theta,2)*E +(1 - cos(theta))*K'*K+sin(theta)*[0,-K_2,K_1;K_2,0,-K_0;-K_1,K_0,0]`)
-t.debug = true;
 t(`group(
     x+y=10 tab(circle,1),
     x*y=25 tab(circle,2)
-)`)
+)`)
+t.debug = true;
+t(`a + -2`);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.35.5",
+    "version": "4.35.7",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {