4 files changed, 80 insertions, 1 deletions
diff --git a/users/tazjin/rlox/src/bytecode/chunk.rs b/users/tazjin/rlox/src/bytecode/chunk.rs
new file mode 100644
index 000000000000..f5c0a2bb85d0
--- /dev/null
+++ b/users/tazjin/rlox/src/bytecode/chunk.rs
@@ -0,0 +1,57 @@
+use std::ops::Index;
+
+use super::opcode::OpCode;
+use super::value;
+
+// In the book, this type is a hand-rolled dynamic array
+// implementation in C. The main benefit of following that approach
+// would be avoiding issues with OpCode variants not having equal
+// sizes, but for the purpose of this I'm going to ignore that
+// problem.
+#[derive(Debug, Default)]
+pub struct Chunk {
+    code: Vec<OpCode>,
+    constants: Vec<value::Value>,
+}
+
+impl Chunk {
+    pub fn add_op(&mut self, data: OpCode) -> usize {
+        let idx = self.code.len();
+        self.code.push(data);
+        idx
+    }
+
+    pub fn add_constant(&mut self, data: value::Value) -> usize {
+        let idx = self.constants.len();
+        self.constants.push(data);
+        idx
+    }
+}
+
+impl Index<usize> for Chunk {
+    type Output = OpCode;
+
+    fn index(&self, offset: usize) -> &Self::Output {
+        self.code.index(offset)
+    }
+}
+
+// Disassembler
+pub fn disassemble(chunk: &Chunk, name: &str) {
+    println!("== {} ==", name);
+
+    for (idx, _) in chunk.code.iter().enumerate() {
+        disassemble_instruction(chunk, idx);
+    }
+}
+
+/// Print a single disassembled instruction at the specified offset.
+/// Some instructions are printed "raw", others have special handling.
+fn disassemble_instruction(chunk: &Chunk, offset: usize) {
+    print!("{:04} ", offset);
+
+    match &chunk[offset] {
+        OpCode::OpConstant(idx) => println!("OpConstant idx '{:?}'", chunk.constants[*idx]),
+        op => println!("{:?}", op),
+    }
+}
diff --git a/users/tazjin/rlox/src/bytecode/mod.rs b/users/tazjin/rlox/src/bytecode/mod.rs
index 412e73106ead..a58f610417fd 100644
--- a/users/tazjin/rlox/src/bytecode/mod.rs
+++ b/users/tazjin/rlox/src/bytecode/mod.rs
@@ -2,6 +2,19 @@
 //!
 //! https://craftinginterpreters.com/chunks-of-bytecode.html
 
+mod chunk;
+mod opcode;
+mod value;
+
+use chunk::Chunk;
+use opcode::OpCode;
+
 pub fn main() {
-    unimplemented!()
+    let mut chunk: Chunk = Default::default();
+
+    let constant = chunk.add_constant(1.2);
+    chunk.add_op(OpCode::OpConstant(constant));
+    chunk.add_op(OpCode::OpReturn);
+
+    chunk::disassemble(&chunk, "test chunk");
 }
diff --git a/users/tazjin/rlox/src/bytecode/opcode.rs b/users/tazjin/rlox/src/bytecode/opcode.rs
new file mode 100644
index 000000000000..f2b6a9f1baf3
--- /dev/null
+++ b/users/tazjin/rlox/src/bytecode/opcode.rs
@@ -0,0 +1,8 @@
+#[derive(Debug)]
+pub enum OpCode {
+    /// Access a constant for use.
+    OpConstant(usize),
+
+    /// Return from the current function.
+    OpReturn,
+}
diff --git a/users/tazjin/rlox/src/bytecode/value.rs b/users/tazjin/rlox/src/bytecode/value.rs
new file mode 100644
index 000000000000..343d142ac830
--- /dev/null
+++ b/users/tazjin/rlox/src/bytecode/value.rs
@@ -0,0 +1 @@
+pub type Value = f64;