diff --git a/valuescript_compiler/src/assembly_ast.rs b/valuescript_compiler/src/asm.rs similarity index 99% rename from valuescript_compiler/src/assembly_ast.rs rename to valuescript_compiler/src/asm.rs index c3d4be2..1692dc0 100644 --- a/valuescript_compiler/src/assembly_ast.rs +++ b/valuescript_compiler/src/asm.rs @@ -1,8 +1,8 @@ -pub struct Assembly { +pub struct Module { pub definitions: Vec, } -impl std::fmt::Display for Assembly { +impl std::fmt::Display for Module { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { for definition in &self.definitions { write!(f, "{}\n", definition)?; diff --git a/valuescript_compiler/src/assembler.rs b/valuescript_compiler/src/assembler.rs index 787c29c..b657500 100644 --- a/valuescript_compiler/src/assembler.rs +++ b/valuescript_compiler/src/assembler.rs @@ -1,11 +1,11 @@ use std::collections::HashMap; -use crate::assembly_ast::{ - Array, Assembly, Class, Definition, DefinitionContent, DefinitionRef, Function, Instruction, - InstructionOrLabel, Label, LabelRef, Object, Register, Value, +use crate::asm::{ + Array, Class, Definition, DefinitionContent, DefinitionRef, Function, Instruction, + InstructionOrLabel, Label, LabelRef, Module, Object, Register, Value, }; -pub fn assemble(assembly: &Assembly) -> Vec { +pub fn assemble(assembly: &Module) -> Vec { let mut assembler = Assembler { output: Vec::new(), fn_data: Default::default(), @@ -15,7 +15,7 @@ pub fn assemble(assembly: &Assembly) -> Vec { }, }; - assembler.assembly(assembly); + assembler.module(assembly); return assembler.output; } @@ -27,8 +27,8 @@ struct Assembler { } impl Assembler { - fn assembly(&mut self, assembly: &Assembly) { - for definition in &assembly.definitions { + fn module(&mut self, module: &Module) { + for definition in &module.definitions { self.definition(definition); } diff --git a/valuescript_compiler/src/lib.rs b/valuescript_compiler/src/lib.rs index 52aa09f..fbae6f2 100644 --- a/valuescript_compiler/src/lib.rs +++ b/valuescript_compiler/src/lib.rs @@ -1,6 +1,6 @@ +mod asm; mod assemble; mod assembler; -mod assembly_ast; mod capture_finder; mod compile; mod diagnostic;