holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve the errors for arg types (#3597)

Browse Source
This commit is contained in:
JT 2021-06-10 18:47:06 +12:00 committed by GitHub
parent fadcdde7f8
commit fc07e849fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/nu-engine/src/evaluate/evaluator.rs
View File

@ -267,7 +267,10 @@ fn evaluate_reference(
}), }),
x => match ctx.scope.get_var(x) { x => match ctx.scope.get_var(x) {
Some(v) => Ok(v), Some(mut v) => {
v.tag.span = span;
Ok(v)
}
None => Err(ShellError::labeled_error( None => Err(ShellError::labeled_error(
"Variable not in scope", "Variable not in scope",
format!("unknown variable: {}", x), format!("unknown variable: {}", x),

120
crates/nu-engine/src/from_value.rs
View File

@ -4,7 +4,8 @@ use bigdecimal::{BigDecimal, ToPrimitive};
use chrono::{DateTime, FixedOffset}; use chrono::{DateTime, FixedOffset};
use nu_errors::ShellError; use nu_errors::ShellError;
use nu_protocol::{ use nu_protocol::{
hir::CapturedBlock, ColumnPath, Dictionary, Primitive, Range, UntaggedValue, Value, hir::CapturedBlock, ColumnPath, Dictionary, Primitive, Range, SpannedTypeName, UntaggedValue,
Value,
}; };
use nu_source::{Tagged, TaggedItem}; use nu_source::{Tagged, TaggedItem};
use num_bigint::BigInt; use num_bigint::BigInt;
@ -36,11 +37,7 @@ impl FromValue for Tagged<num_bigint::BigInt> {
value: UntaggedValue::Primitive(Primitive::Duration(i)), value: UntaggedValue::Primitive(Primitive::Duration(i)),
.. ..
} => Ok(i.clone().tagged(tag)), } => Ok(i.clone().tagged(tag)),
Value { tag, .. } => Err(ShellError::labeled_error( v => Err(ShellError::type_error("integer", v.spanned_type_name())),
"Can't convert to integer",
"can't convert to integer",
tag.span,
)),
} }
} }
} }
@ -60,11 +57,7 @@ impl FromValue for num_bigint::BigInt {
value: UntaggedValue::Primitive(Primitive::Duration(i)), value: UntaggedValue::Primitive(Primitive::Duration(i)),
.. ..
} => Ok(i.clone()), } => Ok(i.clone()),
Value { tag, .. } => Err(ShellError::labeled_error( v => Err(ShellError::type_error("integer", v.spanned_type_name())),
"Can't convert to integer",
"can't convert to integer",
tag.span,
)),
} }
} }
} }
@ -145,11 +138,7 @@ impl FromValue for bigdecimal::BigDecimal {
value: UntaggedValue::Primitive(Primitive::Int(i)), value: UntaggedValue::Primitive(Primitive::Int(i)),
.. ..
} => Ok(BigDecimal::from(*i)), } => Ok(BigDecimal::from(*i)),
Value { tag, .. } => Err(ShellError::labeled_error( v => Err(ShellError::type_error("decimal", v.spanned_type_name())),
"Can't convert to decimal",
"can't convert to decimal",
tag.span,
)),
} }
} }
} }
@ -160,11 +149,7 @@ impl FromValue for Tagged<bigdecimal::BigDecimal> {
match &v.value { match &v.value {
UntaggedValue::Primitive(Primitive::Decimal(d)) => Ok(d.clone().tagged(tag)), UntaggedValue::Primitive(Primitive::Decimal(d)) => Ok(d.clone().tagged(tag)),
UntaggedValue::Primitive(Primitive::Int(i)) => Ok(BigDecimal::from(*i).tagged(tag)), UntaggedValue::Primitive(Primitive::Int(i)) => Ok(BigDecimal::from(*i).tagged(tag)),
_ => Err(ShellError::labeled_error( _ => Err(ShellError::type_error("decimal", v.spanned_type_name())),
"Can't convert to decimal",
"can't convert to decimal",
tag.span,
)),
} }
} }
} }
@ -176,11 +161,7 @@ impl FromValue for Tagged<f64> {
match decimal.to_f64() { match decimal.to_f64() {
Some(d) => Ok(d.tagged(tag)), Some(d) => Ok(d.tagged(tag)),
None => Err(ShellError::labeled_error( _ => Err(ShellError::type_error("decimal", v.spanned_type_name())),
"Can't convert to decimal",
"can't convert to decimal",
tag.span,
)),
} }
} }
} }
@ -200,11 +181,7 @@ impl FromValue for String {
value: UntaggedValue::Primitive(Primitive::FilePath(p)), value: UntaggedValue::Primitive(Primitive::FilePath(p)),
.. ..
} => Ok(p.to_string_lossy().to_string()), } => Ok(p.to_string_lossy().to_string()),
Value { tag, .. } => Err(ShellError::labeled_error( v => Err(ShellError::type_error("string", v.spanned_type_name())),
"Can't convert to string",
"can't convert to string",
tag.span,
)),
} }
} }
} }
@ -227,11 +204,7 @@ impl FromValue for PathBuf {
value: UntaggedValue::Primitive(Primitive::FilePath(p)), value: UntaggedValue::Primitive(Primitive::FilePath(p)),
.. ..
} => Ok(p.clone()), } => Ok(p.clone()),
Value { tag, .. } => Err(ShellError::labeled_error( v => Err(ShellError::type_error("filepath", v.spanned_type_name())),
"Can't convert to filepath",
"can't convert to filepath",
tag.span,
)),
} }
} }
} }
@ -247,11 +220,7 @@ impl FromValue for Tagged<PathBuf> {
value: UntaggedValue::Primitive(Primitive::FilePath(p)), value: UntaggedValue::Primitive(Primitive::FilePath(p)),
tag, tag,
} => Ok(p.clone().tagged(tag)), } => Ok(p.clone().tagged(tag)),
Value { tag, .. } => Err(ShellError::labeled_error( v => Err(ShellError::type_error("filepath", v.spanned_type_name())),
"Can't convert to filepath",
"can't convert to filepath",
tag.span,
)),
} }
} }
} }
@ -263,11 +232,7 @@ impl FromValue for ColumnPath {
value: UntaggedValue::Primitive(Primitive::ColumnPath(c)), value: UntaggedValue::Primitive(Primitive::ColumnPath(c)),
.. ..
} => Ok(c.clone()), } => Ok(c.clone()),
Value { tag, .. } => Err(ShellError::labeled_error( v => Err(ShellError::type_error("column path", v.spanned_type_name())),
"Can't convert to column path",
"can't convert to column path",
tag.span,
)),
} }
} }
} }
@ -279,11 +244,7 @@ impl FromValue for bool {
value: UntaggedValue::Primitive(Primitive::Boolean(b)), value: UntaggedValue::Primitive(Primitive::Boolean(b)),
.. ..
} => Ok(*b), } => Ok(*b),
Value { tag, .. } => Err(ShellError::labeled_error( v => Err(ShellError::type_error("boolean", v.spanned_type_name())),
"Can't convert to boolean",
"can't convert to boolean",
tag.span,
)),
} }
} }
} }
@ -295,11 +256,7 @@ impl FromValue for Tagged<bool> {
value: UntaggedValue::Primitive(Primitive::Boolean(b)), value: UntaggedValue::Primitive(Primitive::Boolean(b)),
tag, tag,
} => Ok((*b).tagged(tag)), } => Ok((*b).tagged(tag)),
Value { tag, .. } => Err(ShellError::labeled_error( v => Err(ShellError::type_error("boolean", v.spanned_type_name())),
"Can't convert to boolean",
"can't convert to boolean",
tag.span,
)),
} }
} }
} }
@ -311,11 +268,7 @@ impl FromValue for DateTime<FixedOffset> {
value: UntaggedValue::Primitive(Primitive::Date(d)), value: UntaggedValue::Primitive(Primitive::Date(d)),
.. ..
} => Ok(*d), } => Ok(*d),
Value { tag, .. } => Err(ShellError::labeled_error( v => Err(ShellError::type_error("date", v.spanned_type_name())),
"Can't convert to date",
"can't convert to date",
tag.span,
)),
} }
} }
} }
@ -327,11 +280,7 @@ impl FromValue for Range {
value: UntaggedValue::Primitive(Primitive::Range(r)), value: UntaggedValue::Primitive(Primitive::Range(r)),
.. ..
} => Ok((**r).clone()), } => Ok((**r).clone()),
Value { tag, .. } => Err(ShellError::labeled_error( v => Err(ShellError::type_error("range", v.spanned_type_name())),
"Can't convert to range",
"can't convert to range",
tag.span,
)),
} }
} }
} }
@ -339,15 +288,12 @@ impl FromValue for Range {
impl FromValue for Tagged<Range> { impl FromValue for Tagged<Range> {
fn from_value(v: &Value) -> Result<Self, ShellError> { fn from_value(v: &Value) -> Result<Self, ShellError> {
let tag = v.tag.clone(); let tag = v.tag.clone();
match v.value { match v {
UntaggedValue::Primitive(Primitive::Range(ref range)) => { Value {
Ok((*range.clone()).tagged(tag)) value: UntaggedValue::Primitive(Primitive::Range(ref range)),
} ..
_ => Err(ShellError::labeled_error( } => Ok((*range.clone()).tagged(tag)),
"Can't convert to range", v => Err(ShellError::type_error("range", v.spanned_type_name())),
"can't convert to range",
tag.span,
)),
} }
} }
} }
@ -363,11 +309,7 @@ impl FromValue for Vec<u8> {
value: UntaggedValue::Primitive(Primitive::String(s)), value: UntaggedValue::Primitive(Primitive::String(s)),
.. ..
} => Ok(s.bytes().collect()), } => Ok(s.bytes().collect()),
Value { tag, .. } => Err(ShellError::labeled_error( v => Err(ShellError::type_error("binary data", v.spanned_type_name())),
"Can't convert to binary data",
"can't convert to binary data",
tag.span,
)),
} }
} }
} }
@ -379,11 +321,7 @@ impl FromValue for Dictionary {
value: UntaggedValue::Row(r), value: UntaggedValue::Row(r),
.. ..
} => Ok(r.clone()), } => Ok(r.clone()),
Value { tag, .. } => Err(ShellError::labeled_error( v => Err(ShellError::type_error("row", v.spanned_type_name())),
"Can't convert to row",
"can't convert to row",
tag.span,
)),
} }
} }
} }
@ -395,11 +333,7 @@ impl FromValue for CapturedBlock {
value: UntaggedValue::Block(b), value: UntaggedValue::Block(b),
.. ..
} => Ok((**b).clone()), } => Ok((**b).clone()),
Value { tag, .. } => Err(ShellError::labeled_error( v => Err(ShellError::type_error("block", v.spanned_type_name())),
"Can't convert to block",
"can't convert to block",
tag.span,
)),
} }
} }
} }
@ -415,11 +349,7 @@ impl FromValue for Vec<Value> {
value: UntaggedValue::Row(_), value: UntaggedValue::Row(_),
.. ..
} => Ok(vec![v.clone()]), } => Ok(vec![v.clone()]),
Value { tag, .. } => Err(ShellError::labeled_error( v => Err(ShellError::type_error("table", v.spanned_type_name())),
"Can't convert to table",
"can't convert to table",
tag.span,
)),
} }
} }
} }