aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarshall Lochbaum <mwlochbaum@gmail.com>2022-03-31 21:22:18 -0400
committerMarshall Lochbaum <mwlochbaum@gmail.com>2022-03-31 22:05:20 -0400
commit53d823956b7fae503ca4d614312b8b2f60647bed (patch)
tree3b6ea204808083f95f7a9cc6b57634d0cb66a4b4 /src
parentdce7136fc0f17bf9c4c7a2fe8109dc9069aeb59f (diff)
Under support for ¨⌜
Diffstat (limited to 'src')
-rw-r--r--src/r1.bqn12
1 files changed, 8 insertions, 4 deletions
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}}⟩