Flatter way to compute multi-body indices

1 files changed, 2 insertions, 2 deletions

diff --git a/src/c.bqn b/src/c.bqn
index 542aca5d..7a0e6e4f 100644
--- a/src/c.bqn
+++ b/src/c.bqn
@@ -302,8 +302,8 @@ Parse ← {r‿vn‿i‿e‿def←𝕨⋄nv←≠vn
   # Instruction source positions
   MI←-⊸↓˜⟜≠∾g⊏˜⊢⋄oj←(rt-∘≠⊸⌽oi⌊1-˜≠i)Mi∾⟨1-˜at,oa,fa⟩
   ind←⟨oj,oj Mi fa⊏IT»¬ro∨ma⟩(¯1∾˜or⊏(≠rt)⊸⌽)⊸⊏¨i‿e
-  cg←((⊏⟜cw∾0˙)+3ׯ1+`⊏⟜cf∾1˙)⊸⊔/cm∨↩fx∧1≠cw
-  ci←<˘⍉∧∘∾¨˝(1‿1≍0‿2)⊏⍉∘‿3⥊cg              # Indices for multi-body blocks
+  cj←/1+1=ciw←cw⊏˜ci←/cm∨↩fx∧1≠cw
+  ci↩<˘∘‿2⥊(cj⊸⊏⊔˜¯1(↑∾˜cj(⊒∘⊣+⊏)(1<ciw)+↓)2ׯ1+`⊏⟜cf∾1˙)ci  # Indices for multi-body blocks
   fq←⟨cf/ft,cf/¬fx,ci⌾((cf/cm)⊸/)/cf⟩       # Per-function data
   cq←⟨/1∾or≥oc-○≠rt,fsc+≠¨dn,dn,dx⟩         # Per-body data
   ⟨oc∾¯1⊑rc,u,fq,cq,ind⟩                    # Overall output