Add r0 and r1 options to cjs.bqn

1 files changed, 7 insertions, 7 deletions

diff --git a/src/pr.bqn b/src/pr.bqn
index d8d1c8e6..560dd2b0 100755
--- a/src/pr.bqn
+++ b/src/pr.bqn
@@ -11,15 +11,15 @@ alias‿def ← (⊑¨ ≍○< 1⊸↓¨) ⟨"?Type","∩Fill","⍣Log",
                            "$GroupLen","%GroupOrd","⍝_fillBy_"⟩
 keep ← "!+-×÷⋆⌊=≤≢⥊⊑↕⌜`⊘⎊"
 chrext ← glyphs ∾¨ ((+´·∧`'_'=0‿¯1⊸⊏)¨def) ⊔ alias
+Typ ← chrext⊸((+`≠¨)∘⊣⍋∾⊸⊐)
 
-in‿out ← rtt ⊑ {
-  in0‿out0 ← ⟨"∩⍝+-×⌊=≤≢⥊⊑↕⌜", "⌊⌈|<>≠≥⊢⊣∾↑↓⊏˙˜´∘○⊸⟜◶⍟"⟩
-  in1 ← ⍷ out0 ∾˜ in2 ← alias∾keep
-  out2 ← ∾glyphs
-  ⟨ in0‿out0, in1‿out2, in2‿out2 ⟩
-}
+in0‿out0 ← ⟨"∩⍝+-×⌊=≤≢⥊⊑↕⌜⊘", "⌊⌈|<>≠≥⊢⊣∾↑↓⊏˙˜´∘○⊸⟜◶⍟"⟩
+in2 ← alias∾keep
+out2 ← ∾glyphs
+in‿out ← rtt ⊑ ⟨in0,out0⟩‿⟨⍷in2∾out0,out2⟩‿⟨in2,out2⟩
 
-need ⇐ chrext⊸((+`≠¨)∘⊣⍋∾⊸⊐)⊸⊔ in
+inputs ⇐ ⟨out0, (⍋Typ)⊸⊏in2⟩
+need ⇐ Typ⊸⊔ in
 
 GetRepls ← { c‿n←𝕩 ⋄ ⟨c,c⊣⌾((c∊⥊¨in)⊸/)n⟩∾¨⟨def,⥊¨alias⟩ }