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

Implement direct class comparison

Browse Source
This commit is contained in:
Andrew Morris
2023-08-16 15:30:25 +10:00
parent 5d1da13903
commit d49937663c
12 changed files with 75 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
valuescript_compiler/src/assembler.rs
View File

@@ -197,6 +197,7 @@ impl Assembler {
fn class(&mut self, class: &Class) {
self.output.push(ValueType::Class as u8);
self.meta(&class.meta);
self.value(&class.constructor);
self.value(&class.prototype);
self.value(&class.static_);

5
valuescript_compiler/src/optimization/kal.rs
View File

@@ -256,6 +256,11 @@ impl Kal {
}
Kal::Function(_) => return None,
Kal::Class(class) => VsClass {
name: class.meta.name,
content_hash: match class.meta.content_hashable {
asm::ContentHashable::Empty | asm::ContentHashable::Src(_, _) => None,
asm::ContentHashable::Content(hash) => Some(hash.0),
},
constructor: class.constructor.try_to_val()?,
prototype: class.prototype.try_to_val()?,
static_: class.static_.try_to_val()?,

7
valuescript_compiler/src/optimization/try_to_val.rs
View File

@@ -6,7 +6,7 @@ use valuescript_vm::{
vs_value::{ToVal, Val},
};
use crate::asm::{Number, Value};
use crate::asm::{ContentHashable, Number, Value};
pub trait TryToVal {
fn try_to_val(self) -> Result<Val, Val>;
@@ -45,6 +45,11 @@ impl TryToVal for Value {
.to_val()
}
Value::Class(class) => VsClass {
name: class.meta.name,
content_hash: match class.meta.content_hashable {
ContentHashable::Empty | ContentHashable::Src(_, _) => None,
ContentHashable::Content(hash) => Some(hash.0),
},
constructor: class.constructor.try_to_val()?,
prototype: class.prototype.try_to_val()?,
static_: class.static_.try_to_val()?,