From d6e6b1d3aba62e70e01235636957d56499c95fa9 Mon Sep 17 00:00:00 2001 From: ctsk <9384305+ctsk@users.noreply.github.com> Date: Wed, 29 Mar 2023 20:07:31 +0200 Subject: [PATCH] [rlox] Use fewer files --- rlox/src/bytecode.rs | 5 ----- rlox/src/main.rs | 10 +++------- rlox/src/{chunk.rs => vm.rs} | 8 ++++++-- 3 files changed, 9 insertions(+), 14 deletions(-) delete mode 100644 rlox/src/bytecode.rs rename rlox/src/{chunk.rs => vm.rs} (91%) diff --git a/rlox/src/bytecode.rs b/rlox/src/bytecode.rs deleted file mode 100644 index acc18d6..0000000 --- a/rlox/src/bytecode.rs +++ /dev/null @@ -1,5 +0,0 @@ -#[repr(u8)] -#[derive(Debug)] -pub enum Op { - Return -} diff --git a/rlox/src/main.rs b/rlox/src/main.rs index 6c9c045..a65eff0 100644 --- a/rlox/src/main.rs +++ b/rlox/src/main.rs @@ -1,11 +1,7 @@ -mod chunk; -mod bytecode; - -use chunk::Chunk; -use bytecode::Op; +mod vm; fn main() { - let mut chunk = Chunk::new("TEST".to_string()); - chunk.add(Op::Return); + let mut chunk = vm::Chunk::new("TEST".to_string()); + chunk.add(vm::Op::Return); println!("{:?}", chunk); } diff --git a/rlox/src/chunk.rs b/rlox/src/vm.rs similarity index 91% rename from rlox/src/chunk.rs rename to rlox/src/vm.rs index 3e65e46..1715a2a 100644 --- a/rlox/src/chunk.rs +++ b/rlox/src/vm.rs @@ -1,7 +1,11 @@ -use crate::Op; - use std::fmt; +#[repr(u8)] +#[derive(Debug)] +pub enum Op { + Return +} + pub struct Chunk { code: Vec, name: String