extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-06-30 14:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Retain tag when accessing a var (#3535)

Browse Source
This commit is contained in:
JT
2021-06-02 19:49:14 +12:00
committed by GitHub
parent 2486492c4d
commit 290c712cde
2 changed files with 63 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,7 +200,11 @@ pub fn evaluate_baseline_expr(
};
}
Ok(item.value.into_value(tag))
if path.tail.is_empty() {
Ok(item)
} else {
Ok(item.value.into_value(tag))
}
}
Expression::Boolean(_boolean) => Ok(UntaggedValue::boolean(*_boolean).into_value(tag)),
Expression::Garbage => unimplemented!(),
@ -289,7 +293,10 @@ fn evaluate_invocation(block: &hir::Block, ctx: &EvaluationContext) -> Result<Va
}
match output.len() {
x if x > 1 => Ok(UntaggedValue::Table(output).into_value(Tag::unknown())),
x if x > 1 => {
let tag = output[0].tag.clone();
Ok(UntaggedValue::Table(output).into_value(tag))
}
1 => Ok(output[0].clone()),
_ => Ok(UntaggedValue::nothing().into_value(Tag::unknown())),
}