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

.

Browse Source
This commit is contained in:
mark 2023-05-27 19:37:01 +02:00
parent d62a3f5aa8
commit c2594ab6dc
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mers/src/lang/code_runnable.rs
View File

@ -215,12 +215,12 @@ impl RStatementEnum {
Self::For(v, c, b) => { Self::For(v, c, b) => {
// matching values also break with value from a for loop. // matching values also break with value from a for loop.
let vv = v.run(info); let vv = v.run(info);
c.run(info).operate_on_data_immut(|c: &VDataEnum| {
let mut in_loop = |c: VData| { let mut in_loop = |c: VData| {
c.assign_to(vv.clone_mut(), info); c.assign_to(vv.clone_mut(), info);
b.run(info) b.run(info)
}; };
let mut iter = c.run(info);
if let Some(v) = iter.operate_on_data_immut(|c: &VDataEnum| {
let mut oval = VDataEnum::Tuple(vec![]).to(); let mut oval = VDataEnum::Tuple(vec![]).to();
match c { match c {
VDataEnum::Int(v) => { VDataEnum::Int(v) => {
@ -259,11 +259,32 @@ impl RStatementEnum {
break; break;
} }
}, },
VDataEnum::Reference(r) => return None,
_ => unreachable!(), _ => unreachable!(),
} }
oval Some(oval)
}) {
v
} else {
// loop mutably
iter.operate_on_data_mut(|c| match c {
VDataEnum::Reference(r) => r.operate_on_data_mut(|c| match c {
VDataEnum::Tuple(v) | VDataEnum::List(_, v) => {
for v in v {
if let Some(v) =
in_loop(VDataEnum::Reference(v.clone_mut()).to()).matches()
{
return v;
}
}
VDataEnum::Tuple(vec![]).to()
}
_ => unreachable!(),
}),
_ => unreachable!(),
}) })
} }
}
Self::Switch(switch_on, cases, _force) => { Self::Switch(switch_on, cases, _force) => {
let switch_on = switch_on.run(info); let switch_on = switch_on.run(info);
let switch_on_type = switch_on.out(); let switch_on_type = switch_on.out();