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

Add Symbol builtin

Browse Source
This commit is contained in:
Andrew Morris
2023-05-25 13:45:38 +10:00
parent 706fb78442
commit 205f5efa02
6 changed files with 118 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
valuescript_vm/src/bytecode_decoder.rs
View File

@@ -11,6 +11,7 @@ use crate::vs_class::VsClass;
use crate::vs_function::VsFunction;
use crate::vs_object::VsObject;
use crate::vs_pointer::VsPointer;
use crate::vs_symbol::VsSymbol;
use crate::vs_value::Val;
use crate::vs_value::ValTrait;
@@ -114,20 +115,25 @@ impl BytecodeDecoder {
Val::Array(Rc::new(VsArray::from(vals)))
}
BytecodeType::Object => {
let mut obj: BTreeMap<String, Val> = BTreeMap::new();
let mut string_map: BTreeMap<String, Val> = BTreeMap::new();
let mut symbol_map: BTreeMap<VsSymbol, Val> = BTreeMap::new();
while self.peek_type() != BytecodeType::End {
obj.insert(
self.decode_val(registers).val_to_string(),
self.decode_val(registers),
);
let key = self.decode_val(registers);
let value = self.decode_val(registers);
match key {
Val::String(string) => string_map.insert(string.to_string(), value),
Val::Symbol(symbol) => symbol_map.insert(symbol, value),
key => string_map.insert(key.val_to_string(), value),
};
}
self.decode_type(); // End (TODO: assert)
Val::Object(Rc::new(VsObject {
string_map: obj,
symbol_map: Default::default(),
string_map,
symbol_map,
prototype: None,
}))
}