extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 12:35:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup let varname and rhs (#3507)

Browse Source
This commit is contained in:
JT
2021-05-28 19:48:54 +12:00
committed by GitHub
parent 0886afe650
commit 55baee9a9a
3 changed files with 67 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
crates/nu-protocol/src/hir.rs
View File

@ -681,6 +681,36 @@ impl SpannedExpression {
pub fn get_free_variables(&self, known_variables: &mut Vec<String>) -> Vec<String> {
self.expr.get_free_variables(known_variables)
}
pub fn var_name(&self) -> Result<String, ShellError> {
let var_name = match &self.expr {
Expression::FullColumnPath(path) => match &path.head.expr {
Expression::Variable(v, _) => v,
x => {
return Err(ShellError::labeled_error(
format!("Expected a variable (got {:?})", x),
"expected a variable",
self.span,
))
}
},
Expression::Literal(Literal::String(x)) => x,
x => {
return Err(ShellError::labeled_error(
format!("Expected a variable (got {:?})", x),
"expected a variable",
self.span,
))
}
}
.to_string();
if !var_name.starts_with('$') {
Ok(format!("${}", var_name))
} else {
Ok(var_name)
}
}
}
impl std::ops::Deref for SpannedExpression {