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

Command expression need not carry span information.

Browse Source
This commit is contained in:
Andrés N. Robalino 2020-08-24 20:47:58 -05:00
parent f078aacc25
commit a64cfb6285
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@ impl<'s> Flatten<'s> {
Expression::Block(block) => self.completion_locations(block), Expression::Block(block) => self.completion_locations(block),
Expression::Invocation(block) => self.completion_locations(block), Expression::Invocation(block) => self.completion_locations(block),
Expression::List(exprs) => exprs.iter().flat_map(|v| self.expression(v)).collect(), Expression::List(exprs) => exprs.iter().flat_map(|v| self.expression(v)).collect(),
Expression::Command(span) => vec![LocationType::Command.spanned(*span)], Expression::Command => vec![LocationType::Command.spanned(e.span)],
Expression::Path(path) => self.expression(&path.head), Expression::Path(path) => self.expression(&path.head),
Expression::Variable(_) => vec![LocationType::Variable.spanned(e.span)], Expression::Variable(_) => vec![LocationType::Variable.spanned(e.span)],
@ -69,7 +69,7 @@ impl<'s> Flatten<'s> {
let mut result = Vec::new(); let mut result = Vec::new();
match internal.args.head.expr { match internal.args.head.expr {
Expression::Command(_) => { Expression::Command => {
result.push(LocationType::Command.spanned(internal.name_span)); result.push(LocationType::Command.spanned(internal.name_span));
} }
Expression::Literal(Literal::String(_)) => { Expression::Literal(Literal::String(_)) => {

2
crates/nu-cli/src/evaluate/evaluator.rs
View File

@ -34,7 +34,7 @@ pub(crate) async fn evaluate_baseline_expr(
Ok(UntaggedValue::string(s).into_untagged_value()) Ok(UntaggedValue::string(s).into_untagged_value())
} }
Expression::Variable(var) => evaluate_reference(&var, it, vars, env, tag), Expression::Variable(var) => evaluate_reference(&var, it, vars, env, tag),
Expression::Command(_) => unimplemented!(), Expression::Command => unimplemented!(),
Expression::Invocation(block) => evaluate_invocation(block, registry, it, vars, env).await, Expression::Invocation(block) => evaluate_invocation(block, registry, it, vars, env).await,
Expression::ExternalCommand(_) => unimplemented!(), Expression::ExternalCommand(_) => unimplemented!(),
Expression::Binary(binary) => { Expression::Binary(binary) => {

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

@ -26,7 +26,7 @@ pub fn expression_to_flat_shape(e: &SpannedExpression) -> Vec<Spanned<FlatShape>
} }
output output
} }
Expression::Command(command) => vec![FlatShape::InternalCommand.spanned(*command)], Expression::Command => vec![FlatShape::InternalCommand.spanned(e.span)],
Expression::Literal(Literal::Bare(_)) => vec![FlatShape::BareMember.spanned(e.span)], Expression::Literal(Literal::Bare(_)) => vec![FlatShape::BareMember.spanned(e.span)],
Expression::Literal(Literal::ColumnPath(_)) => vec![FlatShape::Path.spanned(e.span)], Expression::Literal(Literal::ColumnPath(_)) => vec![FlatShape::Path.spanned(e.span)],
Expression::Literal(Literal::GlobPattern(_)) => { Expression::Literal(Literal::GlobPattern(_)) => {

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

@ -35,10 +35,7 @@ impl InternalCommand {
name, name,
name_span, name_span,
args: crate::hir::Call::new( args: crate::hir::Call::new(
Box::new(SpannedExpression::new( Box::new(SpannedExpression::new(Expression::Command, name_span)),
Expression::Command(name_span),
name_span,
)),
full_span, full_span,
), ),
} }
@ -724,7 +721,7 @@ impl PrettyDebugWithSource for SpannedExpression {
Expression::ExternalCommand(external) => { Expression::ExternalCommand(external) => {
b::keyword("^") + b::keyword(external.name.span.slice(source)) b::keyword("^") + b::keyword(external.name.span.slice(source))
} }
Expression::Command(command) => b::keyword(command.slice(source)), Expression::Command => b::keyword(self.span.slice(source)),
Expression::Boolean(boolean) => match boolean { Expression::Boolean(boolean) => match boolean {
true => b::primitive("$yes"), true => b::primitive("$yes"),
false => b::primitive("$no"), false => b::primitive("$no"),
@ -765,9 +762,7 @@ impl PrettyDebugWithSource for SpannedExpression {
"command", "command",
b::keyword("^") + b::primitive(external.name.span.slice(source)), b::keyword("^") + b::primitive(external.name.span.slice(source)),
), ),
Expression::Command(command) => { Expression::Command => b::typed("command", b::primitive(self.span.slice(source))),
b::typed("command", b::primitive(command.slice(source)))
}
Expression::Boolean(boolean) => match boolean { Expression::Boolean(boolean) => match boolean {
true => b::primitive("$yes"), true => b::primitive("$yes"),
false => b::primitive("$no"), false => b::primitive("$no"),
@ -969,7 +964,7 @@ pub enum Expression {
FilePath(PathBuf), FilePath(PathBuf),
ExternalCommand(ExternalStringCommand), ExternalCommand(ExternalStringCommand),
Command(Span), Command,
Invocation(hir::Block), Invocation(hir::Block),
Boolean(bool), Boolean(bool),
@ -985,7 +980,7 @@ impl ShellTypeName for Expression {
match self { match self {
Expression::Literal(literal) => literal.type_name(), Expression::Literal(literal) => literal.type_name(),
Expression::Synthetic(synthetic) => synthetic.type_name(), Expression::Synthetic(synthetic) => synthetic.type_name(),
Expression::Command(..) => "command", Expression::Command => "command",
Expression::ExternalWord => "external word", Expression::ExternalWord => "external word",
Expression::FilePath(..) => "file path", Expression::FilePath(..) => "file path",
Expression::Variable(..) => "variable", Expression::Variable(..) => "variable",