basedpl 0.1.46 → 0.1.48

package/bpl.tmLanguage.json

@@ -6,7 +6,7 @@
   ],
   "patterns": [
     {
-      "begin": "⍝",
+      "begin": "[⍝注]",
       "beginCaptures": {
         "0": {
           "name": "comment.line.bpl"
@@ -48,15 +48,15 @@
       "name": "source.bpl"
     },
     {
-      "match": "•[A-Za-z_∆⍙][A-Za-z0-9_∆⍙]*",
+      "match": "[•系][A-Za-z_∆⍙][A-Za-z0-9_∆⍙]*",
       "name": "support.function.system.bpl"
     },
     {
-      "match": "¯?∞|¯?(\\d+(\\.\\d+)?|\\.\\d+)([eEₑ]¯?\\d+)?([jJⱼ]¯?(\\d+(\\.\\d+)?|\\.\\d+)([eEₑ]¯?\\d+)?|ₓ|[rᵣ]¯?\\d+)?",
+      "match": "[¯负負]?[∞永]|[¯负負]?(\\d+([.内內]\\d+)?|[.内內]\\d+)([eEₑ][¯负負]?\\d+)?([jJⱼ][¯负負]?(\\d+([.内內]\\d+)?|[.内內]\\d+)([eEₑ][¯负負]?\\d+)?|ₓ|[rᵣ][¯负負]?\\d+)?",
       "name": "constant.numeric.bpl"
     },
     {
-      "match": "⍬ₓ?",
+      "match": "[⍬空]ₓ?",
       "name": "constant.numeric.bpl"
     },
     {
@@ -85,23 +85,23 @@
       }
     },
     {
-      "match": "[\\+\\-×÷⌈⌊\\|\\*⍟○π√!∧∨⊼⊽\\~=≠<≤>≥⍳↦:⍴≢≡,⍪⊂⊃⊆∊∪∩⍋⍒↑↓⌽⊖⍉⊤⊥⍎⍕⌷⌹\\#↕⍭⨸⌻⍸⍷⊢⊣¿]",
+      "match": "[\\+加\\-减減×乘号號÷除⌈上⌊下\\|绝余絕餘\\*幂冪⍟对對○圆圓π周√根!阶拣階揀∧极且極∨析或⊼方否⊽双莫雙\\~非无無=等≠别初別<小≤限退>大≥达进達進⍳位↦至:键卸鍵⍴形≢数异數異≡同深,连連⍪接矩⊂包⊃选合選⊆巢段∊属展屬∪并独併獨∩交重⍋升⍒降↑取↓去拆⌽转轉⊖纵縱⍉翻⊤编編⊥译譯⍎行⍕文⌷索⌹解逆\\#复複↕窗⍭素⨸因⌻零值⍸处间處間⍷寻群尋⊢右⊣左¿掷抽擲]",
       "name": "support.function.bpl"
     },
     {
-      "match": "[¨⍨⊗⌸∂/⌿\\\\⍀⁰¹²³⁴⁵⁶⁷⁸⁹⁻ᵀᵘ]",
+      "match": "[¨遍⍨己换換⊗表⌸组組⇄优優∂导梯導/总總⌿汇匯\\\\累⍀续續⁰¹²³⁴⁵⁶⁷⁸⁹⁻ᵀᵘ]",
       "name": "keyword.operator.monadic.bpl"
     },
     {
-      "match": "[↣⍤∘⍠⍥↢\\.⍣⇄⊘@⍚⌺]",
+      "match": "[↣先⍤秩∘承⍠轴軸⍥经經↢后後\\.内內⍣次止⊘兼@于於⍚择擇⌺邻鄰]",
       "name": "keyword.operator.dyadic.bpl"
     },
     {
-      "match": "[⍺⍵⍶⍹∇⍢]",
+      "match": "[⍺甲⍵乙⍶丙⍹丁∇递遞⍢循]",
       "name": "variable.parameter.bpl"
     },
     {
-      "match": "[←⎕⋄\\?₀₁₂₃₄₅₆₇₈₉₋]",
+      "match": "[←是⎕出入⋄句\\?若₀₁₂₃₄₅₆₇₈₉₋]",
       "name": "keyword.control.bpl"
     }
   ]

package/input.js

@@ -1,4 +1,5 @@
 ((symbols, layout) => {
+    const comments = new Set(symbols.filter(s => s.kind === 'comment').flatMap(s => [...s.glyph, ...s.hanzi.join('')]));
     // US physical keys, before macOS Option or another layout transforms event.key.
     const punctuation = {Backquote: '`~', Minus: '-_', Equal: '=+', BracketLeft: '[{', BracketRight: ']}',
         Backslash: '\\|', Semicolon: ';:', Quote: "'\"", Comma: ',<', Period: '.>', Slash: '/?'};
@@ -34,14 +35,15 @@
     }
     const reset = () => { pending = null; };
 
-    // At each level (exact, prefix, prefixes of hyphen-separated parts) a name outranks a search word, as in `matches` in `symbols.rs`.
+    // Every name ranks alike at each level: exact, prefix, then prefixes of hyphen-separated parts. Each match carries the name it
+    // matched by, the glyph name where several of a glyph's names match equally, as in `matches` in `symbols.rs`.
     function matches(query) {
         query = query.toLowerCase();
         const letters = word => word.replaceAll('-', '');
         let best = Infinity, found = [];
-        for (const {glyph, name, monad, dyad, aliases} of symbols) {
-            let rank = Infinity;
-            [name, monad, dyad, ...aliases.split(' ')].filter(Boolean).forEach((word, i) => {
+        for (const {glyph, name, monad, dyad} of symbols) {
+            let rank = Infinity, matched;
+            [name, monad, dyad].filter(Boolean).forEach(word => {
                 const level = letters(word) === query ? 0 : letters(word).startsWith(query) ? 1 : 2;
                 if (level === 2) {
                     let rest = query;
@@ -54,10 +56,10 @@
                     }
                     if (rest) return;
                 }
-                rank = Math.min(rank, 2 * level + (i > 0));
+                if (level < rank) { rank = level; matched = word; }
             });
             if (rank < best) { best = rank; found = []; }
-            if (rank < Infinity && rank === best) found.push([glyph, name]);
+            if (rank < Infinity && rank === best) found.push([glyph, matched]);
         }
         // A name that is a prefix of every other match wins: `om gives omega, `omu gives omega-underbar.
         const shortest = found.find(([, a]) => found.every(([, b]) => letters(b).startsWith(letters(a))));
@@ -81,7 +83,7 @@
             } else if (c === "'" || c === '"') {
                 quote = python && text.startsWith(c.repeat(3), i) ? c.repeat(3) : c;
                 i += quote.length - 1;
-            } else if (c === (python ? '#' : '⍝')) comment = true;
+            } else if (python ? c === '#' : comments.has(c)) comment = true;
         }
         return !quote && !comment;
     }

package/layout.json

@@ -5,6 +5,7 @@
  "option": {
   "`": "⋄",
   "1": {"state": "diaeresis"},
+  "2": "⌽",
   "3": "√",
   "4": "⇄",
   "5": {"state": "subscript"},
@@ -60,7 +61,6 @@
   ".": "↣",
   "<": "≤",
   ">": "≥",
-  "|": "⌽",
   "/": "¿"
  },
  "states": {

package/lb.js

@@ -94,8 +94,8 @@
         toggle.textContent = overlay ? '▼' : '▲';
         d.body.style.paddingTop = overlay || bar.hidden ? originalPadding : `${bar.offsetHeight}px`;
     }
-    const names = new Map(symbols.map(({glyph, name, monad, dyad, aliases}) =>
-        [glyph, [...new Set([name, monad, dyad, aliases].join(' ').split(' ').filter(Boolean))].join(' ')]));
+    const names = new Map(symbols.map(({glyph, name, monad, dyad}) =>
+        [glyph, [name, monad, dyad].filter(Boolean).join(' ')]));
     function stateGlyphs(state) {
         const {terminator, keys} = layout.states[state];
         return [terminator, ...Object.values(keys).flatMap(value => typeof value === 'string' ? [value] : stateGlyphs(value.state))];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "basedpl",
-  "version": "0.1.46",
+  "version": "0.1.48",
   "description": "BasedPL, the Based-array Programming Language, is an APL-derived array language, borrowing ideas from J and BQN, with an emphasis on simple, consistent notation.",
   "license": "Apache-2.0",
   "repository": {