github/ValueScript
1
1
Fork 0
mirror of https://github.com/voltrevo/ValueScript.git synced 2026-01-14 16:08:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use take for TakeRegister

Browse Source
This commit is contained in:
Andrew Morris
2023-06-21 17:20:45 +10:00
parent b33ef2b5b0
commit 910f6684f5
3 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
valuescript_vm/src/bytecode_decoder.rs
View File

@@ -1,4 +1,5 @@
use std::collections::BTreeMap;
use std::mem::take;
use std::rc::Rc;
use num_bigint::BigInt;
@@ -96,7 +97,7 @@ impl BytecodeDecoder {
return BytecodeType::from_byte(self.peek_byte());
}
pub fn decode_val(&mut self, registers: &Vec<Val>) -> Val {
pub fn decode_val(&mut self, registers: &mut Vec<Val>) -> Val {
return match self.decode_type() {
BytecodeType::End => panic!("Cannot decode end"),
BytecodeType::Void => Val::Void,
@@ -138,12 +139,10 @@ impl BytecodeDecoder {
Val::Void => Val::Undefined,
val => val,
},
BytecodeType::TakeRegister => {
match registers[self.decode_register_index().unwrap()].clone() {
Val::Void => Val::Undefined,
val => val,
}
}
BytecodeType::TakeRegister => match &mut registers[self.decode_register_index().unwrap()] {
Val::Void => Val::Undefined,
val => take(val),
},
BytecodeType::Builtin => BUILTIN_VALS[self.decode_varsize_uint()](),
BytecodeType::Class => VsClass {
constructor: self.decode_val(registers),
@@ -156,7 +155,7 @@ impl BytecodeDecoder {
};
}
pub fn decode_vec_val(&mut self, registers: &Vec<Val>) -> Vec<Val> {
pub fn decode_vec_val(&mut self, registers: &mut Vec<Val>) -> Vec<Val> {
let mut vals: Vec<Val> = Vec::new();
while self.peek_type() != BytecodeType::End {
@@ -248,7 +247,7 @@ impl BytecodeDecoder {
};
}
pub fn decode_pointer(&mut self, registers: &Vec<Val>) -> Val {
pub fn decode_pointer(&mut self, registers: &mut Vec<Val>) -> Val {
let from_pos = self.pos;
let pos = self.decode_pos();