efront 4.35.4 → 4.35.5

package/coms/basic/math.js

@@ -137,6 +137,12 @@ var funcmap = {
     abs(a) {
         return `<mo>|</mo>${a}<mo>|</mo>`;
     },
+    log(x, n) {
+        return `<msub><mo>log</mo>${n}</msub>${x}`
+    },
+    ln(x){
+        return `<mo>ln</mo>${x}`
+    },
     "div"(...args) {
         return mo3("÷", args);
     },
@@ -295,7 +301,7 @@ var br = function () {
 function toString(obj, p, deep) {
     if (obj instanceof Array) {
         if (deep == 1 && obj.length === 2 && obj[1].tab) {
-            return toString(obj[0], 0, deep) +"</mtd><mtd>"+ obj.slice(1, obj.length).map(a => toString(a, 0, 0)).join("</mtd><mtd>");
+            return toString(obj[0], 0, deep) + "</mtd><mtd>" + obj.slice(1, obj.length).map(a => toString(a, 0, 0)).join("</mtd><mtd>");
         }
         deep++;
         var args = obj.map(a => toString(a, deep > 1 ? 0 : p, deep));

package/coms/basic/math.md

@@ -337,6 +337,17 @@ series(公式主体,n=1,+Infinity)
     corner(A);
     corner(BAC);
 ```
+* 对数
+```mathscript
+    log(x,2);
+    log(x,e);
+    ln(x);
+```
+```math
+    log(x,2);
+    log(x,e);
+    ln(x);
+```
 
 ## 希腊字母对照表如下
 按此表中的英文单词命名的变量将自动转换为希腊字母

package/coms/basic/strings.js

@@ -5,6 +5,7 @@ var escapeMap = {
     "\b": "\\b",
     "\f": "\\f",
     "\v": "\\u000b",
+    "\\": "\\\\",
     "\u2028": "\\u2028",
     "\u2029": "\\u2029",
 };
@@ -44,7 +45,7 @@ var esc = function (a) {
 function uncode(s) {
     return s.replace(/\\u(?:\{[0-9a-f]+\}|[0-9a-f]{4})/ig, esc);
 }
-function kicode(s) {
+function kicode(s, singleSlash = false) {
     var t = [];
     return s.replace(/\\(?:u\{[0-9a-f]+\}|u[0-9a-f]{4}|x[0-9a-f]{2}|([0-7]{1,3}|[\s\S]))/ig, (a, b, i) => {
         if (!b) {
@@ -63,17 +64,19 @@ function kicode(s) {
         }
         if (unescapeMap.hasOwnProperty(a)) return unescapeMap[a];
         if (/^[0-7]+$/.test(b)) return String.fromCharCode(parseInt(b, 8));
+        if (b === singleSlash) return b;
+        if (singleSlash) return '\\' + b;
         return b;
     });
 }
-function decode(s) {
+function decode(s, singleSlash) {
     var r = /^(['"`])([\s\S]*)\1$/.exec(s);
     if (!r) return s;
-    return kicode(r[2]);
+    return kicode(r[2], singleSlash ? r[1] : null);
 }
 
-function recode(s) {
-    s = decode(s);
+function recode(s, singleSlash) {
+    s = decode(s, singleSlash);
     s = encode(s);
     return s;
 }

package/coms/compile/Html.js

@@ -133,7 +133,7 @@ class Html extends Javascript {
 }
 var property = new Program;
 property.stamps = "=".split('');
-var p = new Javascript;
+var progExp = new Javascript;
 var replaceISO8859 = function (data) {
     return String(data).replace(/<\!--([\s\S]*)--\>$/g, '$1').replace(/&\w+;/g, a => iso8859[a] || a).replace(/&#(\d+);/g, (_, a) => String.fromCodePoint(a))
 };
@@ -142,8 +142,8 @@ var parseExpress = function (data, mayberepeat) {
         data = `for(var ${data});`;
     }
     else data = "=" + replaceISO8859(data);
-    p.lastIndex = 0;
-    return p.exec(data);
+    progExp.lastIndex = 0;
+    return progExp.exec(data);
 };
 
 var toCamelCase = function (a) {
@@ -151,8 +151,12 @@ var toCamelCase = function (a) {
 }
 
 var isDynamic = a => /^(on|@|\-|_|\.|#|\:|\+|\*|\?|&|\$|\S+\-)|(@|\-|_|\.|#|\:|\+|\*|\?|&|\$)$/i.test(a);
-
+var decode = strings.decode;
+var decode2 = function (s) {
+    return decode(s, true);
+}
 Html.prototype.createScoped = function (code) {
+    progExp.mindpath = this.mindpath;
     var used = Object.create(null);
     var vars = Object.create(null);
     var rootvars = vars;
@@ -197,7 +201,7 @@ Html.prototype.createScoped = function (code) {
                         var nn = c.next.next;
                         if (!nn || nn.length > 0) return;
                         if (nn.type === EXPRESS || nn.type === QUOTED) {
-                            rootvars[strings.decode(createString([nn]))] = true;
+                            rootvars[decode(createString([nn]))] = true;
                         }
                     }
                 }
@@ -219,12 +223,14 @@ Html.prototype.createScoped = function (code) {
                     break;
                 }
                 if (noTag || !c.text) break;
-                var t = strings.decode(c.text);
+                var t = decode2(c.text);
                 if (color.isColor(t)) break;
                 var p = c.prev;
                 var pp = p && p.prev;
                 if (pp && isDynamic(pp.text)) {
                     var mayberepeat = p && pp && p.type === STAMP && p.text === "=" && /[\:\-\_@\&\*\?\#\+\.\$](src|repeat|for|each|foreach)$/i.test(pp.text)
+                    progExp.col = c.col;
+                    progExp.row = c.row;
                     t = parseExpress(t, mayberepeat);
                     var s = createScoped(t);
                     var envs = s.envs;
@@ -242,6 +248,8 @@ Html.prototype.createScoped = function (code) {
                 if (inScript || noTag) break;
                 if (c.queue.type === QUOTED) break;
                 var t = c.text;
+                progExp.col = c.col;
+                progExp.row = c.row;
                 t = parseExpress(t);
                 var s = createScoped(t);
                 var envs = s.envs;
@@ -301,7 +309,7 @@ Html.prototype.createScoped = function (code) {
     scoped.envs = envs;
     scoped.vars = vars;
     scoped.used = used;
-
+    delete progExp.mindpath;
     return scoped;
 };
 Html.prototype.createString = common.createString;

package/coms/compile/Program.js

@@ -179,6 +179,8 @@ class Program {
     lbtype = false;
     keepspace = false;
     lastIndex = 0
+    col = 1;
+    row = 1;
     detectLabel(o) {
         var queue = o.queue;
         var last = queue.last;
@@ -413,7 +415,7 @@ class Program {
             }
             queue.push(scope);
         };
-        var row = 1, colstart = -1;
+        var row = this.row, colstart = -this.col;
         var cache_stamp = null;
         var powermap = this.powermap;
         var push_stamp = function () {

package/coms/compile/autoeval.js

@@ -54,7 +54,7 @@ var punc_3 = {
         if (s && n1.length + +n2 > 15) {
             return BigInt(n1) << BigInt(n2) + s;
         }
-        return (n2 << n1) + s;
+        return (n1 << n2) + s;
     },
     ">"(n1, n2, s) {
         return String(+n1 > +n2);
@@ -84,7 +84,7 @@ var punc_3 = {
         return (n1 & n2) + s;
     },
     "||"(n1, n2, s) {
-        return (+n2 || +n1) + s;
+        return (+n1 || +n2) + s;
     },
     "&&"(n1, n2, s) {
         return (+n1 && + n2) + s;

package/coms/compile/autoeval_test.js

@@ -86,3 +86,8 @@ tc("Math.log(f) / Math.LN2 / 10 | 0", "Math.log(f) * 0.14426950408889633 | 0");
 tc("Math.log(f) / Math.LN2 / 10 * 10 | 0", "Math.log(f) * 1.4426950408889634 | 0");
 tc("Math.log(f) / Math.LN2 / 10 ** 2 | 0", "Math.log(f) * 0.014426950408889633 | 0");
 // tf(path.join(__dirname, "../zimoli/spacechar_test.js"))
+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")

package/coms/compile/scanner2.js

@@ -252,7 +252,7 @@ function scan(text) {
                 type = a;
                 break;
             default:
-                throw new Error('无效参数: ' + type);
+                throw new Error('无效参数: ' + a);
         }
     }
     if (!type) {

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

@@ -71,7 +71,7 @@ var replace_punc = function (a) {
 }
 var killcalc = a => replace_punc(createString(a));
 var seprateFunc = function (express) {
-    var express = scanner2(express, rarg);
+    var express = scanner2(express, rarg, basepath[0] || base || '');
     var sps = [];
     var sp = [];
     for (var cx = 0, dx = express.length; cx < dx; cx++) {
@@ -109,7 +109,7 @@ var seprateFunc = function (express) {
 }
 var splitParams = function (params) {
     if (!params) return [];
-    params = scanner2(params, rarg);
+    params = scanner2(params, rarg, basepath[0] || base || '');
     var code = params;
     var params = [], p = [];
     for (var cx = 0, dx = code.length; cx < dx; cx++) {
@@ -125,7 +125,7 @@ var splitParams = function (params) {
     return params;
 }
 var createArgMap = function (args, split = ',', equal = ':') {
-    if (args) args = scanner2(args, rarg);
+    if (args) args = scanner2(args, rarg, basepath[0] || base || "");
     else args = [];
     var map = Object.create(null);
     var o = args.first;
@@ -727,7 +727,7 @@ var rcss = null;
 function 素馨(text, scopeName, compress) {
     if (!rcss) rcss = new 素心;
     rcss.debug = true;
-    var code = scanner2(text, rcss);
+    var code = scanner2(text, rcss, scopeName || "");
     var { scoped } = code;
     var result = evalscoped(scoped, scopeName);
     var queried = [];

package/package.json

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