github/ValueScript
1
1
Fork 0
mirror of https://github.com/voltrevo/ValueScript.git synced 2026-04-18 03:00:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow constructor to be void

Browse Source
This commit is contained in:
Andrew Morris
2022-05-27 15:15:06 +10:00
parent d492040d21
commit e356acf2c8
1 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/vstc/virtual_machine/virtual_machine.rs
View File

@@ -377,32 +377,44 @@ impl VirtualMachine {
prototype: Some(class.instance_prototype.clone()),
}));
match class.constructor.load_function() {
LoadFunctionResult::NotAFunction =>
std::panic!("Not implemented: throw exception (class.constructor is not a function)")
,
LoadFunctionResult::StackFrame(mut new_frame) => {
transfer_parameters(&mut self.frame, &mut new_frame);
new_frame.registers[1] = instance;
self.frame.return_target = None;
self.frame.this_target = self.frame.decoder.decode_register_index();
self.push(new_frame);
},
LoadFunctionResult::NativeFunction(native_fn) => {
native_fn(
&mut instance,
get_parameters(&mut self.frame),
);
match self.frame.decoder.decode_register_index() {
Some(target) => {
self.frame.registers[target] = instance;
},
match class.constructor {
Val::Void => {
// Ignore parameters
self.frame.decoder.decode_val(&self.frame.registers);
let target_register = self.frame.decoder.decode_register_index();
match target_register {
None => {},
Some(tr) => self.frame.registers[tr] = instance,
};
},
_ => match class.constructor.load_function() {
LoadFunctionResult::NotAFunction =>
std::panic!("Not implemented: throw exception (class.constructor is not a function)")
,
LoadFunctionResult::StackFrame(mut new_frame) => {
transfer_parameters(&mut self.frame, &mut new_frame);
new_frame.registers[1] = instance;
self.frame.return_target = None;
self.frame.this_target = self.frame.decoder.decode_register_index();
self.push(new_frame);
},
LoadFunctionResult::NativeFunction(native_fn) => {
native_fn(
&mut instance,
get_parameters(&mut self.frame),
);
match self.frame.decoder.decode_register_index() {
Some(target) => {
self.frame.registers[target] = instance;
},
None => {},
};
},
},
};
}
};