From 33276d7898340edef7fa456747f0f8e7b0af4b33 Mon Sep 17 00:00:00 2001
From: Marshall Lochbaum <mwlochbaum@gmail.com>
Date: Tue, 28 Sep 2021 21:27:41 -0400
Subject: Promote all headerless bodies in a block to the same kind

---
 src/c.bqn | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/c.bqn')

diff --git a/src/c.bqn b/src/c.bqn
index 40c85159..c09aac61 100644
--- a/src/c.bqn
+++ b/src/c.bqn
@@ -196,10 +196,10 @@ Parse ← {r‿vn‿i‿e‿def←𝕨⋄nv←≠vn
   hj←gi⊏˜he/hi⋄hd←2=he/hk
 
   # Block properties
-  uru←(rev⊏r=3)∧𝕩=3+⊑bI                     # _𝕣_
-  HS←H(uru+(0‿3‿5‿6+⊑bI)⍋𝕩)⊸=⋄sp←/hf<𝕩 M bI # Has-special (𝕤𝕩𝕨/𝕣𝕗/𝕘); indices of specials
+  ss←((rev⊏r=3)∧𝕩=3+⊑bI)+(0‿3‿5‿6+⊑bI)⍋𝕩    # Special name (treat _𝕣_ as 4)
+  HS←(¯1+`cf)⊏b¬∘PN=⟜ss⋄sp←/hf<𝕩 M bI       # Has-special (𝕤𝕩𝕨/𝕣𝕗/𝕘); indices of specials
   fx←HS 1⋄fr←(fx∨0⊸<)⊸+ft←2(⊣⌈2×⊢)○HS 3     # Body immediacy ¬fx, type ft, role fr
-  "Invalid special names for block header"_err_(ch/0∾/∘CB) (hr<ch/fr)∨(hm/hl)<hx<ch/fx
+  "Block header conflicts with special names"_err_(ch/0∾/∘CB) (hr<ch/fr)∨(hm/hl)<hx<ch/fx
   ft⌈↩1-˜fr↩hr⌾(ch⊸/)fr⋄fx↩hx⊸⌈⌾(ch⊸/)fx
   "Special name outside of any block"_err_(/{(0=fi)∧𝕩 M bI}∘𝕩) 0<⊑fr
   "Only blocks with explicit arguments can have multiple bodies"_err_(/CB) 1↓(»⊸∨cq>ch)<cm>fx
-- 
cgit v1.2.3