diff options
| author | Marshall Lochbaum <mwlochbaum@gmail.com> | 2022-04-08 21:31:58 -0400 |
|---|---|---|
| committer | Marshall Lochbaum <mwlochbaum@gmail.com> | 2022-04-08 21:31:58 -0400 |
| commit | f01267f78cb2c3a472ab314e22e4c0c3c101c1ae (patch) | |
| tree | af424f7fa524e8ddfd23ff79908a3fef01cc3c3c /src | |
| parent | 2fca5a5bc5e8787792901af30bf5fe0846d1db12 (diff) | |
Fix bug when merging some nested results in structural Under
Diffstat (limited to 'src')
| -rw-r--r-- | src/r1.bqn | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -381,10 +381,8 @@ under←{ }⍟(>⟜(IsArray 2⊑⊢)) Expand2 ← { xf‿xa‿xi‿xq ← 𝕩 - i ← { - f‿a‿i‿q←1 Expand xf‿xa‿𝕩‿xq - {f‿a‿𝕩‿q _s}⍟(1-IsStruct)⌜⍟(0<≠f) i - }⌜ xi + E ← { f‿a‿i‿q←𝕩 ⋄ {f‿a‿𝕩‿q _s}⍟(1-IsStruct)⌜⍟(0<≠f) i } + i ← (E 1 Expand IsStruct◶{xf‿xa‿𝕩‿xq}‿(1⊑Decompose))⌜ xi ⟨⟩‿@‿i‿⟨1,1⟩ } _s ← { @@ -440,7 +438,7 @@ under←{ "´˝", {r←𝕩⋄{IsArray∘⊢◶⟨E,𝔽_r⟩}} "=≠≢", 1‿0 _mon "<", 0‿2 _mon - "⋈", 0‿2 {+○IsStruct◶⟨𝕏, 𝕩‿𝕗{𝕨𝕏𝕗}⊘E, Nest 𝕏⟩} + "⋈", 0‿2 {+○IsStruct◶⟨𝕏, 𝕩‿𝕗{𝕏𝕗}⊘E, Nest 𝕏⟩} "≍", 1‿1 _mon # Dyad combines "↕/»«", 1‿1 _dy "⊔", 1‿2 _dy @@ -448,7 +446,7 @@ under←{ "↑↓", {(1‿2 _amb𝕩)⊘(1‿1 _amb𝕩)} "⊑", 1‿2 _amb ">", 2‿1 _mon - "∾", 2‿1 {+○IsStruct◶⟨𝕏, 𝕩‿𝕗{𝕨𝕏𝕗}⊘E, 𝕏_nested⟩} + "∾", 2‿1 {+○IsStruct◶⟨𝕏, 𝕩‿𝕗{𝕏𝕗}⊘E, 𝕏_nested⟩} "¨⌜", {m←𝕩⋄{𝔽 _m _withNest}} "˘", {𝕩⋄{𝔽 _rankStruct_ ¯1}} "⎉", rankStruct˙ |