mirror of
https://github.com/nushell/nushell.git
synced 2025-05-27 18:11:19 +00:00
This commit contains two improvements: - Support for a Range syntax (and a corresponding Range value) - Work towards a signature syntax Implementing the Range syntax resulted in cleaning up how operators in the core syntax works. There are now two kinds of infix operators - tight operators (`.` and `..`) - loose operators Tight operators may not be interspersed (`$it.left..$it.right` is a syntax error). Loose operators require whitespace on both sides of the operator, and can be arbitrarily interspersed. Precedence is left to right in the core syntax. Note that delimited syntax (like `( ... )` or `[ ... ]`) is a single token node in the core syntax. A single token node can be parsed from beginning to end in a context-free manner. The rule for `.` is `<token node>.<member>`. The rule for `..` is `<token node>..<token node>`. Loose operators all have the same syntactic rule: `<token node><space><loose op><space><token node>`. The second aspect of this pull request is the beginning of support for a signature syntax. Before implementing signatures, a necessary prerequisite is for the core syntax to support multi-line programs. That work establishes a few things: - `;` and newlines are handled in the core grammar, and both count as "separators" - line comments begin with `#` and continue until the end of the line In this commit, multi-token productions in the core grammar can use separators interchangably with spaces. However, I think we will ultimately want a different rule preventing separators from occurring before an infix operator, so that the end of a line is always unambiguous. This would avoid gratuitous differences between modules and repl usage. We already effectively have this rule, because otherwise `x<newline> | y` would be a single pipeline, but of course that wouldn't work.
497 lines
15 KiB
Rust
497 lines
15 KiB
Rust
#[cfg(not(coloring_in_tokens))]
|
|
use crate::hir::syntax_shape::FlatShape;
|
|
use crate::{
|
|
hir,
|
|
hir::syntax_shape::{
|
|
color_fallible_syntax, color_syntax_with, continue_expression, expand_expr, expand_syntax,
|
|
DelimitedShape, ExpandContext, ExpandExpression, ExpressionContinuationShape,
|
|
ExpressionListShape, FallibleColorSyntax, MemberShape, PathTailShape, PathTailSyntax,
|
|
VariablePathShape,
|
|
},
|
|
hir::tokens_iterator::TokensIterator,
|
|
parse::token_tree::Delimiter,
|
|
};
|
|
use nu_errors::{ParseError, ShellError};
|
|
use nu_source::Span;
|
|
#[cfg(not(coloring_in_tokens))]
|
|
use nu_source::Spanned;
|
|
|
|
#[derive(Debug, Copy, Clone)]
|
|
pub struct AnyBlockShape;
|
|
|
|
#[cfg(not(coloring_in_tokens))]
|
|
impl FallibleColorSyntax for AnyBlockShape {
|
|
type Info = ();
|
|
type Input = ();
|
|
|
|
fn color_syntax<'a, 'b>(
|
|
&self,
|
|
_input: &(),
|
|
token_nodes: &'b mut TokensIterator<'a>,
|
|
context: &ExpandContext,
|
|
shapes: &mut Vec<Spanned<FlatShape>>,
|
|
) -> Result<(), ShellError> {
|
|
let block = token_nodes.peek_non_ws().not_eof("block");
|
|
|
|
let block = match block {
|
|
Err(_) => return Ok(()),
|
|
Ok(block) => block,
|
|
};
|
|
|
|
// is it just a block?
|
|
let block = block.node.as_block();
|
|
|
|
match block {
|
|
// If so, color it as a block
|
|
Some((children, spans)) => {
|
|
let mut token_nodes = TokensIterator::new(
|
|
children.item,
|
|
children.span,
|
|
context.source.clone(),
|
|
false,
|
|
);
|
|
color_syntax_with(
|
|
&DelimitedShape,
|
|
&(Delimiter::Brace, spans.0, spans.1),
|
|
&mut token_nodes,
|
|
context,
|
|
shapes,
|
|
);
|
|
|
|
return Ok(());
|
|
}
|
|
_ => {}
|
|
}
|
|
|
|
// Otherwise, look for a shorthand block. If none found, fail
|
|
color_fallible_syntax(&ShorthandBlock, token_nodes, context, shapes)
|
|
}
|
|
}
|
|
|
|
#[cfg(coloring_in_tokens)]
|
|
impl FallibleColorSyntax for AnyBlockShape {
|
|
type Info = ();
|
|
type Input = ();
|
|
|
|
fn name(&self) -> &'static str {
|
|
"AnyBlockShape"
|
|
}
|
|
|
|
fn color_syntax<'a, 'b>(
|
|
&self,
|
|
_input: &(),
|
|
token_nodes: &'b mut TokensIterator<'a>,
|
|
context: &ExpandContext,
|
|
) -> Result<(), ShellError> {
|
|
let block = token_nodes.peek_non_ws().not_eof("block");
|
|
|
|
let block = match block {
|
|
Err(_) => return Ok(()),
|
|
Ok(block) => block,
|
|
};
|
|
|
|
// is it just a block?
|
|
let block = block.node.as_block();
|
|
|
|
match block {
|
|
// If so, color it as a block
|
|
Some((children, spans)) => {
|
|
token_nodes.child(children, context.source.clone(), |token_nodes| {
|
|
color_syntax_with(
|
|
&DelimitedShape,
|
|
&(Delimiter::Brace, spans.0, spans.1),
|
|
token_nodes,
|
|
context,
|
|
);
|
|
});
|
|
|
|
return Ok(());
|
|
}
|
|
_ => {}
|
|
}
|
|
|
|
// Otherwise, look for a shorthand block. If none found, fail
|
|
color_fallible_syntax(&ShorthandBlock, token_nodes, context)
|
|
}
|
|
}
|
|
|
|
impl ExpandExpression for AnyBlockShape {
|
|
fn name(&self) -> &'static str {
|
|
"any block"
|
|
}
|
|
|
|
fn expand_expr<'a, 'b>(
|
|
&self,
|
|
token_nodes: &mut TokensIterator<'_>,
|
|
context: &ExpandContext,
|
|
) -> Result<hir::Expression, ParseError> {
|
|
let block = token_nodes.peek_non_ws().not_eof("block")?;
|
|
|
|
// is it just a block?
|
|
let block = block.node.as_block();
|
|
|
|
match block {
|
|
Some((block, _tags)) => {
|
|
let mut iterator =
|
|
TokensIterator::new(&block.item, block.span, context.source.clone(), false);
|
|
|
|
let exprs = expand_syntax(&ExpressionListShape, &mut iterator, context)?.exprs;
|
|
|
|
return Ok(hir::RawExpression::Block(exprs.item).into_expr(block.span));
|
|
}
|
|
_ => {}
|
|
}
|
|
|
|
expand_syntax(&ShorthandBlock, token_nodes, context)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Copy, Clone)]
|
|
pub struct ShorthandBlock;
|
|
|
|
#[cfg(not(coloring_in_tokens))]
|
|
impl FallibleColorSyntax for ShorthandBlock {
|
|
type Info = ();
|
|
type Input = ();
|
|
|
|
fn color_syntax<'a, 'b>(
|
|
&self,
|
|
_input: &(),
|
|
token_nodes: &'b mut TokensIterator<'a>,
|
|
context: &ExpandContext,
|
|
shapes: &mut Vec<Spanned<FlatShape>>,
|
|
) -> Result<(), ShellError> {
|
|
// Try to find a shorthand head. If none found, fail
|
|
color_fallible_syntax(&ShorthandPath, token_nodes, context, shapes)?;
|
|
|
|
loop {
|
|
// Check to see whether there's any continuation after the head expression
|
|
let result =
|
|
color_fallible_syntax(&ExpressionContinuationShape, token_nodes, context, shapes);
|
|
|
|
match result {
|
|
// if no continuation was found, we're done
|
|
Err(_) => break,
|
|
// if a continuation was found, look for another one
|
|
Ok(_) => continue,
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
#[cfg(coloring_in_tokens)]
|
|
impl FallibleColorSyntax for ShorthandBlock {
|
|
type Info = ();
|
|
type Input = ();
|
|
|
|
fn name(&self) -> &'static str {
|
|
"ShorthandBlock"
|
|
}
|
|
|
|
fn color_syntax<'a, 'b>(
|
|
&self,
|
|
_input: &(),
|
|
token_nodes: &'b mut TokensIterator<'a>,
|
|
context: &ExpandContext,
|
|
) -> Result<(), ShellError> {
|
|
// Try to find a shorthand head. If none found, fail
|
|
color_fallible_syntax(&ShorthandPath, token_nodes, context)?;
|
|
|
|
loop {
|
|
// Check to see whether there's any continuation after the head expression
|
|
let result = color_fallible_syntax(&ExpressionContinuationShape, token_nodes, context);
|
|
|
|
match result {
|
|
// if no continuation was found, we're done
|
|
Err(_) => break,
|
|
// if a continuation was found, look for another one
|
|
Ok(_) => continue,
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
impl ExpandExpression for ShorthandBlock {
|
|
fn name(&self) -> &'static str {
|
|
"shorthand block"
|
|
}
|
|
|
|
fn expand_expr<'a, 'b>(
|
|
&self,
|
|
token_nodes: &'b mut TokensIterator<'a>,
|
|
context: &ExpandContext,
|
|
) -> Result<hir::Expression, ParseError> {
|
|
let path = expand_expr(&ShorthandPath, token_nodes, context)?;
|
|
let start = path.span;
|
|
let expr = continue_expression(path, token_nodes, context);
|
|
let end = expr.span;
|
|
let block = hir::RawExpression::Block(vec![expr]).into_expr(start.until(end));
|
|
|
|
Ok(block)
|
|
}
|
|
}
|
|
|
|
/// A shorthand for `$it.foo."bar"`, used inside of a shorthand block
|
|
#[derive(Debug, Copy, Clone)]
|
|
pub struct ShorthandPath;
|
|
|
|
#[cfg(not(coloring_in_tokens))]
|
|
impl FallibleColorSyntax for ShorthandPath {
|
|
type Info = ();
|
|
type Input = ();
|
|
|
|
fn color_syntax<'a, 'b>(
|
|
&self,
|
|
_input: &(),
|
|
token_nodes: &'b mut TokensIterator<'a>,
|
|
context: &ExpandContext,
|
|
shapes: &mut Vec<Spanned<FlatShape>>,
|
|
) -> Result<(), ShellError> {
|
|
token_nodes.atomic(|token_nodes| {
|
|
let variable = color_fallible_syntax(&VariablePathShape, token_nodes, context, shapes);
|
|
|
|
match variable {
|
|
Ok(_) => {
|
|
// if it's a variable path, that's the head part
|
|
return Ok(());
|
|
}
|
|
|
|
Err(_) => {
|
|
// otherwise, we'll try to find a member path
|
|
}
|
|
}
|
|
|
|
// look for a member (`<member>` -> `$it.<member>`)
|
|
color_fallible_syntax(&MemberShape, token_nodes, context, shapes)?;
|
|
|
|
// Now that we've synthesized the head, of the path, proceed to expand the tail of the path
|
|
// like any other path.
|
|
let tail = color_fallible_syntax(&PathTailShape, token_nodes, context, shapes);
|
|
|
|
match tail {
|
|
Ok(_) => {}
|
|
Err(_) => {
|
|
// It's ok if there's no path tail; a single member is sufficient
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
})
|
|
}
|
|
}
|
|
|
|
#[cfg(coloring_in_tokens)]
|
|
impl FallibleColorSyntax for ShorthandPath {
|
|
type Info = ();
|
|
type Input = ();
|
|
|
|
fn name(&self) -> &'static str {
|
|
"ShorthandPath"
|
|
}
|
|
|
|
fn color_syntax<'a, 'b>(
|
|
&self,
|
|
_input: &(),
|
|
token_nodes: &'b mut TokensIterator<'a>,
|
|
context: &ExpandContext,
|
|
) -> Result<(), ShellError> {
|
|
token_nodes.atomic(|token_nodes| {
|
|
let variable = color_fallible_syntax(&VariablePathShape, token_nodes, context);
|
|
|
|
match variable {
|
|
Ok(_) => {
|
|
// if it's a variable path, that's the head part
|
|
return Ok(());
|
|
}
|
|
|
|
Err(_) => {
|
|
// otherwise, we'll try to find a member path
|
|
}
|
|
}
|
|
|
|
// look for a member (`<member>` -> `$it.<member>`)
|
|
color_fallible_syntax(&MemberShape, token_nodes, context)?;
|
|
|
|
// Now that we've synthesized the head, of the path, proceed to expand the tail of the path
|
|
// like any other path.
|
|
let tail = color_fallible_syntax(&PathTailShape, token_nodes, context);
|
|
|
|
match tail {
|
|
Ok(_) => {}
|
|
Err(_) => {
|
|
// It's ok if there's no path tail; a single member is sufficient
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
})
|
|
}
|
|
}
|
|
|
|
impl ExpandExpression for ShorthandPath {
|
|
fn name(&self) -> &'static str {
|
|
"shorthand path"
|
|
}
|
|
|
|
fn expand_expr<'a, 'b>(
|
|
&self,
|
|
token_nodes: &'b mut TokensIterator<'a>,
|
|
context: &ExpandContext,
|
|
) -> Result<hir::Expression, ParseError> {
|
|
// if it's a variable path, that's the head part
|
|
let path = expand_expr(&VariablePathShape, token_nodes, context);
|
|
|
|
match path {
|
|
Ok(path) => return Ok(path),
|
|
Err(_) => {}
|
|
}
|
|
|
|
// Synthesize the head of the shorthand path (`<member>` -> `$it.<member>`)
|
|
let mut head = expand_expr(&ShorthandHeadShape, token_nodes, context)?;
|
|
|
|
// Now that we've synthesized the head, of the path, proceed to expand the tail of the path
|
|
// like any other path.
|
|
let tail = expand_syntax(&PathTailShape, token_nodes, context);
|
|
|
|
match tail {
|
|
Err(_) => return Ok(head),
|
|
Ok(PathTailSyntax { tail, .. }) => {
|
|
// For each member that `PathTailShape` expanded, join it onto the existing expression
|
|
// to form a new path
|
|
for member in tail {
|
|
head = hir::Expression::dot_member(head, member);
|
|
}
|
|
|
|
Ok(head)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A shorthand for `$it.foo."bar"`, used inside of a shorthand block
|
|
#[derive(Debug, Copy, Clone)]
|
|
pub struct ShorthandHeadShape;
|
|
|
|
#[cfg(not(coloring_in_tokens))]
|
|
impl FallibleColorSyntax for ShorthandHeadShape {
|
|
type Info = ();
|
|
type Input = ();
|
|
|
|
fn color_syntax<'a, 'b>(
|
|
&self,
|
|
_input: &(),
|
|
token_nodes: &'b mut TokensIterator<'a>,
|
|
_context: &ExpandContext,
|
|
shapes: &mut Vec<Spanned<FlatShape>>,
|
|
) -> Result<(), ShellError> {
|
|
use crate::parse::token_tree::TokenNode;
|
|
use crate::parse::tokens::{Token, UnspannedToken};
|
|
use nu_protocol::SpannedTypeName;
|
|
use nu_source::SpannedItem;
|
|
|
|
// A shorthand path must not be at EOF
|
|
let peeked = token_nodes.peek_non_ws().not_eof("shorthand path head")?;
|
|
|
|
match peeked.node {
|
|
// If the head of a shorthand path is a bare token, it expands to `$it.bare`
|
|
TokenNode::Token(Token {
|
|
unspanned: UnspannedToken::Bare,
|
|
span,
|
|
}) => {
|
|
peeked.commit();
|
|
shapes.push(FlatShape::BareMember.spanned(*span));
|
|
Ok(())
|
|
}
|
|
|
|
// If the head of a shorthand path is a string, it expands to `$it."some string"`
|
|
TokenNode::Token(Token {
|
|
unspanned: UnspannedToken::String(_),
|
|
span: outer,
|
|
}) => {
|
|
peeked.commit();
|
|
shapes.push(FlatShape::StringMember.spanned(*outer));
|
|
Ok(())
|
|
}
|
|
|
|
other => Err(ShellError::type_error(
|
|
"shorthand head",
|
|
other.spanned_type_name(),
|
|
)),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(coloring_in_tokens)]
|
|
#[cfg(not(coloring_in_tokens))]
|
|
impl FallibleColorSyntax for ShorthandHeadShape {
|
|
type Info = ();
|
|
type Input = ();
|
|
|
|
fn color_syntax<'a, 'b>(
|
|
&self,
|
|
_input: &(),
|
|
token_nodes: &'b mut TokensIterator<'a>,
|
|
_context: &ExpandContext,
|
|
shapes: &mut Vec<Spanned<FlatShape>>,
|
|
) -> Result<(), ShellError> {
|
|
// A shorthand path must not be at EOF
|
|
let peeked = token_nodes.peek_non_ws().not_eof("shorthand path head")?;
|
|
|
|
match peeked.node {
|
|
// If the head of a shorthand path is a bare token, it expands to `$it.bare`
|
|
TokenNode::Token(Spanned {
|
|
item: UnspannedToken::Bare,
|
|
span,
|
|
}) => {
|
|
peeked.commit();
|
|
shapes.push(FlatShape::BareMember.spanned(*span));
|
|
Ok(())
|
|
}
|
|
|
|
// If the head of a shorthand path is a string, it expands to `$it."some string"`
|
|
TokenNode::Token(Spanned {
|
|
item: UnspannedToken::String(_),
|
|
span: outer,
|
|
}) => {
|
|
peeked.commit();
|
|
shapes.push(FlatShape::StringMember.spanned(*outer));
|
|
Ok(())
|
|
}
|
|
|
|
other => Err(ShellError::type_error(
|
|
"shorthand head",
|
|
other.tagged_type_name(),
|
|
)),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ExpandExpression for ShorthandHeadShape {
|
|
fn name(&self) -> &'static str {
|
|
"shorthand head"
|
|
}
|
|
|
|
fn expand_expr<'a, 'b>(
|
|
&self,
|
|
token_nodes: &'b mut TokensIterator<'a>,
|
|
context: &ExpandContext,
|
|
) -> Result<hir::Expression, ParseError> {
|
|
let head = expand_syntax(&MemberShape, token_nodes, context)?;
|
|
let head = head.to_path_member(context.source);
|
|
|
|
// Synthesize an `$it` expression
|
|
let it = synthetic_it();
|
|
let span = head.span;
|
|
|
|
Ok(hir::Expression::path(it, vec![head], span))
|
|
}
|
|
}
|
|
|
|
fn synthetic_it() -> hir::Expression {
|
|
hir::Expression::it_variable(Span::unknown(), Span::unknown())
|
|
}
|