mirror of
https://github.com/nushell/nushell.git
synced 2025-04-02 12:19:48 +02:00
4d3e7efe25
Previously, there was a single parsing rule for "bare words" that applied to both internal and external commands. This meant that, because `cargo +nightly` needed to work, we needed to add `+` as a valid character in bare words. The number of characters continued to grow, and the situation was becoming untenable. The current strategy would eventually eat up all syntax and make it impossible to add syntax like `@foo` to internal commands. This patch significantly restricts bare words and introduces a new token type (`ExternalWord`). An `ExternalWord` expands to an error in the internal syntax, but expands to a bare word in the external syntax. `ExternalWords` are highlighted in grey in the shell.
94 lines
4.0 KiB
Rust
94 lines
4.0 KiB
Rust
use crate::context::Context;
|
|
use crate::errors::ShellError;
|
|
use crate::parser::{hir, RawToken, Token};
|
|
use crate::Text;
|
|
use std::path::PathBuf;
|
|
|
|
pub fn baseline_parse_single_token(
|
|
token: &Token,
|
|
source: &Text,
|
|
) -> Result<hir::Expression, ShellError> {
|
|
Ok(match *token.item() {
|
|
RawToken::Number(number) => hir::Expression::number(number.to_number(source), token.span()),
|
|
RawToken::Size(int, unit) => {
|
|
hir::Expression::size(int.to_number(source), unit, token.span())
|
|
}
|
|
RawToken::String(span) => hir::Expression::string(span, token.span()),
|
|
RawToken::Variable(span) if span.slice(source) == "it" => {
|
|
hir::Expression::it_variable(span, token.span())
|
|
}
|
|
RawToken::Variable(span) => hir::Expression::variable(span, token.span()),
|
|
RawToken::ExternalCommand(span) => hir::Expression::external_command(span, token.span()),
|
|
RawToken::ExternalWord => return Err(ShellError::invalid_external_word(token.span())),
|
|
RawToken::Bare => hir::Expression::bare(token.span()),
|
|
})
|
|
}
|
|
|
|
pub fn baseline_parse_token_as_number(
|
|
token: &Token,
|
|
source: &Text,
|
|
) -> Result<hir::Expression, ShellError> {
|
|
Ok(match *token.item() {
|
|
RawToken::Variable(span) if span.slice(source) == "it" => {
|
|
hir::Expression::it_variable(span, token.span())
|
|
}
|
|
RawToken::ExternalCommand(span) => hir::Expression::external_command(span, token.span()),
|
|
RawToken::ExternalWord => return Err(ShellError::invalid_external_word(token.span())),
|
|
RawToken::Variable(span) => hir::Expression::variable(span, token.span()),
|
|
RawToken::Number(number) => hir::Expression::number(number.to_number(source), token.span()),
|
|
RawToken::Size(number, unit) => {
|
|
hir::Expression::size(number.to_number(source), unit, token.span())
|
|
}
|
|
RawToken::Bare => hir::Expression::bare(token.span()),
|
|
RawToken::String(span) => hir::Expression::string(span, token.span()),
|
|
})
|
|
}
|
|
|
|
pub fn baseline_parse_token_as_string(
|
|
token: &Token,
|
|
source: &Text,
|
|
) -> Result<hir::Expression, ShellError> {
|
|
Ok(match *token.item() {
|
|
RawToken::Variable(span) if span.slice(source) == "it" => {
|
|
hir::Expression::it_variable(span, token.span())
|
|
}
|
|
RawToken::ExternalCommand(span) => hir::Expression::external_command(span, token.span()),
|
|
RawToken::ExternalWord => return Err(ShellError::invalid_external_word(token.span())),
|
|
RawToken::Variable(span) => hir::Expression::variable(span, token.span()),
|
|
RawToken::Number(_) => hir::Expression::bare(token.span()),
|
|
RawToken::Size(_, _) => hir::Expression::bare(token.span()),
|
|
RawToken::Bare => hir::Expression::bare(token.span()),
|
|
RawToken::String(span) => hir::Expression::string(span, token.span()),
|
|
})
|
|
}
|
|
|
|
pub fn baseline_parse_token_as_path(
|
|
token: &Token,
|
|
context: &Context,
|
|
source: &Text,
|
|
) -> Result<hir::Expression, ShellError> {
|
|
Ok(match *token.item() {
|
|
RawToken::Variable(span) if span.slice(source) == "it" => {
|
|
hir::Expression::it_variable(span, token.span())
|
|
}
|
|
RawToken::ExternalCommand(span) => hir::Expression::external_command(span, token.span()),
|
|
RawToken::ExternalWord => return Err(ShellError::invalid_external_word(token.span())),
|
|
RawToken::Variable(span) => hir::Expression::variable(span, token.span()),
|
|
RawToken::Number(_) => hir::Expression::bare(token.span()),
|
|
RawToken::Size(_, _) => hir::Expression::bare(token.span()),
|
|
RawToken::Bare => hir::Expression::file_path(
|
|
expand_path(token.span().slice(source), context),
|
|
token.span(),
|
|
),
|
|
RawToken::String(span) => {
|
|
hir::Expression::file_path(expand_path(span.slice(source), context), token.span())
|
|
}
|
|
})
|
|
}
|
|
|
|
pub fn expand_path(string: &str, context: &Context) -> PathBuf {
|
|
let expanded = shellexpand::tilde_with_context(string, || context.shell_manager.homedir());
|
|
|
|
PathBuf::from(expanded.as_ref())
|
|
}
|