efront 4.3.9 → 4.3.10

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

@@ -969,7 +969,7 @@ var _express = function (body, getname, ret) {
             if (/^([!~]|\+\-|\-\+)*$/.test(o.text)) p = powermap["!"];
             if (!p && /^[\+\-]$/.test(o.text)) p = needpunc ? powermap["+"] : powermap["!"];
             if (!p) p = powermap[o.text];
-            needpunc = /^(\+\+|\-\-)$/.test(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

@@ -137,7 +137,6 @@ test("rgb=(rgb<<8|rgb>>16)&0xffffff", "_ = rgb << 8, _0 = rgb >> 16, _ = _ | _0;
 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");
-unstruct.debug = true; r++;
 test(`a[0]++`, "a[0]++");
 test(`1+a[0]++`, "_ = a[0]++, 1 + _");
 test(`a[0]++ + 1`, "_ = a[0]++, _ + 1");
@@ -145,3 +144,7 @@ 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.9",
+    "version": "4.3.10",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {