basedpl 0.1.47 → 0.1.49

package/bpl.tmLanguage.json

@@ -89,11 +89,11 @@
       "name": "support.function.bpl"
     },
     {
-      "match": "[¨遍⍨己换換⊗表⌸组組∂导梯導/总總⌿汇匯\\\\累⍀续續⁰¹²³⁴⁵⁶⁷⁸⁹⁻ᵀᵘ]",
+      "match": "[¨遍⍨己换換⊗表⌸组組⇄优優∂导梯導/总總⌿汇匯\\\\累⍀续續⁰¹²³⁴⁵⁶⁷⁸⁹⁻ᵀᵘ]",
       "name": "keyword.operator.monadic.bpl"
     },
     {
-      "match": "[↣先⍤秩∘承⍠轴軸⍥经經↢后後\\.内內⍣次止⇄返⊘兼@于於⍚择擇⌺邻鄰]",
+      "match": "[↣先⍤秩∘承⍠轴軸⍥经經↢后後\\.内內⍣次止⊘兼@于於⍚择擇⌺邻鄰]",
       "name": "keyword.operator.dyadic.bpl"
     },
     {

package/input.js

@@ -35,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;
@@ -55,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))));

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.47",
+  "version": "0.1.49",
   "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": {