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

Rename the use of invocation to subexpression (#3568)

Browse Source 
* Rename the use of invocation to subexpression

* Fix test name
This commit is contained in:
JT
2021-06-07 20:08:35 +12:00
committed by GitHub
parent e376c2d0d4
commit 16faafb7a8
12 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu-cli/src/completion/engine.rs
View File

@ -25,7 +25,7 @@ impl<'s> Flatten<'s> {
fn expression(&self, e: &SpannedExpression) -> Vec<CompletionLocation> {
match &e.expr {
Expression::Block(block) => self.completion_locations(block),
Expression::Invocation(block) => self.completion_locations(block),
Expression::Subexpression(block) => self.completion_locations(block),
Expression::List(exprs) => exprs.iter().flat_map(|v| self.expression(v)).collect(),
Expression::Table(headers, cells) => headers
.iter()

10
crates/nu-cli/src/types/deduction.rs
View File

@ -302,7 +302,7 @@ fn get_shape_of_expr(expr: &SpannedExpression) -> Option<SyntaxShape> {
Expression::ExternalCommand(_) => Some(SyntaxShape::String),
Expression::Table(_, _) => Some(SyntaxShape::Table),
Expression::Command => Some(SyntaxShape::String),
Expression::Invocation(_) => Some(SyntaxShape::Block),
Expression::Subexpression(_) => Some(SyntaxShape::Block),
Expression::Garbage => unreachable!("Should have failed at parsing stage"),
}
}
@ -544,7 +544,7 @@ impl VarSyntaxShapeDeductor {
match &path.head.expr {
//PathMember can't be var yet (?)
//TODO Iterate over path parts and find var when implemented
Expression::Invocation(b) => self.infer_shape(&b, scope)?,
Expression::Subexpression(b) => self.infer_shape(&b, scope)?,
Expression::Variable(var_name, span) => {
self.checked_insert(
&VarUsage::new(var_name, span),
@ -588,8 +588,8 @@ impl VarSyntaxShapeDeductor {
self.infer_shapes_in_expr((pipeline_idx, pipeline), expr, scope)?;
}
}
Expression::Invocation(invoc) => {
trace!("Inferring vars in invocation: {:?}", invoc);
Expression::Subexpression(invoc) => {
trace!("Inferring vars in subexpression: {:?}", invoc);
self.infer_shape(invoc, scope)?;
}
Expression::Table(header, _rows) => {
@ -794,7 +794,7 @@ impl VarSyntaxShapeDeductor {
| Expression::FilePath(_)
| Expression::ExternalCommand(_)
| Expression::Command
| Expression::Invocation(_)
| Expression::Subexpression(_)
| Expression::Boolean(_)
| Expression::Garbage => {
unreachable!("Parser should have rejected code. In only applicable with rhs of type List")