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

Improve missing var in var-path error (#3415)

Browse Source
This commit is contained in:
JT 2021-05-12 20:53:34 +12:00 committed by GitHub
parent 6769d46dbb
commit 3aa00b78f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ pub fn evaluate_baseline_expr(
Expression::Synthetic(hir::Synthetic::String(s)) => { Expression::Synthetic(hir::Synthetic::String(s)) => {
Ok(UntaggedValue::string(s).into_untagged_value()) Ok(UntaggedValue::string(s).into_untagged_value())
} }
Expression::Variable(var, _) => evaluate_reference(&var, ctx, tag), Expression::Variable(var, s) => evaluate_reference(&var, ctx, *s),
Expression::Command => unimplemented!(), Expression::Command => unimplemented!(),
Expression::Invocation(block) => evaluate_invocation(block, ctx), Expression::Invocation(block) => evaluate_invocation(block, ctx),
Expression::ExternalCommand(_) => unimplemented!(), Expression::ExternalCommand(_) => unimplemented!(),
@ -225,25 +225,29 @@ fn evaluate_literal(literal: &hir::Literal, span: Span) -> Value {
} }
} }
fn evaluate_reference(name: &str, ctx: &EvaluationContext, tag: Tag) -> Result<Value, ShellError> { fn evaluate_reference(
name: &str,
ctx: &EvaluationContext,
span: Span,
) -> Result<Value, ShellError> {
match name { match name {
"$nu" => crate::evaluate::variables::nu(&ctx.scope, tag, ctx), "$nu" => crate::evaluate::variables::nu(&ctx.scope, span, ctx),
"$scope" => crate::evaluate::variables::scope( "$scope" => crate::evaluate::variables::scope(
&ctx.scope.get_aliases(), &ctx.scope.get_aliases(),
&ctx.scope.get_commands(), &ctx.scope.get_commands(),
&ctx.scope.get_vars(), &ctx.scope.get_vars(),
tag, span,
), ),
"$true" => Ok(Value { "$true" => Ok(Value {
value: UntaggedValue::boolean(true), value: UntaggedValue::boolean(true),
tag, tag: span.into(),
}), }),
"$false" => Ok(Value { "$false" => Ok(Value {
value: UntaggedValue::boolean(false), value: UntaggedValue::boolean(false),
tag, tag: span.into(),
}), }),
"$it" => match ctx.scope.get_var("$it") { "$it" => match ctx.scope.get_var("$it") {
@ -251,13 +255,13 @@ fn evaluate_reference(name: &str, ctx: &EvaluationContext, tag: Tag) -> Result<V
None => Err(ShellError::labeled_error( None => Err(ShellError::labeled_error(
"Variable not in scope", "Variable not in scope",
"missing '$it' (note: $it is only available inside of a block)", "missing '$it' (note: $it is only available inside of a block)",
tag.span, span,
)), )),
}, },
"$nothing" => Ok(Value { "$nothing" => Ok(Value {
value: UntaggedValue::nothing(), value: UntaggedValue::nothing(),
tag, tag: span.into(),
}), }),
x => match ctx.scope.get_var(x) { x => match ctx.scope.get_var(x) {
@ -265,7 +269,7 @@ fn evaluate_reference(name: &str, ctx: &EvaluationContext, tag: Tag) -> Result<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),
tag.span, span,
)), )),
}, },
} }