mirror of
https://github.com/nushell/nushell.git
synced 2025-04-11 14:58:21 +02:00
The main thrust of this (very large) commit is an overhaul of the expansion system. The parsing pipeline is: - Lightly parse the source file for atoms, basic delimiters and pipeline structure into a token tree - Expand the token tree into a HIR (high-level intermediate representation) based upon the baseline syntax rules for expressions and the syntactic shape of commands. Somewhat non-traditionally, nu doesn't have an AST at all. It goes directly from the token tree, which doesn't represent many important distinctions (like the difference between `hello` and `5KB`) directly into a high-level representation that doesn't have a direct correspondence to the source code. At a high level, nu commands work like macros, in the sense that the syntactic shape of the invocation of a command depends on the definition of a command. However, commands do not have the ability to perform unrestricted expansions of the token tree. Instead, they describe their arguments in terms of syntactic shapes, and the expander expands the token tree into HIR based upon that definition. For example, the `where` command says that it takes a block as its first required argument, and the description of the block syntactic shape expands the syntax `cpu > 10` into HIR that represents `{ $it.cpu > 10 }`. This commit overhauls that system so that the syntactic shapes are described in terms of a few new traits (`ExpandSyntax` and `ExpandExpression` are the primary ones) that are more composable than the previous system. The first big win of this new system is the addition of the `ColumnPath` shape, which looks like `cpu."max ghz"` or `package.version`. Previously, while a variable path could look like `$it.cpu."max ghz"`, the tail of a variable path could not be easily reused in other contexts. Now, that tail is its own syntactic shape, and it can be used as part of a command's signature. This cleans up commands like `inc`, `add` and `edit` as well as shorthand blocks, which can now look like `| where cpu."max ghz" > 10`
362 lines
12 KiB
Rust
362 lines
12 KiB
Rust
pub(crate) mod baseline_parse;
|
|
pub(crate) mod binary;
|
|
pub(crate) mod expand_external_tokens;
|
|
pub(crate) mod external_command;
|
|
pub(crate) mod named;
|
|
pub(crate) mod path;
|
|
pub(crate) mod syntax_shape;
|
|
pub(crate) mod tokens_iterator;
|
|
|
|
use crate::parser::{registry, Operator, Unit};
|
|
use crate::prelude::*;
|
|
use derive_new::new;
|
|
use getset::Getters;
|
|
use serde::{Deserialize, Serialize};
|
|
use std::fmt;
|
|
use std::path::PathBuf;
|
|
|
|
use crate::evaluate::Scope;
|
|
use crate::parser::parse::tokens::RawNumber;
|
|
use crate::traits::ToDebug;
|
|
|
|
pub(crate) use self::binary::Binary;
|
|
pub(crate) use self::external_command::ExternalCommand;
|
|
pub(crate) use self::named::NamedArguments;
|
|
pub(crate) use self::path::Path;
|
|
pub(crate) use self::syntax_shape::ExpandContext;
|
|
pub(crate) use self::tokens_iterator::debug::debug_tokens;
|
|
pub(crate) use self::tokens_iterator::TokensIterator;
|
|
|
|
pub use self::syntax_shape::SyntaxShape;
|
|
|
|
#[derive(Debug, Clone, Eq, PartialEq, Getters, Serialize, Deserialize, new)]
|
|
pub struct Call {
|
|
#[get = "pub(crate)"]
|
|
pub head: Box<Expression>,
|
|
#[get = "pub(crate)"]
|
|
pub positional: Option<Vec<Expression>>,
|
|
#[get = "pub(crate)"]
|
|
pub named: Option<NamedArguments>,
|
|
}
|
|
|
|
impl Call {
|
|
pub fn evaluate(
|
|
&self,
|
|
registry: ®istry::CommandRegistry,
|
|
scope: &Scope,
|
|
source: &Text,
|
|
) -> Result<registry::EvaluatedArgs, ShellError> {
|
|
registry::evaluate_args(self, registry, scope, source)
|
|
}
|
|
}
|
|
|
|
impl ToDebug for Call {
|
|
fn fmt_debug(&self, f: &mut fmt::Formatter, source: &str) -> fmt::Result {
|
|
write!(f, "({}", self.head.debug(source))?;
|
|
|
|
if let Some(positional) = &self.positional {
|
|
write!(f, " ")?;
|
|
write!(
|
|
f,
|
|
"{}",
|
|
&itertools::join(positional.iter().map(|p| p.debug(source)), " ")
|
|
)?;
|
|
}
|
|
|
|
if let Some(named) = &self.named {
|
|
write!(f, "{}", named.debug(source))?;
|
|
}
|
|
|
|
write!(f, ")")?;
|
|
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)]
|
|
pub enum RawExpression {
|
|
Literal(Literal),
|
|
ExternalWord,
|
|
Synthetic(Synthetic),
|
|
Variable(Variable),
|
|
Binary(Box<Binary>),
|
|
Block(Vec<Expression>),
|
|
List(Vec<Expression>),
|
|
Path(Box<Path>),
|
|
|
|
FilePath(PathBuf),
|
|
ExternalCommand(ExternalCommand),
|
|
Command(Tag),
|
|
|
|
Boolean(bool),
|
|
}
|
|
|
|
#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)]
|
|
pub enum Synthetic {
|
|
String(String),
|
|
}
|
|
|
|
impl Synthetic {
|
|
pub fn type_name(&self) -> &'static str {
|
|
match self {
|
|
Synthetic::String(_) => "string",
|
|
}
|
|
}
|
|
}
|
|
|
|
impl RawExpression {
|
|
pub fn type_name(&self) -> &'static str {
|
|
match self {
|
|
RawExpression::Literal(literal) => literal.type_name(),
|
|
RawExpression::Synthetic(synthetic) => synthetic.type_name(),
|
|
RawExpression::Command(..) => "command",
|
|
RawExpression::ExternalWord => "external word",
|
|
RawExpression::FilePath(..) => "file path",
|
|
RawExpression::Variable(..) => "variable",
|
|
RawExpression::List(..) => "list",
|
|
RawExpression::Binary(..) => "binary",
|
|
RawExpression::Block(..) => "block",
|
|
RawExpression::Path(..) => "variable path",
|
|
RawExpression::Boolean(..) => "boolean",
|
|
RawExpression::ExternalCommand(..) => "external",
|
|
}
|
|
}
|
|
}
|
|
|
|
pub type Expression = Tagged<RawExpression>;
|
|
|
|
impl std::fmt::Display for Expression {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
let span = self.tag.span;
|
|
|
|
match &self.item {
|
|
RawExpression::Literal(literal) => write!(f, "{}", literal.tagged(self.tag)),
|
|
RawExpression::Synthetic(Synthetic::String(s)) => write!(f, "{}", s),
|
|
RawExpression::Command(_) => write!(f, "Command{{ {}..{} }}", span.start(), span.end()),
|
|
RawExpression::ExternalWord => {
|
|
write!(f, "ExternalWord{{ {}..{} }}", span.start(), span.end())
|
|
}
|
|
RawExpression::FilePath(file) => write!(f, "Path{{ {} }}", file.display()),
|
|
RawExpression::Variable(variable) => write!(f, "{}", variable),
|
|
RawExpression::List(list) => f
|
|
.debug_list()
|
|
.entries(list.iter().map(|e| format!("{}", e)))
|
|
.finish(),
|
|
RawExpression::Binary(binary) => write!(f, "{}", binary),
|
|
RawExpression::Block(items) => {
|
|
write!(f, "Block")?;
|
|
f.debug_set()
|
|
.entries(items.iter().map(|i| format!("{}", i)))
|
|
.finish()
|
|
}
|
|
RawExpression::Path(path) => write!(f, "{}", path),
|
|
RawExpression::Boolean(b) => write!(f, "${}", b),
|
|
RawExpression::ExternalCommand(..) => {
|
|
write!(f, "ExternalComment{{ {}..{} }}", span.start(), span.end())
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Expression {
|
|
pub(crate) fn number(i: impl Into<Number>, tag: impl Into<Tag>) -> Expression {
|
|
RawExpression::Literal(Literal::Number(i.into())).tagged(tag.into())
|
|
}
|
|
|
|
pub(crate) fn size(
|
|
i: impl Into<Number>,
|
|
unit: impl Into<Unit>,
|
|
tag: impl Into<Tag>,
|
|
) -> Expression {
|
|
RawExpression::Literal(Literal::Size(i.into(), unit.into())).tagged(tag.into())
|
|
}
|
|
|
|
pub(crate) fn synthetic_string(s: impl Into<String>) -> Expression {
|
|
RawExpression::Synthetic(Synthetic::String(s.into())).tagged_unknown()
|
|
}
|
|
|
|
pub(crate) fn string(inner: impl Into<Tag>, outer: impl Into<Tag>) -> Expression {
|
|
RawExpression::Literal(Literal::String(inner.into())).tagged(outer.into())
|
|
}
|
|
|
|
pub(crate) fn path(
|
|
head: Expression,
|
|
tail: Vec<Tagged<impl Into<String>>>,
|
|
tag: impl Into<Tag>,
|
|
) -> Expression {
|
|
let tail = tail.into_iter().map(|t| t.map(|s| s.into())).collect();
|
|
RawExpression::Path(Box::new(Path::new(head, tail))).tagged(tag.into())
|
|
}
|
|
|
|
pub(crate) fn dot_member(head: Expression, next: Tagged<impl Into<String>>) -> Expression {
|
|
let Tagged { item, tag } = head;
|
|
let new_tag = head.tag.until(next.tag);
|
|
|
|
match item {
|
|
RawExpression::Path(path) => {
|
|
let (head, mut tail) = path.parts();
|
|
|
|
tail.push(next.map(|i| i.into()));
|
|
Expression::path(head, tail, new_tag)
|
|
}
|
|
|
|
other => Expression::path(other.tagged(tag), vec![next], new_tag),
|
|
}
|
|
}
|
|
|
|
pub(crate) fn infix(
|
|
left: Expression,
|
|
op: Tagged<impl Into<Operator>>,
|
|
right: Expression,
|
|
) -> Expression {
|
|
let new_tag = left.tag.until(right.tag);
|
|
|
|
RawExpression::Binary(Box::new(Binary::new(left, op.map(|o| o.into()), right)))
|
|
.tagged(new_tag)
|
|
}
|
|
|
|
pub(crate) fn file_path(path: impl Into<PathBuf>, outer: impl Into<Tag>) -> Expression {
|
|
RawExpression::FilePath(path.into()).tagged(outer)
|
|
}
|
|
|
|
pub(crate) fn list(list: Vec<Expression>, tag: impl Into<Tag>) -> Expression {
|
|
RawExpression::List(list).tagged(tag)
|
|
}
|
|
|
|
pub(crate) fn bare(tag: impl Into<Tag>) -> Expression {
|
|
RawExpression::Literal(Literal::Bare).tagged(tag)
|
|
}
|
|
|
|
pub(crate) fn pattern(tag: impl Into<Tag>) -> Expression {
|
|
RawExpression::Literal(Literal::GlobPattern).tagged(tag.into())
|
|
}
|
|
|
|
pub(crate) fn variable(inner: impl Into<Tag>, outer: impl Into<Tag>) -> Expression {
|
|
RawExpression::Variable(Variable::Other(inner.into())).tagged(outer)
|
|
}
|
|
|
|
pub(crate) fn external_command(inner: impl Into<Tag>, outer: impl Into<Tag>) -> Expression {
|
|
RawExpression::ExternalCommand(ExternalCommand::new(inner.into())).tagged(outer)
|
|
}
|
|
|
|
pub(crate) fn it_variable(inner: impl Into<Tag>, outer: impl Into<Tag>) -> Expression {
|
|
RawExpression::Variable(Variable::It(inner.into())).tagged(outer)
|
|
}
|
|
}
|
|
|
|
impl ToDebug for Expression {
|
|
fn fmt_debug(&self, f: &mut fmt::Formatter, source: &str) -> fmt::Result {
|
|
match self.item() {
|
|
RawExpression::Literal(l) => l.tagged(self.tag()).fmt_debug(f, source),
|
|
RawExpression::FilePath(p) => write!(f, "{}", p.display()),
|
|
RawExpression::ExternalWord => write!(f, "{}", self.tag().slice(source)),
|
|
RawExpression::Command(tag) => write!(f, "{}", tag.slice(source)),
|
|
RawExpression::Synthetic(Synthetic::String(s)) => write!(f, "{:?}", s),
|
|
RawExpression::Variable(Variable::It(_)) => write!(f, "$it"),
|
|
RawExpression::Variable(Variable::Other(s)) => write!(f, "${}", s.slice(source)),
|
|
RawExpression::Binary(b) => write!(f, "{}", b.debug(source)),
|
|
RawExpression::ExternalCommand(c) => write!(f, "^{}", c.name().slice(source)),
|
|
RawExpression::Block(exprs) => {
|
|
write!(f, "{{ ")?;
|
|
|
|
for expr in exprs {
|
|
write!(f, "{} ", expr.debug(source))?;
|
|
}
|
|
|
|
write!(f, "}}")
|
|
}
|
|
RawExpression::List(exprs) => {
|
|
write!(f, "[ ")?;
|
|
|
|
for expr in exprs {
|
|
write!(f, "{} ", expr.debug(source))?;
|
|
}
|
|
|
|
write!(f, "]")
|
|
}
|
|
RawExpression::Path(p) => write!(f, "{}", p.debug(source)),
|
|
RawExpression::Boolean(true) => write!(f, "$yes"),
|
|
RawExpression::Boolean(false) => write!(f, "$no"),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<Tagged<Path>> for Expression {
|
|
fn from(path: Tagged<Path>) -> Expression {
|
|
path.map(|p| RawExpression::Path(Box::new(p)))
|
|
}
|
|
}
|
|
|
|
/// Literals are expressions that are:
|
|
///
|
|
/// 1. Copy
|
|
/// 2. Can be evaluated without additional context
|
|
/// 3. Evaluation cannot produce an error
|
|
#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)]
|
|
pub enum Literal {
|
|
Number(Number),
|
|
Size(Number, Unit),
|
|
String(Tag),
|
|
GlobPattern,
|
|
Bare,
|
|
}
|
|
|
|
impl std::fmt::Display for Tagged<Literal> {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
write!(f, "{}", Tagged::new(self.tag, &self.item))
|
|
}
|
|
}
|
|
|
|
impl std::fmt::Display for Tagged<&Literal> {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
let span = self.tag.span;
|
|
|
|
match &self.item {
|
|
Literal::Number(number) => write!(f, "{}", number),
|
|
Literal::Size(number, unit) => write!(f, "{}{}", number, unit.as_str()),
|
|
Literal::String(_) => write!(f, "String{{ {}..{} }}", span.start(), span.end()),
|
|
Literal::GlobPattern => write!(f, "Glob{{ {}..{} }}", span.start(), span.end()),
|
|
Literal::Bare => write!(f, "Bare{{ {}..{} }}", span.start(), span.end()),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ToDebug for Tagged<&Literal> {
|
|
fn fmt_debug(&self, f: &mut fmt::Formatter, source: &str) -> fmt::Result {
|
|
match self.item() {
|
|
Literal::Number(number) => write!(f, "{:?}", *number),
|
|
Literal::Size(number, unit) => write!(f, "{:?}{:?}", *number, unit),
|
|
Literal::String(tag) => write!(f, "{}", tag.slice(source)),
|
|
Literal::GlobPattern => write!(f, "{}", self.tag().slice(source)),
|
|
Literal::Bare => write!(f, "{}", self.tag().slice(source)),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Literal {
|
|
fn type_name(&self) -> &'static str {
|
|
match self {
|
|
Literal::Number(..) => "number",
|
|
Literal::Size(..) => "size",
|
|
Literal::String(..) => "string",
|
|
Literal::Bare => "string",
|
|
Literal::GlobPattern => "pattern",
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)]
|
|
pub enum Variable {
|
|
It(Tag),
|
|
Other(Tag),
|
|
}
|
|
|
|
impl std::fmt::Display for Variable {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
match self {
|
|
Variable::It(_) => write!(f, "$it"),
|
|
Variable::Other(tag) => write!(f, "${{ {}..{} }}", tag.span.start(), tag.span.end()),
|
|
}
|
|
}
|
|
}
|