efront 4.4.2 → 4.4.3

package/coms/compile/common.js

@@ -125,7 +125,15 @@ var skipAssignment = function (o, cx) {
             break;
         case STRAP:
             if (needpunc) {
-                if (!/^(in|instanceof|of|else|as|from)$/.test(o.text)) break loop;
+                if (!/^(in|instanceof|of|else|as|from|catch|finally)$/.test(o.text)) {
+                    break loop;
+                }
+                if (o.text === 'catch') {
+                    next();
+                    if (o && o.entry === '(') next();
+                    needpunc = false;
+                    break;
+                }
                 if (o.text === 'else') {
                     if (!ifdeep) break loop;
                     ifdeep--;
@@ -134,21 +142,16 @@ var skipAssignment = function (o, cx) {
                 next();
                 needpunc = false;
             }
-            else if (/^(try|catch|finally)$/.test(o.text)) {
-                next();
-                if (o.entry === "(") next();
-                next();
-            }
             else if (o.text === 'else') {
                 if (ifdeep <= 0) break loop;
                 ifdeep--;
                 needpunc = false;
                 next();
             }
-            else if (/^(if|while|with|switch)$/.test(o.text)) {
+            else if (/^(if|while|with|switch|try)$/.test(o.text)) {
                 if (o.text === 'if') ifdeep++;
                 next();
-                next();
+                if (o.entry === "(") next();
             }
             else if (o.text === 'do') {
                 next();

package/coms/compile/common_test.js

@@ -34,6 +34,10 @@ testPickSentence(`a+b\r\n++c`, 5, "++c")
 testPickSentence(`a+b++\r\nc`, 5, "c")
 testPickSentence(`a+b++\r\nc`, 5, "c")
 testPickSentence(`a+b++\r\n+c`, 6, "a + b++\r\n+ c")
+testPickSentence(`if(a)try{}catch{}a;`, 0, "if (a) try {} catch {}")
+testPickSentence(`if(a)try{}catch(a){}a;`, 0, "if (a) try {} catch (a) {}")
+testPickSentence(`if(a)try{}catch{} else a;`, 0, "if (a) try {} catch {} else a")
+testPickSentence(`if(a)try{}catch{} else if(a);`, 0, "if (a) try {} catch {} else if (a)")
 assert(common.createString(common.pickArgument(scanner2(`a={a:1,c:d}`)[2][4])), 'c: d')
 assert(common.createString(common.pickArgument(scanner2(`a=class{a=1\r\nc=d}`)[3][4])), 'c = d')
 assert(common.createString(common.pickArgument(scanner2(`(a=1,c=d)`)[0][4])), 'c = d')

package/coms/compile/unstruct_test.js

@@ -125,7 +125,6 @@ test("menus[a+b]()", "_ = a + b; menus[_]()", true);
 test(`switch(a){default: a;case 1:b;}`, 'if (a === 1) return [2, 0]; return [1, 0];\r\n a; return [1, 0];\r\n b; return [1, 0]', true);
 test("loop:{a=b;if(a) continue loop}", "a = b; if (a) return [0, 0]", true);
 test("if(a)try{}finally{}else a;", 'if (!a) return [4, 0]; return [1, 8];\r\n return [0, 9];\r\n return [1, 9];\r\n return [2, 0];\r\n a; return [1, 0]')
-test("if(a)try{}finally{}else;", 'if (!a) return [4, 0]; return [1, 8];\r\n return [0, 9];\r\n return [1, 9];\r\n return [1, 0]');
 test("b:while(t){switch(a){case c:break b;}}", 'if (!t) return [1, 0]; if (a === c) return [1, 0]; return [0, 0]');
 test("predef[key[1]](r.slice(key[0].length).trim())", '_ = key[1]; _0 = key[0].length; _0 = r.slice(_0); _0 = _0.trim(); predef[_](_0)');
 test("predef[key[1]](r.slice())(r.slice())", '_ = key[1]; _0 = r.slice(); _ = predef[_](_0); _0 = r.slice(); _(_0)');
@@ -149,7 +148,8 @@ test(`a[0]-- > 1`, "_ = a[0]--, _ > 1");
 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 + _");
-unstruct.debug = true; r++;
 test(`c=b+ +a`, "_ = +a, c = b + _");
 test(`c=b+ !a`, "_ = !a, c = b + _");
 test(`do {var loadcount = 0;} while (loadcount !== 0);`, `loadcount = 0; _ = loadcount !== 0; if (_) return [0, 0]`);
+unstruct.debug = true; r++;
+test("if(a)try{a}catch{};a;", 'if (!a) return [4, 0]; return [1, 7];\r\n a; return [0, 9];\r\n return [1, 9];\r\n return [1, 0];\r\n a');

package/package.json

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