From 53d823956b7fae503ca4d614312b8b2f60647bed Mon Sep 17 00:00:00 2001
From: Marshall Lochbaum <mwlochbaum@gmail.com>
Date: Thu, 31 Mar 2022 21:22:18 -0400
Subject: =?UTF-8?q?Under=20support=20for=20=C2=A8=E2=8C=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/r1.bqn | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/r1.bqn b/src/r1.bqn
index 98df23e9..fbf2deda 100644
--- a/src/r1.bqn
+++ b/src/r1.bqn
@@ -397,22 +397,25 @@ under←{
     a ← Decompose⊸(1⊸⊑⊸((0<·≠0⊑⊣)◶⟨SD 2⊑⊣,{r↩1⋄𝕩}⟩) ⍟(StructD⊣)) _perv 𝕩
     ⟨⟩‿@‿a‿⟨d,r⟩ _s
   }
+  Es ← {f‿a‿i‿q←𝕩⋄{f‿a‿𝕩‿q _s}⌜i}
   _nested ← {
     p0‿p1←(⌊⋈⌈)´pw‿px←0⊸⊑⌜a←(1 Expand 1⊑Decompose)⌜ 𝕨‿𝕩
     p ← 0+´×`(⊑⟜pw=⊑⟜px)⌜↕p0
-    (p↓0⊑a)
     (p=p1)◶⟨
-      Nest 𝔽○{f‿a‿i‿q←𝕩⋄{f‿a‿𝕩‿q _s}⌜i}
+      Nest 𝔽○Es
       {𝕩_s}(2↑⊢)∾𝔽○(2⊸⊑)⋈⌈¨○(3⊑⊢)
     ⟩´a
   }
+  _withNest ← {
+    (0<+○IsStruct)◶⟨𝔽, Nest 𝔽○(Es∘(1 Expand 1⊑Decompose)⍟IsStruct)⟩
+  }
 
   _amb ← {(IsStruct⊢)◶⟨𝕏, 𝕩‿𝕗{𝕨𝕏𝕗}⟩}
   _mon ← {(𝕗_amb𝕩)⊘(NS𝕩)}
   _dy  ← {(NS𝕩)⊘(𝕗_amb𝕩)}
   k‿v ← Split2 ⟨
     "⊢⊣˜∘○⊸⟜⊘◶",  ⊢  # ˙ handled specially
-    "´˝",         {r←𝕩⋄{IsArray∘⊢◶⟨E,𝕗_r⟩}}
+    "´˝",         {r←𝕩⋄{IsArray∘⊢◶⟨E,𝔽_r⟩}}
     "=≠≢",        1‿0 _mon
     "<",          0‿2 _mon
     "⋈",          0‿2 {+○IsStruct◶⟨𝕏, 𝕩‿𝕗{𝕨𝕏𝕗}⊘E, Nest 𝕏⟩}
@@ -424,7 +427,8 @@ under←{
     "⊑",          1‿2 _amb
     ">",          2‿1 _mon
     "∾",          2‿1 {+○IsStruct◶⟨𝕏, 𝕩‿𝕗{𝕨𝕏𝕗}⊘E, 𝕏_nested⟩}
-  # "˘⎉¨⌜",
+    "¨⌜",         {m←𝕩⋄{𝔽 _m _withNest}}
+  # "˘⎉",
   # "⚇",
   ⟩
   NSPrim ← (Type-3˙)◶⟨NS, {m←𝕩⋄{NS(𝕗_m)˙0}}, {m←𝕩⋄{NS(𝕗_m_𝕘)˙0}}⟩
-- 
cgit v1.2.3