diff options
1 files changed, 9 insertions, 8 deletions
| -rw-r--r-- | assembler/src/parser/mod.rs | 17 |
diff --git a/assembler/src/parser/mod.rs b/assembler/src/parser/mod.rs index af78478..5dbedf6 100644 --- a/assembler/src/parser/mod.rs +++ b/assembler/src/parser/mod.rs @@ -1,13 +1,15 @@ mod code_gen; mod syntax; +mod instruction; use std::collections::HashMap; use crate::Word; #[derive(Debug, Default)] -pub(crate) struct Instruction { - name: String, - args: Vec<Address>, +pub(crate) struct Program { + definitions: HashMap<String, Address>, + constants: Vec<Word>, + instructions: Vec<Instruction>, } #[derive(Debug, Default, PartialEq, Eq, Clone)] @@ -28,9 +30,8 @@ impl Address { } } -#[derive(Debug, Default)] -pub(crate) struct Program { - definitions: HashMap<String, Address>, - constants: Vec<Word>, - instructions: Vec<Instruction>, +#[derive(Debug, Default, Clone)] +pub(crate) struct Instruction { + name: String, + args: Vec<Address>, } |
