From afe7ed08468408a48970b389c31312cdc4ef5a0e Mon Sep 17 00:00:00 2001
From: Marshall Lochbaum <mwlochbaum@gmail.com>
Date: Tue, 10 Aug 2021 22:03:57 -0400
Subject: =?UTF-8?q?Correctly=20determine=20which=20bodies=20can=20use=20?=
 =?UTF-8?q?=F0=9D=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

(limited to 'src')

diff --git a/src/c.bqn b/src/c.bqn
index e5381371..1093cf61 100644
--- a/src/c.bqn
+++ b/src/c.bqn
@@ -175,6 +175,7 @@ Parse ← {r‿vn‿i‿e‿def←𝕨⋄nv←≠vn
   hm←¬ho∨ha←ho<(0=hr)∧1=hn                  # Mask for main name; header arguments
   "Invalid header structure"_err_(hm//∘HF) 1⊸»⊸=hm/hc
   hm>↩hc⋄hr/˜↩hm⋄hx←(1»hc)/ha               # Header-derived role hr and immediacy ¬hx
+  cw←(hc/»ha)⌾(ch⊸/)1+-⟜«cm×1«cf            # Body 𝕨: 0 no, 1 allowed, 2 required
   hl/˜↩hm⋄hm↩hm⌾(hf⊸/)hf
   "Header left argument without right"_err_(/HF) ha>hc+`⊸⊏hx∾0
   hx∨↩1=hr
@@ -233,7 +234,7 @@ Parse ← {r‿vn‿i‿e‿def←𝕨⋄nv←≠vn
   nf←H ac<xv=vi-˜⊑bG                        # Namespace bodies
   fw←H gi⊏nx                                # Bodies where 𝕨 must be defined
   {"Can't return Nothing (·)"_err_(𝕩⊏⍋∘Rev) 2=fw⌈↩nf¬⊸×𝕩⊏nr} 1-˜0∾cc⊏rev
-  "Invalid use of 𝕨 in monadic case"_err_(/CB) 1↓fw∧cf∧cm
+  "Invalid use of 𝕨 in monadic case"_err_(/CB) 1↓fw∧cw=0
   nn←fo+`⊸⊏fw⋄no(⊣-=)↩nn⋄ne(⊣-=)↩nn         # fw indicates 𝕨 is never Nothing
   "Assignment target must be a name or list of targets"_err_(G) (a∨aid∨ps∨𝕩(=⟜(3+⊑)<M)bB)<aa
   "Can't nest assignments (write aliases with ⇐)"_err_(ai⊏G) (ak=2)<ai⊏aa
-- 
cgit v1.2.3