mark/mers
1
0
Fork 0
mirror of https://github.com/Dummi26/mers.git synced 2025-03-10 14:13:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed remove and pop to return [] or [v] instead of [] or v to remove the ambiguity when successfully returning v with v = []. This also makes .assume1() work with these functions.

Browse Source
This commit is contained in:
Dummi26 2023-03-30 18:46:45 +02:00
parent 2ba1ed270d
commit 52973eb0f8
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/script/builtins.rs
View File

@ -391,7 +391,14 @@ impl BuiltinFunction {
}
Self::Pop | Self::Remove | Self::Get => {
if let Some(v) = input.first() {
v.get_any().expect("cannot use get on this type")
VType {
types: vec![
VSingleType::Tuple(vec![]),
VSingleType::Tuple(vec![v
.get_any()
.expect("cannot use get on this type")]),
],
}
} else {
unreachable!("get, pop or remove called without args")
}
@ -1144,7 +1151,12 @@ impl BuiltinFunction {
if args.len() == 1 {
if let VDataEnum::Reference(v) = args[0].run(vars, libs).data {
if let VDataEnum::List(_, v) = &mut v.lock().unwrap().data {
v.pop().unwrap_or_else(|| VDataEnum::Tuple(vec![]).to())
if let Some(v) = v.pop() {
VDataEnum::Tuple(vec![v])
} else {
VDataEnum::Tuple(vec![])
}
.to()
} else {
unreachable!("pop: not a list")
}
@ -1162,7 +1174,8 @@ impl BuiltinFunction {
{
if let VDataEnum::List(_, v) = &mut v.lock().unwrap().data {
if v.len() > i as _ && i >= 0 {
v.remove(i as _)
let v = v.remove(i as _);
VDataEnum::Tuple(vec![v]).to()
} else {
VDataEnum::Tuple(vec![]).to()
}