Pass VM-provided functionality through the objects array, not a function argument

1 files changed, 8 insertions, 8 deletions

diff --git a/src/pr.bqn b/src/pr.bqn
index d9ae5ef4..a93bd4eb 100755
--- a/src/pr.bqn
+++ b/src/pr.bqn
@@ -24,11 +24,15 @@ Inc ← {
 }
 
 # Required functionality passed in as an argument
-pnam ← ⟨"IsArray","Type","Log","GroupLen","GroupOrd"⟩∾names⊏˜chr⊐"!+-×÷⋆⌊=≤≢⥊⊑↕⌜`⊘"
+def ← ⟨"IsArray","Type","Log","GroupLen","GroupOrd"⟩
+keep ← "!+-×÷⋆⌊=≤≢⥊⊑↕⌜`⊘"
+ki ← chr⊐keep
+kt ← (+`nc)(∾((≠def)∾¯1↓⊣)+⊔⟜⊒∘⍋)ki
+names ↩ (⥊¨kt⊏chr)⌾(ki⊸⊏)names
 
 
 E_isdef ← (3≤≠)◶⟨0,∧´⟨chr," ","←↩"⟩∊˜¨3⊸↑⟩
-E_proc ← {
+E_proc ← ({𝕨∘𝕩}´ {𝕨•_R_𝕩}⟜⥊¨⟜(≠↑chr˜) def)∘{
   l←≠chr
   q←≠`𝕩∊"""'" ⋄ f←¬∨`q¬⊸∧𝕩='#'
   ∾ (((l×f/q)+chr⊸⊐) (≥⟜l)◶⟨⊑⟜names,⥊∘⊢⟩¨ ⊢) f/𝕩
@@ -39,9 +43,5 @@ E_redef ← { # handles [fmd] [←↩]
   (E_proc 1↑𝕩) ∾ "←" ∾ tail
 }
 
-ref ← ∾ ∾⟜(•UCS 10)¨ ∾⟨
-  ⟨"{"⟩
-  ⟨"←𝕩"∾˜"⟨"∾"⟩"∾˜1↓∾","⊸∾¨pnam⟩
-  E_isdef◶E_proc‿E_redef¨ impl∾<"⟨"∾"⟩"∾˜1↓⥊","⊸∾˘∾chrs
-  ⟨"}"⟩
-⟩
+ref ← ∾∾⟜(•UCS 10)¨ E_isdef◶E_proc‿E_redef¨ impl∾<"⟨"∾"⟩"∾˜1↓⥊","⊸∾˘chr
+⟨ref, def+○≠keep⟩