extern/kalker
1
0
Fork 0
mirror of https://github.com/PaddiM8/kalker.git synced 2025-01-05 21:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow matrices in prelude functions

Browse Source
This commit is contained in:
PaddiM8 2022-01-07 01:04:43 +01:00
parent 95fd78f3d1
commit 44174c9850
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
kalk/src/interpreter.rs
View File

@ -352,15 +352,18 @@ pub(crate) fn eval_fn_call_expr(
if result.is_nan() && expressions.len() == 1 { if result.is_nan() && expressions.len() == 1 {
let x = eval_expr(context, &expressions[0], "")?; let x = eval_expr(context, &expressions[0], "")?;
// If a vector was given, call the function on every item // If a vector/matrix was given, call the function on every item
// in the vector. // in the vector/matrix.
if let KalkValue::Vector(values) = x { if let KalkValue::Vector(values) = x {
let mut new_values = Vec::new(); let mut new_values = Vec::new();
let mut success = true; let mut success = true;
for value in values { for value in values {
if let Some(result) = if let Some(result) = prelude::call_unary_func(
prelude::call_unary_func(context, &identifier.full_name, value, "") context,
{ &identifier.full_name,
value,
&context.angle_unit.clone(),
) {
new_values.push(result.0); new_values.push(result.0);
} else { } else {
success = false; success = false;
@ -371,6 +374,31 @@ pub(crate) fn eval_fn_call_expr(
if success { if success {
return Ok(KalkValue::Vector(new_values)); return Ok(KalkValue::Vector(new_values));
} }
} else if let KalkValue::Matrix(rows) = x {
let mut new_rows = Vec::new();
let mut success = true;
for row in rows {
let mut new_row = Vec::new();
for value in row {
if let Some(result) = prelude::call_unary_func(
context,
&identifier.full_name,
value,
&context.angle_unit.clone(),
) {
new_row.push(result.0);
} else {
success = false;
break;
}
}
new_rows.push(new_row);
}
if success {
return Ok(KalkValue::Matrix(new_rows));
}
} }
} }