mark/mers
1
0
Fork 0
mirror of https://github.com/Dummi26/mers.git synced 2025-12-24 23:46:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

make list.get_mut return a 1-tuple on success, and fix reference type being incomplete

Browse Source
This commit is contained in:
Mark
2024-02-22 19:41:03 +01:00
parent 05c88b7826
commit dc2db1d0e8
3 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mers_lib/src/program/run/variable.rs
View File

@@ -60,15 +60,18 @@ impl MersStatement for Variable {
info.scopes[self.var.0].vars[self.var.1] = nothing;
} else {
// (reference to) data which will never be referenced again
return Data::new(data::reference::Reference(Arc::new(RwLock::new(
Data::empty_tuple(),
))));
return Data::new(data::reference::Reference(
Arc::new(RwLock::new(Data::empty_tuple())),
Type::empty(),
));
}
}
if self.is_ref_not_ignore {
Data::new(data::reference::Reference(Arc::clone(
&info.scopes[self.var.0].vars[self.var.1],
)))
let v = &info.scopes[self.var.0].vars[self.var.1];
Data::new(data::reference::Reference(
Arc::clone(v),
v.read().unwrap().get().as_type(),
))
} else {
info.scopes[self.var.0].vars[self.var.1]
.write()