efront 4.3.8 → 4.3.10

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -1,3 +1,6 @@
+- zh-CN: 六十进制
+  en:    sexagesimal
+
 - zh-CN: 翻译工具
   en:    translation tool
 

package/coms/compile/Program.js

@@ -448,7 +448,7 @@ class Program {
                 if (isdigit && lasttype === STAMP) {
                     var last = queue.last;
                     var prev = last.prev;
-                    if ((!prev || prev.type & (STAMP | STRAP)) && /^[+\-]+$/.test(last.text)) {
+                    if ((!prev || prev.type & (STAMP | STRAP) && !/^(\+\+|\-\-)$/.test(prev.text)) && /^[+\-]+$/.test(last.text)) {
                         last.type = VALUE;
                         last.text += m;
                         lasttype = VALUE;

package/coms/compile/common.js

@@ -55,6 +55,7 @@ var skipAssignment = function (o, cx) {
                     break;
                 case "++":
                 case "--":
+                    if (needpunc && o.unary) break loop;
                     next();
                     break;
                 case "!":

package/coms/compile/unstruct.js

@@ -1,4 +1,4 @@
-var { SPACE, COMMENT, EXPRESS, STRAP, QUOTED, STAMP, SCOPED, VALUE, LABEL, canbeTemp: _canbeTemp, isEval, createString, skipAssignment, skipSentenceQueue, isHalfSentence, splice, relink, createExpressList, snapExpressHead, snapExpressFoot } = require("./common");
+var { SPACE, COMMENT, EXPRESS, STRAP, QUOTED, STAMP, SCOPED, VALUE, LABEL, canbeTemp: _canbeTemp, isEval, createString, skipAssignment, pickSentence, skipSentenceQueue, isHalfSentence, splice, relink, createExpressList, snapExpressHead, snapExpressFoot } = require("./common");
 var scanner2 = require("./scanner2");
 var returnText = function () { return this.text };
 var NodeNotClone = o => Object.assign(Object.create(null), o, { toString: returnText });
@@ -54,7 +54,7 @@ var mount_break = function (body, cx, b1s, iscontinue) {
 }
 var _break = function (body, cx, result, iscontinue) {
     var re = result[result.length - 1];
-    if (!result.length || re.ret_ && !re.await_ && re.ret_ !== -2) return;
+    if (!result.length || result.length === 1 && re.ret_ && !re.await_ && re.ret_ !== -2) return;
     var _b = scanner2('return []');
     _b.ret_ = -1;
     mount_break(body, cx, [_b[1]], iscontinue);
@@ -144,6 +144,7 @@ var _withset = function (text, tmpname, valname) {
 };
 var _switch = function (body, cx, unblock, result, getname) {
     var o = body[cx];
+    var O = o;
     o = o.next;
     if (!o) return;
     var qt = ternary(o, getname, true);
@@ -492,7 +493,11 @@ var remove_end_comma = function (o) {
 };
 var ispropcall = function (o) {
     var n = o.next;
-    if (!n || n.type !== SCOPED || n.entry !== '(') return false;
+    if (!n) return false;
+    if (n.type === STAMP) {
+        if (!/^(\+\+|\-\-|[^!=><]+\=|>>>?=|<<=)$/.test(n.text)) return false;
+    }
+    else if (n.type !== SCOPED || n.entry !== '(') return false;
     if (o.type === EXPRESS && snapExpressHead(o) !== o) return true;
     if (o.type === SCOPED && o.entry === '[' && snapExpressHead(o) !== o) return true;
     return false;
@@ -961,10 +966,10 @@ var _express = function (body, getname, ret) {
         }
         if (o.type & (STRAP | STAMP)) {
             var p = 0;
-            if (/[!~]|\+\-|\-\+/.test(o.text)) p = powermap["!"];
-            if (!p && /[\+\-]/.test(o.text)) p = needpunc ? powermap["+"] : powermap["!"];
+            if (/^([!~]|\+\-|\-\+)*$/.test(o.text)) p = powermap["!"];
+            if (!p && /^[\+\-]$/.test(o.text)) p = needpunc ? powermap["+"] : powermap["!"];
             if (!p) p = powermap[o.text];
-            needpunc = false;
+            if (o.unary) needpunc = false;
             var b = body.slice(bx, cx + 1);
             bx = cx + 1;
             b.index = nameindex;

package/coms/compile/unstruct_test.js

@@ -133,6 +133,18 @@ test("predef[key[1]][key[2]][key[3]]", '_ = key[1]; _ = predef[_]; _0 = key[2];
 test("[key[1]][key[2]][key[3]]", '_ = key[1]; _ = [_]; _0 = key[2]; _ = _[_0]; _0 = key[3]; _[_0]');
 test("[key[1]][key[2]]+[key[3]][key[4]]", '_ = key[1]; _ = [_]; _0 = key[2]; _ = _[_0]; _0 = key[3]; _0 = [_0]; _1 = key[4]; _ + _0[_1]');
 test("if(a)a:{break a}", "if (!a) return [2, 0]; return [1, 0];\r\n return [1, 0]", true);
-unstruct.debug = true;
 test("rgb=(rgb<<8|rgb>>16)&0xffffff", "_ = rgb << 8, _0 = rgb >> 16, _ = _ | _0; _ = (_); rgb = _ & 0xffffff", true);
-test(`if (c) a; else return true; return false`, "if (!c) return [1, 0]; a; return [2, 0];\r\n return [true, 2];\r\n return [false, 2]")
+test(`if (c) a; else return true; return false`, "if (!c) return [1, 0]; a; return [2, 0];\r\n return [true, 2];\r\n return [false, 2]")
+test(`switch(a){case a:a=a?1:0;break;case b:a=b;break;}`, "if (a === a) return [1, 0]; if (a === b) return [4, 0]; return [5, 0];\r\n if (!a) return [1, 0]; a = 1; return [2, 0];\r\n a = 0; return [1, 0];\r\n return [2, 0];\r\n a = b; return [1, 0]");
+test(`a=typeof a!==1`, "_ = typeof a, a = _ !== 1");
+test(`a[0]++`, "a[0]++");
+test(`1+a[0]++`, "_ = a[0]++, 1 + _");
+test(`a[0]++ + 1`, "_ = a[0]++, _ + 1");
+test(`a[0]-- + 1`, "_ = a[0]--, _ + 1");
+test(`a[0]-- +1`, "_ = a[0]--, _ + 1");
+test(`a[0]--+1`, "_ = a[0]--, _ + 1");
+test(`a[0]+++1`, "_ = a[0]++, _ + 1");
+unstruct.debug = true; r++;
+test(`c=b\r\n++a`, "c = b; ++a");
+test(`c=b+\r\n++a`, "_ =\r\n++a, c = b + _");
+test(`c=b+ ++a`, "_ = ++a, c = b + _");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.3.8",
+    "version": "4.3.10",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {