ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Neaten up array_to_point3d

Browse Source
This commit is contained in:
Adam Chalmers
2024-06-22 09:03:43 -05:00
parent abbfdae7d2
commit eda736a85e
1 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/wasm-lib/kcl/src/std/patterns.rs
View File

@ -705,27 +705,16 @@ fn array_to_point3d(json: &serde_json::Value, source_ranges: Vec<SourceRange>) -
source_ranges, source_ranges,
})); }));
}; };
let Some(x) = arr[0].as_number().and_then(|num| num.as_f64()) else { // Gets an f64 from a JSON value, returns Option.
return Err(KclError::Semantic(KclErrorDetails { let f = |j: &serde_json::Value| j.as_number().and_then(|num| num.as_f64()).map(|x| x.to_owned());
message: "X component of this point was not a number".to_owned(), let err = |component| {
source_ranges, KclError::Semantic(KclErrorDetails {
})); message: format!("{component} component of this point was not a number"),
source_ranges: source_ranges.clone(),
})
}; };
let Some(y) = arr[1].as_number().and_then(|num| num.as_f64()) else { let x = f(&arr[0]).ok_or_else(|| err("X"))?;
return Err(KclError::Semantic(KclErrorDetails { let y = f(&arr[1]).ok_or_else(|| err("Y"))?;
message: "Y component of this point was not a number".to_owned(), let z = f(&arr[2]).ok_or_else(|| err("Z"))?;
source_ranges, Ok(Point3d { x, y, z })
}));
};
let Some(z) = arr[2].as_number().and_then(|num| num.as_f64()) else {
return Err(KclError::Semantic(KclErrorDetails {
message: "Z component of this point was not a number".to_owned(),
source_ranges,
}));
};
Ok(Point3d {
x: x.to_owned().into(),
y: y.to_owned(),
z: z.to_owned(),
})
} }