efront 4.25.2 → 4.26.0

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

@@ -1,6 +1,3 @@
-- zh-CN: "不能有特殊符号\"$1\""
-  en:    "Cannot have special symbol '$1'"
-
 - zh-CN: 不启用
   en:    Disable
 
@@ -43,6 +40,15 @@
 - zh-CN: 英语
   en:    English
 
+- zh-CN: 大写锁定已打开
+  en:    Capitalization lock turned on
+
+- zh-CN: 数字键盘已关闭
+  en:    The numeric keypad is turned off
+
+- zh-CN: "不能有特殊符号\"$1\""
+  en:    "Cannot have special symbol '$1'"
+
 - zh-CN: 商店
   en:    Store
 

package/coms/basic/i18n-supports.js

@@ -15,7 +15,9 @@ var supports = [
     { land: i18n`芬兰语`, name: `suomi`, id: "fin", lang: "fi" },
     { land: i18n`希腊语`, name: `Ελληνικά`, id: "el", lang: "el" },
     { land: i18n`西班牙语`, name: `Español`, id: "spa", lang: "es" },
-    { land: i18n`葡萄牙语`, name: `Português`, id: "pt", lang: /pt\-(BR|PT)/ },
+    { land: i18n`葡萄牙语`, name: `Português`, id: "pt", lang: "pt" },
+    // { land: i18n`葡萄牙语（巴西）`, name: `Português`, id: "pt", lang: "pt-BR" },
+    // { land: i18n`葡萄牙语（葡萄牙）`, name: `Português`, id: "pt", lang: "pt-PT" },
     { land: i18n`匈牙利语`, name: `Húngaro`, id: "hu", lang: 'hu' },
     { land: i18n`瑞典语`, name: `Svenska`, id: "swe", lang: 'sv' },
     { land: i18n`丹麦语`, name: `Dansk`, id: "dan", lang: 'da' },

package/coms/compile/Javascript.js

@@ -47,6 +47,7 @@ class Javascript extends Program {
     strapexp_reg = /^(new|void|typeof|delete|class|function|await)/;
     forceend_reg = /^(return|yield|break|continue|debugger|async)$/;
     defaultType = EXPRESS;
+    lbtype = true;
 }
 var propresolve_reg = /^(static|get|set|async|readonly|private|pub)$/;
 

package/coms/compile/Javascript_test.js

@@ -54,6 +54,7 @@ testDetour('0o1ll.a', '0o1ll["a"]')
 var ts = new Javascript;
 ts.straps.push('interface', 'implements', "declare", "module", "readonly", "enum", 'type');
 ts.tags[0].push("{")
+ts.lbtype = false;
 var testTypescript = function (text) {
     var s = scanner2(text, ts);
     return assert(s.toString(), text);

package/coms/compile/Program.js

@@ -149,6 +149,7 @@ class Program {
     control_reg = /^(if|else|switch|case|do|while|for|loop|break|continue|default|import|from|as|export|try|catch|finally|throw|await|yield|return)$/;
     type_reg = /^(var|let|const|function|fn|func|class|interface|type|struct|enum|impl|local)$/;
     nocase = false
+    lbtype = false;
     keepspace = false;
     lastIndex = 0
     detectLabel(o) {
@@ -171,7 +172,6 @@ class Program {
                     o.isprop = true;
                     break;
                 }
-                if (last.type & (STAMP | STRAP) || last.istype) break;
                 inExpress = true;
                 if (!queue.question) queue.question = 1;
                 else queue.question++;
@@ -206,9 +206,15 @@ class Program {
                     queue.question--;
                     if (last.type === STAMP && last.text === '?') {
                         inExpress = false;
-                        o.istype = true;
-                        last.istype = true;
-                        last.type = EXPRESS;
+                        var lp = last.prev;
+                        if (lp) {
+                            var lpp = lp.prev;
+                            if (lpp?.type === EXPRESS) {
+                                lpp.type = LABEL;
+                            }
+                            lp.needle = true;
+                            last.needle = true;
+                        }
                     }
                     else {
                         inExpress = true;
@@ -239,8 +245,7 @@ class Program {
                 if (!queue.isargl && last.type & (EXPRESS | STRAP | VALUE | QUOTED)) {
                     // label
                     var lp = last.prev;
-                    if (lp && lp.type === STAMP && lp.text === ',') {
-                        o.istype = true;
+                    if (lp && !this.lbtype && lp.type === STAMP && lp.text === ',') {
                         break;
                     }
                     if (!lp || lp.type !== STRAP || !lp.transive || lp.isend) {