mirror of
https://github.com/nushell/nushell.git
synced 2025-03-26 07:19:55 +01:00
# Description The `ShellError` enum at the moment is kind of messy. Many variants are basic tuple structs where you always have to reference the implementation with its macro invocation to know which field serves which purpose. Furthermore we have both variants that are kind of redundant or either overly broad to be useful for the user to match on or overly specific with few uses. So I set out to start fixing the lacking documentation and naming to make it feasible to critically review the individual usages and fix those. Furthermore we can decide to join or split up variants that don't seem to be fit for purpose. Feel free to add review comments if you spot inconsistent use of `ShellError` variants. - Name fields on `ShellError::OperatorOverflow` - Name fields on `ShellError::PipelineMismatch` - Add doc to `ShellError::OnlySupportsThisInputType` - Name `ShellError::OnlySupportsThisInputType` - Name field on `ShellError::PipelineEmpty` - Comment about issues with `TypeMismatch*` - Fix a few `exp_input_type`s - Name fields on `ShellError::InvalidRange` # User-Facing Changes (None now, end goal more explicit and consistent error messages) # Tests + Formatting (No additional tests needed so far)
120 lines
4.2 KiB
Rust
120 lines
4.2 KiB
Rust
use indexmap::map::IndexMap;
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::{IntoPipelineData, PipelineData, ShellError, Span, Spanned, Value};
|
|
|
|
pub fn run_with_function(
|
|
call: &Call,
|
|
input: PipelineData,
|
|
mf: impl Fn(&[Value], Span, &Span) -> Result<Value, ShellError>,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let name = call.head;
|
|
let res = calculate(input, name, mf);
|
|
match res {
|
|
Ok(v) => Ok(v.into_pipeline_data()),
|
|
Err(e) => Err(e),
|
|
}
|
|
}
|
|
|
|
fn helper_for_tables(
|
|
values: &[Value],
|
|
val_span: Span,
|
|
name: Span,
|
|
mf: impl Fn(&[Value], Span, &Span) -> Result<Value, ShellError>,
|
|
) -> Result<Value, ShellError> {
|
|
// If we are not dealing with Primitives, then perhaps we are dealing with a table
|
|
// Create a key for each column name
|
|
let mut column_values = IndexMap::new();
|
|
for val in values {
|
|
match val {
|
|
Value::Record { cols, vals, .. } => {
|
|
for (key, value) in cols.iter().zip(vals.iter()) {
|
|
column_values
|
|
.entry(key.clone())
|
|
.and_modify(|v: &mut Vec<Value>| v.push(value.clone()))
|
|
.or_insert_with(|| vec![value.clone()]);
|
|
}
|
|
}
|
|
Value::Error { error } => return Err(error.clone()),
|
|
_ => {
|
|
//Turns out we are not dealing with a table
|
|
return mf(values, val.expect_span(), &name);
|
|
}
|
|
}
|
|
}
|
|
// The mathematical function operates over the columns of the table
|
|
let mut column_totals = IndexMap::new();
|
|
for (col_name, col_vals) in column_values {
|
|
if let Ok(out) = mf(&col_vals, val_span, &name) {
|
|
column_totals.insert(col_name, out);
|
|
}
|
|
}
|
|
if column_totals.keys().len() == 0 {
|
|
return Err(ShellError::UnsupportedInput(
|
|
"Unable to give a result with this input".to_string(),
|
|
"value originates from here".into(),
|
|
name,
|
|
val_span,
|
|
));
|
|
}
|
|
|
|
Ok(Value::from(Spanned {
|
|
item: column_totals,
|
|
span: name,
|
|
}))
|
|
}
|
|
|
|
pub fn calculate(
|
|
values: PipelineData,
|
|
name: Span,
|
|
mf: impl Fn(&[Value], Span, &Span) -> Result<Value, ShellError>,
|
|
) -> Result<Value, ShellError> {
|
|
// TODO implement spans for ListStream, thus negating the need for unwrap_or().
|
|
let span = values.span().unwrap_or(name);
|
|
match values {
|
|
PipelineData::ListStream(s, ..) => {
|
|
helper_for_tables(&s.collect::<Vec<Value>>(), span, name, mf)
|
|
}
|
|
PipelineData::Value(Value::List { ref vals, span }, ..) => match &vals[..] {
|
|
[Value::Record { .. }, _end @ ..] => helper_for_tables(
|
|
vals,
|
|
values.span().expect("PipelineData::Value had no span"),
|
|
name,
|
|
mf,
|
|
),
|
|
_ => mf(vals, span, &name),
|
|
},
|
|
PipelineData::Value(Value::Record { vals, cols, span }, ..) => {
|
|
let new_vals: Result<Vec<Value>, ShellError> = vals
|
|
.into_iter()
|
|
.map(|val| mf(&[val], span, &name))
|
|
.collect();
|
|
match new_vals {
|
|
Ok(vec) => Ok(Value::Record {
|
|
cols,
|
|
vals: vec,
|
|
span,
|
|
}),
|
|
Err(err) => Err(err),
|
|
}
|
|
}
|
|
PipelineData::Value(Value::Range { val, span, .. }, ..) => {
|
|
let new_vals: Result<Vec<Value>, ShellError> = val
|
|
.into_range_iter(None)?
|
|
.map(|val| mf(&[val], span, &name))
|
|
.collect();
|
|
|
|
mf(&new_vals?, span, &name)
|
|
}
|
|
PipelineData::Value(val, ..) => mf(&[val], span, &name),
|
|
PipelineData::Empty { .. } => Err(ShellError::PipelineEmpty { dst_span: name }),
|
|
val => Err(ShellError::UnsupportedInput(
|
|
"Only integers, floats, lists, records or ranges are supported".into(),
|
|
"value originates from here".into(),
|
|
name,
|
|
// This requires both the ListStream and Empty match arms to be above it.
|
|
val.span()
|
|
.expect("non-Empty non-ListStream PipelineData had no span"),
|
|
)),
|
|
}
|
|
}
|