1 files changed, 17 insertions, 18 deletions
diff --git a/src/lib.rs b/src/lib.rs
index a657354..ff00605 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,21 +1,20 @@
-mod addressing;
-mod syntactic_token;
-mod semantic_token;
-mod tokenizer;
-mod error;
-mod assembler;
+#![feature(io_error_more)]
+#![feature(map_try_insert)]
 
-pub use addressing::{CharAddress, SourceLocation, BytecodeLocation};
-pub use syntactic_token::{SyntacticToken, SyntacticTokenType};
-pub use semantic_token::{SemanticToken, SemanticTokenType, LabelDefinition, MacroDefinition};
-pub use error::Error;
-pub use tokenizer::TokenIterator;
-pub use assembler::Assembler;
 
-pub fn assemble(source_code: &str) -> (Vec<u8>, Vec<SemanticToken>) {
-    let mut assembler = Assembler::new();
-    assembler.tokenise_source(source_code);
-    assembler.resolve_references();
-    assembler.generate_bytecode()
-}
+mod gather_libraries;
+mod symbol_resolver;
 
+pub use gather_libraries::*;
+pub use symbol_resolver::*;
+
+mod locators;
+mod tokens;
+mod translators;
+
+pub use locators::*;
+pub use tokens::*;
+pub use translators::*;
+
+mod print;
+pub use print::*;