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

19
crates/nu-parser/src/parse.rs
View File

@ -129,7 +129,7 @@ pub fn parse_full_column_path(
if head.is_none() && current_part.starts_with('(') && current_part.ends_with(')') {
let (invoc, err) =
parse_invocation(&current_part.clone().spanned(part_span), scope);
parse_subexpression(&current_part.clone().spanned(part_span), scope);
if error.is_none() {
error = err;
}
@ -162,7 +162,7 @@ pub fn parse_full_column_path(
if head.is_none() {
if current_part.starts_with('(') && current_part.ends_with(')') {
let (invoc, err) = parse_invocation(&current_part.spanned(part_span), scope);
let (invoc, err) = parse_subexpression(&current_part.spanned(part_span), scope);
if error.is_none() {
error = err;
}
@ -470,13 +470,12 @@ fn parse_filesize(lite_arg: &Spanned<String>) -> (SpannedExpression, Option<Pars
)
}
fn parse_invocation(
fn parse_subexpression(
lite_arg: &Spanned<String>,
scope: &dyn ParserScope,
) -> (SpannedExpression, Option<ParseError>) {
let mut error = None;
// We have a command invocation
let string: String = lite_arg
.item
.chars()
@ -502,7 +501,7 @@ fn parse_invocation(
scope.exit_scope();
(
SpannedExpression::new(Expression::Invocation(classified_block), lite_arg.span),
SpannedExpression::new(Expression::Subexpression(classified_block), lite_arg.span),
error,
)
}
@ -526,7 +525,7 @@ fn parse_variable(
}
/// Parses the given lite_arg starting with dollar returning
/// a expression starting with $
/// Currently either Variable, Invocation, FullColumnPath
/// Currently either Variable, String interpolation, FullColumnPath
fn parse_dollar_expr(
lite_arg: &Spanned<String>,
scope: &dyn ParserScope,
@ -676,7 +675,7 @@ fn parse_interpolated_string(
match result {
(classified_block, None) => {
output.push(SpannedExpression {
expr: Expression::Invocation(classified_block),
expr: Expression::Subexpression(classified_block),
span: c.span,
});
}
@ -709,8 +708,8 @@ fn parse_interpolated_string(
let group = Group::new(pipelines, lite_arg.span);
let call = SpannedExpression {
expr: Expression::Invocation(Arc::new(Block::new(
Signature::new("<invocation>"),
expr: Expression::Subexpression(Arc::new(Block::new(
Signature::new("<subexpression>"),
vec![group],
IndexMap::new(),
lite_arg.span,
@ -729,7 +728,7 @@ fn parse_external_arg(
if lite_arg.item.starts_with('$') {
parse_dollar_expr(&lite_arg, scope)
} else if lite_arg.item.starts_with('(') {
parse_invocation(&lite_arg, scope)
parse_subexpression(&lite_arg, scope)
} else {
(
SpannedExpression::new(Expression::string(lite_arg.item.clone()), lite_arg.span),

2
crates/nu-parser/src/shapes.rs
View File

@ -6,7 +6,7 @@ use nu_source::{Spanned, SpannedItem};
pub fn expression_to_flat_shape(e: &SpannedExpression) -> Vec<Spanned<FlatShape>> {
match &e.expr {
Expression::Block(exprs) => shapes(exprs),
Expression::Invocation(exprs) => shapes(exprs),
Expression::Subexpression(exprs) => shapes(exprs),
Expression::FilePath(_) => vec![FlatShape::Path.spanned(e.span)],
Expression::Garbage => vec![FlatShape::Garbage.spanned(e.span)],
Expression::List(exprs) => {