Skip to content

fix: support scalar * rect and rect * scalar multiplication #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matthewdean wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: support scalar * rect and rect * scalar multiplication #102

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 12 additions & 27 deletions vm-rust/src/player/datum_operations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,45 +445,30 @@ pub fn multiply_datums(
(Datum::Int(left), Datum::Float(right)) => Datum::Float((*left as f64) * right),
(Datum::Float(left), Datum::Int(right)) => Datum::Float(*left * (*right as f64)),
(Datum::Float(left), Datum::Float(right)) => Datum::Float(left * right),
(Datum::Rect(a), Datum::Int(right)) => {
let right_ref = player.alloc_datum(Datum::Int(*right));
let mut result: [DatumRef; 4] = std::array::from_fn(|_| DatumRef::Void);
for i in 0..4 {
let a_val = player.get_datum(&a[i]).clone();
let b_val = player.get_datum(&right_ref).clone();
let prod = multiply_datums(
player.alloc_datum(a_val),
player.alloc_datum(b_val),
player
)?;
result[i] = player.alloc_datum(prod);
}
Datum::Rect(result)
}
(Datum::Rect(a), Datum::Float(right)) => {
let right_ref = player.alloc_datum(Datum::Float(*right));
(Datum::Rect(r), scalar) if matches!(scalar, Datum::Int(_) | Datum::Float(_)) => {
let scalar_ref = player.alloc_datum(scalar.clone());
let mut result: [DatumRef; 4] = std::array::from_fn(|_| DatumRef::Void);
for i in 0..4 {
let a_val = player.get_datum(&a[i]).clone();
let b_val = player.get_datum(&right_ref).clone();
let r_val = player.get_datum(&r[i]).clone();
let s_val = player.get_datum(&scalar_ref).clone();
let prod = multiply_datums(
player.alloc_datum(a_val),
player.alloc_datum(b_val),
player.alloc_datum(r_val),
player.alloc_datum(s_val),
player
)?;
result[i] = player.alloc_datum(prod);
}
Datum::Rect(result)
}
(Datum::Float(left), Datum::Rect(b)) => {
let left_ref = player.alloc_datum(Datum::Float(*left));
(scalar, Datum::Rect(r)) if matches!(scalar, Datum::Int(_) | Datum::Float(_)) => {
let scalar_ref = player.alloc_datum(scalar.clone());
let mut result: [DatumRef; 4] = std::array::from_fn(|_| DatumRef::Void);
for i in 0..4 {
let a_val = player.get_datum(&left_ref).clone();
let b_val = player.get_datum(&b[i]).clone();
let s_val = player.get_datum(&scalar_ref).clone();
let r_val = player.get_datum(&r[i]).clone();
let prod = multiply_datums(
player.alloc_datum(a_val),
player.alloc_datum(b_val),
player.alloc_datum(s_val),
player.alloc_datum(r_val),
player
)?;
result[i] = player.alloc_datum(prod);
Expand Down
Loading