mirror of
https://github.com/fish-shell/fish-shell.git
synced 2025-02-19 09:22:45 +08:00
373bb56441
Other sigil-aliases ('[' and '_') are reserved words that cannot be
redefined as function. Only '!' is not.
Whereas several users define "function !!", I
found only one public occurrence of "function !":
5c7f87ed07/fish/functions/!.fish
Note that "function !" only works if invoked as "!", "! -h" or
"! --help" or "foo | !". In most other cases we parse it as negation.
We should probably make it a reserved word to reduce confusion.
If we do that, we should also add it to __fish_print_help, to make
"! -h" work.
For now let's rearrange the code so we can recognize "!" as
super-command. This fixes completion-based autosuggestions on "! ".
90 lines
2.4 KiB
Rust
90 lines
2.4 KiB
Rust
//! Functions having to do with parser keywords, like testing if a function is a block command.
|
|
|
|
use crate::wchar::prelude::*;
|
|
|
|
struct ReservedWord {
|
|
text: &'static wstr,
|
|
is_reserved: bool,
|
|
is_super_command: bool,
|
|
}
|
|
|
|
macro_rules! rw {
|
|
( ( $text:literal ) ) => {
|
|
ReservedWord {
|
|
text: L!($text),
|
|
is_reserved: true,
|
|
is_super_command: false,
|
|
}
|
|
};
|
|
( ( $text:literal, [subcommand] ) ) => {
|
|
ReservedWord {
|
|
text: L!($text),
|
|
is_reserved: true,
|
|
is_super_command: true,
|
|
}
|
|
};
|
|
( ( $text:literal, [subcommand], not reserved ) ) => {
|
|
ReservedWord {
|
|
text: L!($text),
|
|
is_reserved: false,
|
|
is_super_command: true,
|
|
}
|
|
};
|
|
}
|
|
macro_rules! reserved_words {
|
|
( $( $reserved_word:tt , ) * ) => {
|
|
&[ $( rw!($reserved_word), )* ]
|
|
}
|
|
}
|
|
|
|
// Don't forget to add any new reserved keywords to the documentation
|
|
const RESERVED_WORDS: &[ReservedWord] = reserved_words!(
|
|
("!", [subcommand], not reserved),
|
|
("["),
|
|
("_"),
|
|
("and", [subcommand]),
|
|
("argparse"),
|
|
("begin", [subcommand]),
|
|
("break"),
|
|
("builtin", [subcommand]),
|
|
("case"),
|
|
("command", [subcommand]),
|
|
("continue"),
|
|
("else", [subcommand]),
|
|
("end"),
|
|
("eval"),
|
|
("exec", [subcommand]),
|
|
("for"),
|
|
("function"),
|
|
("if", [subcommand]),
|
|
("not", [subcommand]),
|
|
("or", [subcommand]),
|
|
("read"),
|
|
("return"),
|
|
("set"),
|
|
("status"),
|
|
("string"),
|
|
("switch"),
|
|
("test"),
|
|
("time", [subcommand]),
|
|
("while", [subcommand]),
|
|
);
|
|
|
|
fn reserved_word(cmd: &wstr) -> Option<&'static ReservedWord> {
|
|
RESERVED_WORDS
|
|
.iter()
|
|
.find(|reserved_word| reserved_word.text == cmd)
|
|
}
|
|
|
|
/// Tests if the specified command's parameters should be interpreted as another command.
|
|
pub fn parser_keywords_is_subcommand(cmd: &impl AsRef<wstr>) -> bool {
|
|
reserved_word(cmd.as_ref()).is_some_and(|reserved_word| reserved_word.is_super_command)
|
|
}
|
|
|
|
/// Tests if the specified command is a reserved word, i.e. if it is the name of one of the builtin
|
|
/// functions that change the block or command scope, like 'for', 'end' or 'command' or 'exec'.
|
|
/// These functions may not be overloaded, so their names are reserved.
|
|
pub fn parser_keywords_is_reserved(word: &wstr) -> bool {
|
|
reserved_word(word).is_some_and(|reserved_word| reserved_word.is_reserved)
|
|
}
|