From c73e84d95777c304f1b208cbc43b01012df73262 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 26 Aug 2022 20:54:39 +0300 Subject: refactor(tvix/eval): add opcode::StackIdx type for less ambiguity Change-Id: I9b9de1f681972c205d4d20bc5731d2ce79858edb Reviewed-on: https://cl.tvl.fyi/c/depot/+/6287 Tested-by: BuildkiteCI Reviewed-by: sterni --- tvix/eval/src/opcode.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'tvix/eval/src/opcode.rs') diff --git a/tvix/eval/src/opcode.rs b/tvix/eval/src/opcode.rs index f265ef06d7f5..82b72952d698 100644 --- a/tvix/eval/src/opcode.rs +++ b/tvix/eval/src/opcode.rs @@ -11,6 +11,11 @@ pub struct ConstantIdx(pub usize); #[derive(Clone, Copy, Debug)] pub struct CodeIdx(pub usize); +/// Index of a value in the runtime stack. +#[repr(transparent)] +#[derive(Clone, Copy, Debug)] +pub struct StackIdx(pub usize); + /// Offset by which an instruction pointer should change in a jump. #[repr(transparent)] #[derive(Clone, Copy, Debug)] @@ -63,7 +68,7 @@ pub enum OpCode { OpAttrsIsSet, // `with`-handling - OpPushWith(usize), + OpPushWith(StackIdx), OpPopWith, OpResolveWith, @@ -78,7 +83,7 @@ pub enum OpCode { OpAssertBool, // Access local identifiers with statically known positions. - OpGetLocal(usize), + OpGetLocal(StackIdx), // Close scopes while leaving their expression value around. OpCloseScope(usize), // number of locals to pop -- cgit 1.4.1