efront 4.35.8 → 4.36.1

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

@@ -6,15 +6,18 @@ const {
     createString,
 } = require("./common");
 var powermap = require("./powermap");
-var number_rep = /^([+-]?[\d\.]+)(?:e([+-]?\d+))?$/;
+var number_rep = /^([+-]?[\d\.]+)(?:e([+-]?\d+))?([ijkn]*)$/;
+var 三角函数 = `sin,cos,tan,cot,sec,csc,arcsin,arccos,arctan,arccot,arcsec,arccsc`.split(',');
 class Math extends Program {
-    number_reg = /^(\d+(?:\.\d+){0,2}|(?:\.\d+){1,2}|(?:\d+\.){1,3})\.*(?:e[+-]?\d+)?$/;
+    number_reg = /^(\d+(?:\.\d+){0,2}|(?:\.\d+){1,2}|(?:\d+\.){1,3})\.*(?:e[+-]?\d+)?[ijkn]*$/;
     powermap = Object.assign({}, powermap);
     value_reg = /^(false|true|null|Infinity|NaN|undefined|eval|this|arguments)$/;
+    straps = 三角函数;
     constructor() {
         super();
         var pmap = this.powermap;
         pmap["+-"] = pmap["-+"] = powermap["+"];
+        pmap["+."] = powermap["?."];
         pmap["×"] = pmap[".*"] = powermap["*"];
         pmap["≈"] = pmap["~="] = pmap["=="];
         pmap["≉"] = pmap["!≈"] = pmap["!~="] = pmap["~!="] = pmap["=="];
@@ -23,7 +26,13 @@ class Math extends Program {
         pmap["^"] = powermap["**"];
         pmap["_"] = powermap["?."];
         pmap["'"] = powermap["?."];
-        this.stamps.push('\\', '_');
+        var newp = powermap['new'];
+        三角函数.forEach(k => {
+            pmap[k] = newp;
+        })
+        pmap["$"] = pmap["@"] = powermap["!"];
+        this.stamps.push('\\', '_', "@", "$");
+        this.scopes.push(["|", "|"])
     }
 }
 Math.prototype.createScoped = createScoped;
@@ -49,10 +58,10 @@ var make = function (pt, left, right) {
     if (left) left = uncup(left);
     if (right) right = uncup(right);
     if (isNull(left)) {
-        return { [pt]: right instanceof Array ? ["", right] : right };
+        return { [pt]: right instanceof Array && !right.iscup ? ["", right] : right };
     }
     if (isNull(right)) {
-        return { [pt]: [left] };
+        return { [pt]: left instanceof Array && left.iscup ? left : [left] };
     }
     if (left[pt]) {
         left[pt].push(right);
@@ -94,20 +103,29 @@ var getRows = function (code) {
     var trs = [];
     var maxsize = 0;
     for (var r of rows) {
-        var row = split(r, ',').map(toFlat);
+        var row = getArgs(r);
         maxsize = row.length;
         trs.push(row);
     }
     rows.maxsize = maxsize;
+    trs.iscup = true;
     return trs;
 }
 var getArgs = function (a) {
-    return split(a, ',').map(a => {
+    var res = [];
+    res.iscup = true;
+    split(a, ',').forEach(a => {
         var cells = createExpressList(a);
         if (!cells[cells.length - 1]?.first) cells.pop();
-        if (cells.length === 1) return toFlat(cells[0]);
-        return cells.map(toFlat);
+        if (cells.length === 1) {
+            res.push(toFlat(cells[0]));
+            return;
+        }
+        cells.map(toFlat).forEach(a => {
+            res.push(a);
+        });
     });
+    return res;
 }
 var uncup = function (cup) {
     if (cup.iscup && cup.length <= 1) cup = cup[0];
@@ -142,7 +160,8 @@ var toFlat = function (exp) {
     for (var cx = 0, dx = exp.length; cx < dx; cx++) {
         var e = exp[cx];
         if (e.type & (SPACE | COMMENT)) continue;
-        if (e.type & STAMP) {
+        if (e.type & (STAMP | STRAP)) {
+            if (e.text === '.') e.text = "+.";
             var p = pmap[e.text] || 0;
             if ((!p0 || p > p0 || !left.length) && !e.ion) {
                 cache.push(left, e.text, p0);
@@ -183,6 +202,10 @@ var toFlat = function (exp) {
                     else if (f instanceof Object) {
                         left.push(make("", f, args));
                     }
+                    else if (/\d\.$/.test(f) && args.length === 1 && args[0]['/']) {
+                        f = f.replace(/\.$/, '');
+                        left.push(make("+.", f, args))
+                    }
                     else {
                         left.push({ [f]: args });
                     }
@@ -213,25 +236,32 @@ var toFlat = function (exp) {
                             else {
                                 args.push(ions);
                             }
-                            left = [make("**", left, ...args)];
+                            left = [make("^*", left, args)];
                         }
                         else {
-                            left = [make("**", left, ions)];
+                            if (ions === '*' && left[0]["["] && left.length === 1) {
+                                ions = "H";
+                            }
+                            left = [make("^*", left, ions)];
                         }
                     }
                     else {
                         var args = getArgs(e);
                         // 下标
-                        left = [make("_", left, ...args)];
+                        left = [make("_", left, args)];
                     }
                     left.iscup = true;
                 }
                 else {
                     // 矩阵
-                    left.push(getRows(e));
+                    left.push(make("[", null, getRows(e)));
                 }
             }
             else if (e.entry === "{") {
+                left.push(make("{", null, getRows(e)));
+            }
+            else if (e.entry === '|') {
+                left.push(make("^|", getRows(e)));
             }
         }
         else {
@@ -241,9 +271,9 @@ var toFlat = function (exp) {
             }
             if (e.isdigit) a: {
                 var et = e.text;
-                var [, a, e10] = number_rep.exec(et);
+                var [, a, e10, s] = number_rep.exec(et);
                 var b = a.split('.');
-                if (b.length > 2 || e10) {
+                if (b.length > 2) {
                     var nrep = b[2] || b[1];
                     var npre = b[0];
                     if (b[2]) {
@@ -257,15 +287,29 @@ var toFlat = function (exp) {
                     if (String(+nrep) === nrep) nrep = +nrep;
                     var v = [npre, nrep];
                     if (b.length > (b[2] ? 4 : b[1] ? 3 : 2)) v.push(b.slice(b[2] ? 3 : b[1] ? 2 : 1, b.length).join('.') + ".");
-                    else if (e10) v.push('');
+                    else if (e10 || s) v.push('');
                     if (e10) {
                         if (String(+e10) === e10) e10 = +e10;
                         v.push(e10);
                     }
+                    else if (s) v.push('');
+                    if (s) v.push(s);
                     v = { "..": v };
                     left.push(v);
                     continue;
                 }
+                else if (s || e10) {
+                    if (String(+a) === a) a = +a;
+                    var v = [a];
+                    if (e10) {
+                        if (String(+e10) === e10) e10 = +e10;
+                        v.push(e10);
+                    }
+                    if (s) v.push(s);
+                    v = { ".": v };
+                    left.push(v);
+                    continue;
+                }
                 var v = +a;
                 if (/^\+/.test(et)) {
                     if (String(v) !== a.slice(1)) break a;
@@ -275,7 +319,11 @@ var toFlat = function (exp) {
                 left.push(v);
                 continue;
             }
-            left.push(e.text);
+            var text = e.text;
+            if (e.type === QUOTED) {
+                text = strings.decode(text);
+            }
+            left.push(text);
         }
     }
     if (!left.length) {
@@ -290,29 +338,37 @@ var toFlat = function (exp) {
     }
     return uncup(left);
 }
-
-function main(text) {
-    var code = scanner2(text, math);
+function seprate(code, addrow) {
     var rows = split(code, ';');
     var res = [];
     res.iscup = true;
     for (var r of rows) {
         var cells = split(r, ',');
+        var cup = addrow ? res : [];
         for (var c of cells) {
             var exps = createExpressList(c);
             for (var e of exps) {
                 var a = toFlat(e);
                 if (!a) continue;
                 if (a.iscup) {
-                    for (var b of a) res.push(b, ' ');
+                    if (addrow) for (var b of a) cup.push(b, ' ');
+                    else for (var b of a) cup.push(a);
                 }
-                else res.push(a, ' ');
+                else if (addrow) cup.push(a, ' ');
+                else cup.push(a);
             }
-            if (res.length) res[res.length - 1] = ', ';
+            if (addrow && cup.length) cup[res.length - 1] = ', ';
+        }
+        if (cup.length) {
+            if (addrow) cup[res.length - 1] = '\r\n';
+            else res.push(cup.length === 1 ? cup[0] : cup);
         }
-        if (res.length) res[res.length - 1] = '\r\n';
     }
-    res.pop();
+    if (addrow) res.pop();
     return uncup(res);
 }
+function main(text) {
+    var code = scanner2(text, math);
+    return seprate(code, true);
+}
 main.MathScript = Math;

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

@@ -28,5 +28,10 @@ t(`group(
     x+y=10 tab(circle,1),
     x*y=25 tab(circle,2)
 )`)
+t(`a + -2`);
+t(`2+3i`);
 t.debug = true;
-t(`a + -2`);
+t(`@1`);
+t(`#1`);
+t(`_1`);
+t("1*|11|")

package/coms/compile//347/264/240/351/246/250.js

@@ -214,7 +214,7 @@ var wrapColor = function (k) {
     var f = color[k];
     macros[k] = function (c) {
         if (color.isColor(c)) return f(...arguments);
-        return `${k}(${Array.apply(null, arguments).join(',')})`;
+        return `${k}(${Array.prototype.join.call(arguments, ',')})`;
     };
 };
 

package/coms/zimoli/arriswise.js

@@ -33,12 +33,15 @@ var replaceArg = function (arg) {
     }
     return arg;
 };
-function build(func, argNames, argsArr) {
+function build(func, argNames, argsArr, isWrapper) {
     var newf = String(func).replace(regexps, rep);
-    return Function.apply(null, argNames.map(replaceArg).concat("return " + newf))
+    if (isWrapper) newf = newf.replace(/^\s*function[\s\S]*?\{([\s\S]*)\}\s*$/, "$1");
+    else newf = "return " + newf;
+    return Function.apply(null, argNames.map(replaceArg).concat(newf))
         .apply(this, argsArr.map(replaceArg));
 }
 var arriswise = function (func, args = []) {
+    var isWrapper = func === args[args.length - 3];
     if (isFunction(args.slice)) {
         // 兼容老方法
         var argArr = args.slice(args.length - 3 >>> 1);
@@ -46,8 +49,9 @@ var arriswise = function (func, args = []) {
         return build.call(arguments[2] || this, func,
             args.slice(0, args.length - 3 >>> 1),
             argArr,
+            isWrapper
         );
     }
     var allArgumentsNames = args[args.length - 1];
-    return build.call(this, func, allArgumentsNames, [].slice.call(args, 0));
+    return build.call(this, func, allArgumentsNames, [].slice.call(args, 0), isWrapper);
 };

package/coms/zimoli/list.js

@@ -650,8 +650,7 @@ function ylist(container, generator, $Y) {
 var allArgumentsNames = arguments[arguments.length - 1];
 if (allArgumentsNames.done) return ylist;
 allArgumentsNames.done = true;
-var xlist = arriswise.call(this, arguments[arguments.length - 3], arguments).apply(this, arguments);
-
+var xlist = arriswise.call(this, arguments[arguments.length - 3], arguments);
 var getGeneratorFromArray = function (source) {
     return function (index) {
         if (index >= source.length || index < 0) return null;

package/package.json

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