diff --git a/genRuntime b/genRuntime index 16c98b92..1591902b 100755 --- a/genRuntime +++ b/genRuntime @@ -5,7 +5,7 @@ args←•args path←⊑•args CC ← {𝕨 •FChars ⟨1,path,𝕩⟩ •Import "cc.bqn"} "src/gen/src" •FChars "#define RT_SRC 0"∾@+10 - "src/gen/compiler"CC"c" + "src/gen/compiles"CC"cc" "src/gen/runtime0"CC"r0" "src/gen/runtime1"CC"r1" "src/gen/formatter"CC"f" diff --git a/makefile b/makefile index 8a802ed2..48c30683 100644 --- a/makefile +++ b/makefile @@ -124,9 +124,9 @@ ${bd}/%.o: src/builtins/%.c src/gen/customRuntime: @echo "Copying precompiled bytecode from the bytecode branch" - git checkout remotes/origin/bytecode src/gen/{compiler,formatter,runtime0,runtime1,src} - git reset src/gen/{compiler,formatter,runtime0,runtime1,src} -${bd}/load.o: src/gen/customRuntime + git checkout remotes/origin/bytecode src/gen/{compiles,formatter,runtime0,runtime1,src} + git reset src/gen/{compiles,formatter,runtime0,runtime1,src} +${bd}/load.o: src/gen/compiles diff --git a/src/load.c b/src/load.c index f507df23..520aa765 100644 --- a/src/load.c +++ b/src/load.c @@ -356,10 +356,11 @@ void load_init() { // very last init function B prevAsrt = runtime[n_asrt]; runtime[n_asrt] = bi_casrt; // horrible but GC is off so it's fiiiiiine Block* comp_b = load_compImport( - #include "gen/compiler" + #include "gen/compiles" ); runtime[n_asrt] = prevAsrt; - load_comp = m_funBlock(comp_b, 0); ptr_dec(comp_b); + B glyphs = m_hVec3(m_str32(U"+-×÷⋆√⌊⌈|¬∧∨<>≠=≤≥≡≢⊣⊢⥊∾≍⋈↑↓↕«»⌽⍉/⍋⍒⊏⊑⊐⊒∊⍷⊔!"), m_str32(U"˙˜˘¨⌜⁼´˝`"), m_str32(U"∘○⊸⟜⌾⊘◶⎉⚇⍟⎊")); + load_comp = c1(m_funBlock(comp_b, 0), glyphs); ptr_dec(comp_b); gc_add(load_comp);