mark/mers
1
0
Fork 0
mirror of https://github.com/Dummi26/mers.git synced 2025-12-26 16:36:31 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved and fixed some bugs with the switch! unhandled type error and some builtins

Browse Source
This commit is contained in:
Dummi26
2023-03-14 20:58:35 +01:00
parent 1b43dfebda
commit 585017da46
2 changed files with 88 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/script/block.rs
View File

@@ -395,6 +395,8 @@ pub mod to_runnable {
let switch_on_out = switch_on_v.1;
if *force {
let mut types_not_covered_req_error = false;
let mut types_not_covered = VType { types: vec![] };
for val_type in switch_on_out.types.iter() {
let val_type: VType = val_type.clone().into();
let mut linf2 = linfo.clone();
@@ -405,9 +407,13 @@ pub mod to_runnable {
break 'force;
}
}
return Err(ToRunnableError::CaseForceButTypeNotCovered(val_type));
types_not_covered_req_error = true;
types_not_covered = types_not_covered | val_type;
}
}
if types_not_covered_req_error {
return Err(ToRunnableError::CaseForceButTypeNotCovered(types_not_covered));
}
}
RStatementEnum::Switch(
RStatementEnum::Variable(switch_on_v.0, switch_on_out, false).to(),
@@ -755,7 +761,7 @@ impl RStatementEnum {
Self::Switch(switch_on, cases) => {
let switch_on = switch_on.out().types;
let mut might_return_empty = switch_on.is_empty();
let mut out = VSingleType::Tuple(vec![]).into(); // if nothing is executed
let mut out = VType { types: vec![] }; // if nothing is executed
for switch_on in switch_on {
let switch_on: VType = switch_on.into();
'search: {