aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarshall Lochbaum <mwlochbaum@gmail.com>2020-11-01 09:23:31 -0500
committerMarshall Lochbaum <mwlochbaum@gmail.com>2020-11-01 09:25:28 -0500
commita3cbe4c5721b6f53bac1a7edbc9137120c6c43e9 (patch)
tree332229823ec9160abf92ddf250ff6464ad51cf6d
parent4a0c297b28beb9b94c4f13b90672c02379a65e6b (diff)
Include tokenizer output when compiling
-rwxr-xr-xdc.bqn2
-rw-r--r--src/c.bqn4
-rwxr-xr-xsrc/cjs.bqn2
-rw-r--r--src/e.bqn2
4 files changed, 5 insertions, 5 deletions
diff --git a/dc.bqn b/dc.bqn
index d21bb7e3..43d694b8 100755
--- a/dc.bqn
+++ b/dc.bqn
@@ -13,7 +13,7 @@ prims ← (•Import "dzref"){𝔽} "⟨
special←<˘∘‿2⥊"𝕤𝕩𝕨𝕣𝕗𝕘"
DCompile⇐{
- ⟨bc,o,fblk,ind⟩ ← prims Compile 𝕩
+ ⟨bc,o,fblk⟩ ← 3 ↑ prims Compile 𝕩
blk‿bdy ← <˘⍉>(↕≠fblk){
⟨t,i,l,n⟩←𝕩
s←(3×i)↓(t⊑3‿5‿6)↑special
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