Moved NovaForth into a crate with a build script

vweb/4th/4th.rom.sym

@@ -1 +0,0 @@
-{"$BRNZ":28,"$BRZ":27,"$CALL":25,"$JMP":23,"$JMPR":24,"$PUSH":0,"$RET":26,"$SWAP":20,"advance_entry":1141,"backslash":3276,"close_paren":3267,"close_paren_stub":3275,"compare":1414,"compile_dict_start":3429,"compile_dictionary":4222,"compile_handleword":3150,"compile_instruction":1537,"compile_instruction_arg":1511,"compile_tick":1196,"cr":1067,"cursor":4210,"data_start":3340,"dict_start":3588,"dictionary":4219,"does_at_runtime":2225,"does_word":2196,"dupnz":1074,"dupnz_done":1080,"emit":1025,"emit_cursor":1042,"emit_hook":4228,"end0_pop1":1093,"end0_pop2":1092,"end1_pop2":1096,"eval":1773,"eval_word_buffer":4487,"expected_word_err":3388,"find_in_dict":1149,"find_in_dict_next":1179,"find_word":2584,"handleword_hook":4198,"heap":4195,"heap_start":4618,"hex_is_number":1280,"hex_itoa":1701,"immediate_handleword":3113,"input_number":1595,"invalid_mnemonic":3293,"invalid_mnemonic_str":3353,"is_digit":1084,"is_number":1205,"is_number_hook":4201,"itoa":1618,"itoa_hook":4204,"itoa_loop":1648,"itoa_pos":1637,"itoa_print_loop":1685,"lambda_nesting_level":4216,"lambda_start_ptr":4213,"line_len":4207,"linecomment":3209,"missing_word":3301,"missing_word_str":3340,"mnemonics":2258,"mnemonics_end":2469,"new_dict":1451,"new_dict_error":1497,"nova_asm_to":2563,"nova_bracket_tick":2634,"nova_char":2689,"nova_close_brace":3049,"nova_close_bracket":1998,"nova_colon":2146,"nova_comma":2133,"nova_compile_dotquote":2877,"nova_compile_opcode":2555,"nova_compile_open_brace":3024,"nova_compile_squote":2810,"nova_continue":2007,"nova_create":1946,"nova_dec":2660,"nova_dotquote":2856,"nova_emit":3007,"nova_exit":2099,"nova_here":2579,"nova_hex":2672,"nova_immediate":2105,"nova_immediate_open_brace":3012,"nova_literal":2654,"nova_number":1932,"nova_opcode":2550,"nova_opcode_for_word":2469,"nova_open_bracket":1990,"nova_peekr":2961,"nova_popr":2994,"nova_postpone":2017,"nova_print_stack":2907,"nova_pushr":2981,"nova_quote_string_to":2715,"nova_resolve":1568,"nova_rpick":2969,"nova_safe_opcode":2529,"nova_semicolon":2154,"nova_squote":2780,"nova_tick":2613,"nova_word":1852,"nova_word_to":1902,"nova_word_to_pad":2164,"open_paren":3250,"pad":4231,"parencomment":3211,"parse_hex_digit":1326,"pos_is_number":1234,"pos_is_number_bad":1271,"pos_is_number_done":1276,"pos_is_number_loop":1236,"print":1045,"print_number":1613,"print_stack_end":3426,"print_stack_start":3422,"push_jump":1552,"quit":3317,"quit_vector":4225,"r_stack":4522,"r_stack_ptr":4519,"skip_nonword":1388,"skip_word":1371,"stop":1024,"tick":1187,"unclosed_error":3372,"word_char":1081,"wordeq":1100}

vweb/4th/prelude.f

@@ -1,27 +0,0 @@
-: if $ brz >asm ; immediate
-: then resolve ; immediate
-: else r> $ jmpr >asm >r resolve ; immediate
-: variable create 0 , does> ;
-: arshift [ $ arshift asm ] ;
-: lshift [ $ lshift asm ] ;
-: rshift [ $ rshift asm ] ;
-: u> [ $ gt asm ] ;
-: u< [ $ lt asm ] ;
-: rdrop r> pop ;
-: over 1 pick ;
-: nip swap pop ;
-: -rot rot rot ;
-: tuck dup -rot ;
-: space 32 emit ;
-: cr 13 emit 10 emit ;
-: +! dup @ rot + swap ! ;
-: 2dup 1 pick 1 pick ;
-: allot here swap &heap +! ;
-: negate -1 ^ 1 + ;
-: free negate &heap +! here ;
-: c+! dup c@ rot + swap c! ;
-: ror dup 1 rshift swap 23 lshift | ;
-: rol dup 23 rshift swap 1 lshift | ;
-: abs dup 0 < if negate then ;
-: begin here >r ; immediate
-: until r> here - $ brz #asm ; immediate

vweb/Cargo.toml

@@ -13,6 +13,7 @@ vcore = { path = "../vcore" }
 vgfx = { path = "../vgfx" }
 vasm_core = { path = "../vasm_core" }
 forge_core = { path = "../forge_core" }
+novaforth = { path = "../novaforth" }
 wasm-bindgen = "0.2"
 serde = { version = "1.0", features = ["derive"] }
 serde-wasm-bindgen = "0.4"

vweb/src/lib.rs

@@ -21,4 +21,4 @@ pub fn source_map(snippet: String) -> JsValue {
 #[wasm_bindgen]
 pub fn compile_forge(src: String) -> Result<String, String> {
     build_boot(src.as_str(), true).map(|s| s.join("\n")).map_err(|e| format!("{}", e))
-}
+}

vweb/src/nova_forth.rs

@@ -1,3 +1,4 @@
+use novaforth::{PRELUDE, ROM, SYMBOLS};
 use wasm_bindgen::prelude::wasm_bindgen;
 
 #[wasm_bindgen]
@@ -6,11 +7,10 @@ pub struct NovaForth;
 #[wasm_bindgen]
 impl NovaForth {
     pub fn rom() -> Vec<u8> {
-        Vec::from(*include_bytes!("../4th/4th.rom"))
+        Vec::from(ROM)
     }
-
     pub fn symbols() -> String {
-        include_str!("../4th/4th.rom.sym").into()
+        String::from(SYMBOLS)
     }
-    pub fn prelude() -> String { include_str!("../4th/prelude.f").into() }
+    pub fn prelude() -> String { String::from(PRELUDE) }
 }