diff options
| author | Vincent Ambo <mail@tazj.in> | 2022-09-17T16·10+0300 |
|---|---|---|
| committer | tazjin <tazjin@tvl.su> | 2022-09-17T18·58+0000 |
| commit | da9e885e06664c2dcd0e76034495970591640ded (patch) | |
| tree | 28d0523aafbfb5395976789b958823f1df1788f6 | |
| parent | 337d626f0024fe0aa732acf6c0f595a327f2a468 (diff) | |
refactor(tvix/eval): rename OpAttrsIsSet -> OpHasAttr r/4890
This matches the name of the AST node from which it was compiled. Suggested by sterni in cl/6231 Change-Id: Ia51525158d2f47467c01fce2282005b1a8417a47 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6623 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: grfn <grfn@gws.fyi>
| -rw-r--r-- | tvix/eval/src/compiler/attrs.rs | 2 | ||||
| -rw-r--r-- | tvix/eval/src/opcode.rs | 2 | ||||
| -rw-r--r-- | tvix/eval/src/vm.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tvix/eval/src/compiler/attrs.rs b/tvix/eval/src/compiler/attrs.rs index e2e932953b7c..f1441cff68d2 100644 --- a/tvix/eval/src/compiler/attrs.rs +++ b/tvix/eval/src/compiler/attrs.rs @@ -256,7 +256,7 @@ impl Compiler<'_, '_> { // After the last fragment, emit the actual instruction that // leaves a boolean on the stack. - self.push_op(OpCode::OpAttrsIsSet, &node); + self.push_op(OpCode::OpHasAttr, &node); } pub(super) fn compile_select(&mut self, slot: LocalIdx, node: ast::Select) { diff --git a/tvix/eval/src/opcode.rs b/tvix/eval/src/opcode.rs index 706aceac8357..9d7fba9ee453 100644 --- a/tvix/eval/src/opcode.rs +++ b/tvix/eval/src/opcode.rs @@ -91,7 +91,7 @@ pub enum OpCode { OpAttrsUpdate, OpAttrsSelect, OpAttrsTrySelect, - OpAttrsIsSet, + OpHasAttr, // `with`-handling OpPushWith(StackIdx), diff --git a/tvix/eval/src/vm.rs b/tvix/eval/src/vm.rs index 980a3ed0f5dd..a0eb7d8ad2ee 100644 --- a/tvix/eval/src/vm.rs +++ b/tvix/eval/src/vm.rs @@ -317,7 +317,7 @@ impl<'o> VM<'o> { self.push(value); } - OpCode::OpAttrsIsSet => { + OpCode::OpHasAttr => { let key = fallible!(self, self.pop().to_str()); let result = match self.pop() { Value::Attrs(attrs) => attrs.contains(key.as_str()), |