mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tazjin/rlox): Return index after adding operations

Browse source 
Change-Id: I100eb9b55ace37e5c7c878d3c224b567ee8d1e36
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3738
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Vincent Ambo 2021-10-20 15:57:49 +02:00 committed by tazjin
parent 4ea7fc392a
commit d57e43e161
3 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
users/tazjin/rlox/src/bytecode/chunk.rs
View file

@ -1,6 +1,6 @@
use std::ops::Index;
use super::opcode::{ConstantIdx, OpCode};
use super::opcode::{CodeIdx, ConstantIdx, OpCode};
use super::value;
// In the book, this type is a hand-rolled dynamic array
@ -25,11 +25,11 @@ struct Span {
}
impl Chunk {
pub fn add_op(&mut self, data: OpCode, line: usize) -> usize {
pub fn add_op(&mut self, data: OpCode, line: usize) -> CodeIdx {
let idx = self.code.len();
self.code.push(data);
self.add_line(line);
idx
CodeIdx(idx)
}
pub fn add_constant(&mut self, data: value::Value) -> usize {

24
users/tazjin/rlox/src/bytecode/compiler.rs
View file

@ -1,7 +1,7 @@
use super::chunk::Chunk;
use super::errors::{Error, ErrorKind, LoxResult};
use super::interner::{InternedStr, Interner};
use super::opcode::{ConstantIdx, OpCode, StackIdx};
use super::opcode::{CodeIdx, ConstantIdx, OpCode, StackIdx};
use super::value::Value;
use crate::scanner::{self, Token, TokenKind};
@ -350,7 +350,7 @@ impl<T: Iterator<Item = Token>> Compiler<T> {
TokenKind::Bang => self.emit_op(OpCode::OpNot),
TokenKind::Minus => self.emit_op(OpCode::OpNegate),
_ => unreachable!("only called for unary operator tokens"),
}
};
Ok(())
}
@ -372,7 +372,7 @@ impl<T: Iterator<Item = Token>> Compiler<T> {
TokenKind::BangEqual => {
self.emit_op(OpCode::OpEqual);
self.emit_op(OpCode::OpNot);
self.emit_op(OpCode::OpNot)
}
TokenKind::EqualEqual => self.emit_op(OpCode::OpEqual),
@ -380,17 +380,17 @@ impl<T: Iterator<Item = Token>> Compiler<T> {
TokenKind::GreaterEqual => {
self.emit_op(OpCode::OpLess);
self.emit_op(OpCode::OpNot);
self.emit_op(OpCode::OpNot)
}
TokenKind::Less => self.emit_op(OpCode::OpLess),
TokenKind::LessEqual => {
self.emit_op(OpCode::OpGreater);
self.emit_op(OpCode::OpNot);
self.emit_op(OpCode::OpNot)
}
_ => unreachable!("only called for binary operator tokens"),
}
};
Ok(())
}
@ -401,7 +401,7 @@ impl<T: Iterator<Item = Token>> Compiler<T> {
TokenKind::True => self.emit_op(OpCode::OpTrue),
TokenKind::False => self.emit_op(OpCode::OpFalse),
_ => unreachable!("only called for literal value tokens"),
}
};
Ok(())
}
@ -432,16 +432,16 @@ impl<T: Iterator<Item = Token>> Compiler<T> {
match local_idx {
Some(idx) => self.emit_op(OpCode::OpSetLocal(idx)),
None => {
self.emit_op(OpCode::OpSetGlobal(ident.unwrap()));
}
self.emit_op(OpCode::OpSetGlobal(ident.unwrap()))
}
};
} else {
match local_idx {
Some(idx) => self.emit_op(OpCode::OpGetLocal(idx)),
None => {
self.emit_op(OpCode::OpGetGlobal(ident.unwrap()))
}
}
};
}
Ok(())
@ -579,9 +579,9 @@ impl<T: Iterator<Item = Token>> Compiler<T> {
Ok(())
}
fn emit_op(&mut self, op: OpCode) {
fn emit_op(&mut self, op: OpCode) -> CodeIdx {
let line = self.previous().line;
self.current_chunk().add_op(op, line);
self.current_chunk().add_op(op, line)
}
fn emit_constant(&mut self, val: Value, with_op: bool) -> ConstantIdx {

3
users/tazjin/rlox/src/bytecode/opcode.rs
View file

@ -4,6 +4,9 @@ pub struct ConstantIdx(pub usize);
#[derive(Clone, Copy, Debug)]
pub struct StackIdx(pub usize);
#[derive(Clone, Copy, Debug)]
pub struct CodeIdx(pub usize);
#[derive(Debug)]
pub enum OpCode {
/// Push a constant onto the stack.