From a3cbe4c5721b6f53bac1a7edbc9137120c6c43e9 Mon Sep 17 00:00:00 2001 From: Marshall Lochbaum Date: Sun, 1 Nov 2020 09:23:31 -0500 Subject: Include tokenizer output when compiling --- src/c.bqn | 4 ++-- src/cjs.bqn | 2 +- src/e.bqn | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/c.bqn b/src/c.bqn index 2e5c8e63..594984ef 100644 --- a/src/c.bqn +++ b/src/c.bqn @@ -195,7 +195,7 @@ LEB←{ } Compile←{ - ⟨tok,role,val,ind⟩←Tokenize 𝕩 + ⟨tok,role,val,ind⟩←tx←Tokenize 𝕩 ⟨bc,prim,blk,indb⟩←⟨role,⊑val,ind⟩ Parse tok - ⟨bc, ∾⟨prim⊏𝕨⟩∾1↓val, <˘⍉>blk, indb⟩ + ⟨bc, ∾⟨prim⊏𝕨⟩∾1↓val, <˘⍉>blk, indb, tx⟩ } diff --git a/src/cjs.bqn b/src/cjs.bqn index f6ebf1d0..15c51a71 100755 --- a/src/cjs.bqn +++ b/src/cjs.bqn @@ -2,7 +2,7 @@ compile ← •Import "c.bqn" useInd ← "-i"≡⊑args←•args ⋄ args↓˜↩useInd -Comp ← (-¬useInd) ↓ ((<"runtime["∾⍕∾"]"˙)¨↕62)⊸Compile +Comp ← (3+useInd) ↑ ((<"runtime["∾⍕∾"]"˙)¨↕62)⊸Compile FP ← ∞⊸=◶⟨⍕,"Infinity"⟩ Esc ← (⟨"\t","\n","\r","\'","\"""⟩∾<∘⥊)⊑˜("'"""∾˜@+9‿10‿13)⊑∘⊐⊢ Str ← "str("""∾(∾Esc¨)∾""")"˜ diff --git a/src/e.bqn b/src/e.bqn index 9511c4ad..0f7be235 100644 --- a/src/e.bqn +++ b/src/e.bqn @@ -18,7 +18,7 @@ Shadow ← { } Explain ← { - b‿const‿blk‿i ← 𝕨 + b‿const‿blk‿i‿tok ← 𝕨 ba‿bc‿bo‿bp ← '0'-˜⟨ # For each instruction, number of: "11111000000000010000022000" # Arguments "000//232323223102303200121" # Stack values consumed -- cgit v1.2.3