refactor(tvix/eval): index into Chunk with ConstantIdx/CodeIdx
This is a step towards hiding the internal fields of thunk, and making the interface of the type more predictable. Part of the preparation for implementing observers. Change-Id: I1a88a96419c72eb9e2332b56a2dd94afa47e6f88 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6447 Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
This commit is contained in:
parent
8c64ebe074
commit
1fe6cfe5a2
2 changed files with 22 additions and 8 deletions
|
|
@ -1,3 +1,5 @@
|
|||
use std::ops::Index;
|
||||
|
||||
use crate::opcode::{CodeIdx, ConstantIdx, OpCode};
|
||||
use crate::value::Value;
|
||||
|
||||
|
|
@ -31,6 +33,22 @@ pub struct Chunk {
|
|||
pub codemap: std::rc::Rc<codemap::CodeMap>,
|
||||
}
|
||||
|
||||
impl Index<ConstantIdx> for Chunk {
|
||||
type Output = Value;
|
||||
|
||||
fn index(&self, index: ConstantIdx) -> &Self::Output {
|
||||
&self.constants[index.0]
|
||||
}
|
||||
}
|
||||
|
||||
impl Index<CodeIdx> for Chunk {
|
||||
type Output = OpCode;
|
||||
|
||||
fn index(&self, index: CodeIdx) -> &Self::Output {
|
||||
&self.code[index.0]
|
||||
}
|
||||
}
|
||||
|
||||
impl Chunk {
|
||||
pub fn push_op(&mut self, data: OpCode, span: codemap::Span) -> CodeIdx {
|
||||
let idx = self.code.len();
|
||||
|
|
@ -45,10 +63,6 @@ impl Chunk {
|
|||
ConstantIdx(idx)
|
||||
}
|
||||
|
||||
pub fn constant(&self, idx: ConstantIdx) -> &Value {
|
||||
&self.constants[idx.0]
|
||||
}
|
||||
|
||||
// Span tracking implementation
|
||||
|
||||
fn push_span(&mut self, span: codemap::Span) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue