Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
use crate::deserializer::ConfigDeserializer;
|
|
|
|
use crate::evaluate::evaluate_args::evaluate_args;
|
2019-05-13 19:30:51 +02:00
|
|
|
use crate::prelude::*;
|
2020-12-18 08:53:49 +01:00
|
|
|
use crate::{commands::help::get_help, run_block};
|
2019-08-02 21:15:07 +02:00
|
|
|
use derive_new::new;
|
2019-06-22 05:43:37 +02:00
|
|
|
use getset::Getters;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
use nu_errors::ShellError;
|
2020-12-18 08:53:49 +01:00
|
|
|
use nu_protocol::hir::{self, Block};
|
|
|
|
use nu_protocol::{CallInfo, EvaluatedArgs, ReturnSuccess, Signature, UntaggedValue, Value};
|
2020-05-30 20:31:50 +02:00
|
|
|
use parking_lot::Mutex;
|
2020-12-18 08:53:49 +01:00
|
|
|
use serde::Deserialize;
|
2019-07-24 00:22:11 +02:00
|
|
|
use std::ops::Deref;
|
2019-10-13 06:12:43 +02:00
|
|
|
use std::sync::atomic::AtomicBool;
|
2019-05-10 18:59:12 +02:00
|
|
|
|
2020-12-18 08:53:49 +01:00
|
|
|
#[derive(Debug, Clone)]
|
2019-07-24 00:22:11 +02:00
|
|
|
pub struct UnevaluatedCallInfo {
|
|
|
|
pub args: hir::Call,
|
2019-09-14 18:30:24 +02:00
|
|
|
pub name_tag: Tag,
|
2019-07-24 00:22:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
impl UnevaluatedCallInfo {
|
2020-12-18 08:53:49 +01:00
|
|
|
pub async fn evaluate(self, ctx: &EvaluationContext) -> Result<CallInfo, ShellError> {
|
|
|
|
let args = evaluate_args(&self.args, ctx).await?;
|
2019-07-24 00:22:11 +02:00
|
|
|
|
|
|
|
Ok(CallInfo {
|
|
|
|
args,
|
2019-09-14 18:30:24 +02:00
|
|
|
name_tag: self.name_tag,
|
2019-07-24 00:22:11 +02:00
|
|
|
})
|
|
|
|
}
|
2020-01-17 23:46:18 +01:00
|
|
|
|
|
|
|
pub fn switch_present(&self, switch: &str) -> bool {
|
|
|
|
self.args.switch_preset(switch)
|
|
|
|
}
|
2019-07-24 00:22:11 +02:00
|
|
|
}
|
|
|
|
|
2019-06-22 05:43:37 +02:00
|
|
|
#[derive(Getters)]
|
2019-09-01 21:56:17 +02:00
|
|
|
#[get = "pub(crate)"]
|
2019-05-23 09:23:06 +02:00
|
|
|
pub struct CommandArgs {
|
2020-01-04 07:44:17 +01:00
|
|
|
pub host: Arc<parking_lot::Mutex<Box<dyn Host>>>,
|
2019-10-13 06:12:43 +02:00
|
|
|
pub ctrl_c: Arc<AtomicBool>,
|
2020-05-30 20:31:50 +02:00
|
|
|
pub current_errors: Arc<Mutex<Vec<ShellError>>>,
|
2019-08-07 19:49:11 +02:00
|
|
|
pub shell_manager: ShellManager,
|
2019-07-24 00:22:11 +02:00
|
|
|
pub call_info: UnevaluatedCallInfo,
|
2020-12-18 08:53:49 +01:00
|
|
|
pub scope: Scope,
|
2019-05-23 09:23:06 +02:00
|
|
|
pub input: InputStream,
|
2019-05-16 02:21:46 +02:00
|
|
|
}
|
|
|
|
|
2019-08-14 19:02:39 +02:00
|
|
|
#[derive(Getters, Clone)]
|
2019-09-01 21:56:17 +02:00
|
|
|
#[get = "pub(crate)"]
|
2019-08-03 04:17:28 +02:00
|
|
|
pub struct RawCommandArgs {
|
2020-01-04 07:44:17 +01:00
|
|
|
pub host: Arc<parking_lot::Mutex<Box<dyn Host>>>,
|
2019-10-13 06:12:43 +02:00
|
|
|
pub ctrl_c: Arc<AtomicBool>,
|
2020-05-30 20:31:50 +02:00
|
|
|
pub current_errors: Arc<Mutex<Vec<ShellError>>>,
|
2019-08-09 06:51:21 +02:00
|
|
|
pub shell_manager: ShellManager,
|
2020-12-18 08:53:49 +01:00
|
|
|
pub scope: Scope,
|
2019-08-03 04:17:28 +02:00
|
|
|
pub call_info: UnevaluatedCallInfo,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl RawCommandArgs {
|
2020-01-25 04:13:12 +01:00
|
|
|
pub fn with_input(self, input: impl Into<InputStream>) -> CommandArgs {
|
2019-08-03 04:17:28 +02:00
|
|
|
CommandArgs {
|
|
|
|
host: self.host,
|
2019-10-13 06:12:43 +02:00
|
|
|
ctrl_c: self.ctrl_c,
|
2020-05-30 20:31:50 +02:00
|
|
|
current_errors: self.current_errors,
|
2019-08-09 06:51:21 +02:00
|
|
|
shell_manager: self.shell_manager,
|
2019-08-03 04:17:28 +02:00
|
|
|
call_info: self.call_info,
|
2020-12-18 08:53:49 +01:00
|
|
|
scope: self.scope,
|
2019-08-03 04:17:28 +02:00
|
|
|
input: input.into(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-10-28 15:46:50 +01:00
|
|
|
impl std::fmt::Debug for CommandArgs {
|
|
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
|
|
self.call_info.fmt(f)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-22 05:43:37 +02:00
|
|
|
impl CommandArgs {
|
2020-12-18 08:53:49 +01:00
|
|
|
pub async fn evaluate_once(self) -> Result<EvaluatedWholeStreamCommandArgs, ShellError> {
|
|
|
|
let ctx = EvaluationContext::from_args(&self);
|
2019-07-24 00:22:11 +02:00
|
|
|
let host = self.host.clone();
|
2019-10-13 06:12:43 +02:00
|
|
|
let ctrl_c = self.ctrl_c.clone();
|
2019-08-09 06:51:21 +02:00
|
|
|
let shell_manager = self.shell_manager.clone();
|
2019-07-24 00:22:11 +02:00
|
|
|
let input = self.input;
|
2020-12-18 08:53:49 +01:00
|
|
|
let call_info = self.call_info.evaluate(&ctx).await?;
|
|
|
|
let scope = self.scope.clone();
|
2019-07-24 00:22:11 +02:00
|
|
|
|
2019-08-15 07:02:02 +02:00
|
|
|
Ok(EvaluatedWholeStreamCommandArgs::new(
|
2019-08-09 06:51:21 +02:00
|
|
|
host,
|
2019-10-13 06:12:43 +02:00
|
|
|
ctrl_c,
|
2019-08-09 06:51:21 +02:00
|
|
|
shell_manager,
|
|
|
|
call_info,
|
|
|
|
input,
|
2020-12-18 08:53:49 +01:00
|
|
|
scope,
|
2019-08-09 06:51:21 +02:00
|
|
|
))
|
2019-07-24 00:22:11 +02:00
|
|
|
}
|
|
|
|
|
2020-12-18 08:53:49 +01:00
|
|
|
pub async fn process<'de, T: Deserialize<'de>>(self) -> Result<(T, InputStream), ShellError> {
|
|
|
|
let args = self.evaluate_once().await?;
|
2019-10-13 06:12:43 +02:00
|
|
|
let call_info = args.call_info.clone();
|
2019-08-03 04:17:28 +02:00
|
|
|
|
2019-12-31 08:36:08 +01:00
|
|
|
let mut deserializer = ConfigDeserializer::from_call_info(call_info);
|
2019-08-03 04:17:28 +02:00
|
|
|
|
2020-05-16 05:18:24 +02:00
|
|
|
Ok((T::deserialize(&mut deserializer)?, args.input))
|
2019-08-02 21:15:07 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub struct RunnableContext {
|
|
|
|
pub input: InputStream,
|
2019-08-09 06:51:21 +02:00
|
|
|
pub shell_manager: ShellManager,
|
2020-01-04 07:44:17 +01:00
|
|
|
pub host: Arc<parking_lot::Mutex<Box<dyn Host>>>,
|
2019-10-13 06:12:43 +02:00
|
|
|
pub ctrl_c: Arc<AtomicBool>,
|
2020-05-30 20:31:50 +02:00
|
|
|
pub current_errors: Arc<Mutex<Vec<ShellError>>>,
|
2020-12-18 08:53:49 +01:00
|
|
|
pub scope: Scope,
|
2019-09-14 18:30:24 +02:00
|
|
|
pub name: Tag,
|
2019-08-02 21:15:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
impl RunnableContext {
|
2020-04-30 04:23:40 +02:00
|
|
|
pub fn get_command(&self, name: &str) -> Option<Command> {
|
2020-12-18 08:53:49 +01:00
|
|
|
self.scope.get_command(name)
|
2019-09-07 09:32:07 +02:00
|
|
|
}
|
2019-08-02 21:15:07 +02:00
|
|
|
}
|
|
|
|
|
2019-08-15 07:02:02 +02:00
|
|
|
pub struct EvaluatedWholeStreamCommandArgs {
|
2019-07-24 00:22:11 +02:00
|
|
|
pub args: EvaluatedCommandArgs,
|
|
|
|
pub input: InputStream,
|
|
|
|
}
|
|
|
|
|
2019-08-15 07:02:02 +02:00
|
|
|
impl Deref for EvaluatedWholeStreamCommandArgs {
|
2019-07-24 00:22:11 +02:00
|
|
|
type Target = EvaluatedCommandArgs;
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
|
|
&self.args
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-15 07:02:02 +02:00
|
|
|
impl EvaluatedWholeStreamCommandArgs {
|
2019-07-24 00:22:11 +02:00
|
|
|
pub fn new(
|
2020-01-04 07:44:17 +01:00
|
|
|
host: Arc<parking_lot::Mutex<dyn Host>>,
|
2019-10-13 06:12:43 +02:00
|
|
|
ctrl_c: Arc<AtomicBool>,
|
2019-08-09 06:51:21 +02:00
|
|
|
shell_manager: ShellManager,
|
2019-07-24 00:22:11 +02:00
|
|
|
call_info: CallInfo,
|
|
|
|
input: impl Into<InputStream>,
|
2020-12-18 08:53:49 +01:00
|
|
|
scope: Scope,
|
2019-08-15 07:02:02 +02:00
|
|
|
) -> EvaluatedWholeStreamCommandArgs {
|
|
|
|
EvaluatedWholeStreamCommandArgs {
|
2019-07-24 00:22:11 +02:00
|
|
|
args: EvaluatedCommandArgs {
|
|
|
|
host,
|
2019-10-13 06:12:43 +02:00
|
|
|
ctrl_c,
|
2019-08-09 06:51:21 +02:00
|
|
|
shell_manager,
|
2019-07-24 00:22:11 +02:00
|
|
|
call_info,
|
2020-12-18 08:53:49 +01:00
|
|
|
scope,
|
2019-07-24 00:22:11 +02:00
|
|
|
},
|
|
|
|
input: input.into(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-09-14 18:30:24 +02:00
|
|
|
pub fn name_tag(&self) -> Tag {
|
2019-10-13 06:12:43 +02:00
|
|
|
self.args.call_info.name_tag.clone()
|
2019-07-24 00:22:11 +02:00
|
|
|
}
|
|
|
|
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
pub fn parts(self) -> (InputStream, EvaluatedArgs) {
|
2019-08-15 07:02:02 +02:00
|
|
|
let EvaluatedWholeStreamCommandArgs { args, input } = self;
|
2019-07-24 00:22:11 +02:00
|
|
|
|
|
|
|
(input, args.call_info.args)
|
|
|
|
}
|
2019-08-02 21:15:07 +02:00
|
|
|
|
|
|
|
pub fn split(self) -> (InputStream, EvaluatedCommandArgs) {
|
2019-08-15 07:02:02 +02:00
|
|
|
let EvaluatedWholeStreamCommandArgs { args, input } = self;
|
2019-08-02 21:15:07 +02:00
|
|
|
|
|
|
|
(input, args)
|
|
|
|
}
|
2019-07-24 00:22:11 +02:00
|
|
|
}
|
|
|
|
|
2019-08-02 21:15:07 +02:00
|
|
|
#[derive(Getters, new)]
|
2019-09-01 21:56:17 +02:00
|
|
|
#[get = "pub(crate)"]
|
2019-07-24 00:22:11 +02:00
|
|
|
pub struct EvaluatedCommandArgs {
|
2020-01-04 07:44:17 +01:00
|
|
|
pub host: Arc<parking_lot::Mutex<dyn Host>>,
|
2019-10-13 06:12:43 +02:00
|
|
|
pub ctrl_c: Arc<AtomicBool>,
|
2019-08-09 06:51:21 +02:00
|
|
|
pub shell_manager: ShellManager,
|
2019-07-24 00:22:11 +02:00
|
|
|
pub call_info: CallInfo,
|
2020-12-18 08:53:49 +01:00
|
|
|
pub scope: Scope,
|
2019-07-24 00:22:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
impl EvaluatedCommandArgs {
|
2019-11-21 15:33:14 +01:00
|
|
|
pub fn nth(&self, pos: usize) -> Option<&Value> {
|
2019-07-20 04:27:10 +02:00
|
|
|
self.call_info.args.nth(pos)
|
2019-06-22 05:43:37 +02:00
|
|
|
}
|
|
|
|
|
2020-04-13 09:59:57 +02:00
|
|
|
/// Get the nth positional argument, error if not possible
|
|
|
|
pub fn expect_nth(&self, pos: usize) -> Result<&Value, ShellError> {
|
2020-08-03 00:34:33 +02:00
|
|
|
self.call_info
|
|
|
|
.args
|
|
|
|
.nth(pos)
|
|
|
|
.ok_or_else(|| ShellError::unimplemented("Better error: expect_nth"))
|
2020-04-13 09:59:57 +02:00
|
|
|
}
|
|
|
|
|
2019-11-21 15:33:14 +01:00
|
|
|
pub fn get(&self, name: &str) -> Option<&Value> {
|
2019-07-20 04:27:10 +02:00
|
|
|
self.call_info.args.get(name)
|
2019-06-22 05:43:37 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn has(&self, name: &str) -> bool {
|
2019-07-20 04:27:10 +02:00
|
|
|
self.call_info.args.has(name)
|
2019-06-22 05:43:37 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-11 22:05:44 +02:00
|
|
|
pub struct Example {
|
|
|
|
pub example: &'static str,
|
|
|
|
pub description: &'static str,
|
2020-05-18 14:56:01 +02:00
|
|
|
pub result: Option<Vec<Value>>,
|
2020-05-11 22:05:44 +02:00
|
|
|
}
|
|
|
|
|
2020-05-29 10:22:52 +02:00
|
|
|
#[async_trait]
|
2019-08-15 07:02:02 +02:00
|
|
|
pub trait WholeStreamCommand: Send + Sync {
|
2019-08-02 21:15:07 +02:00
|
|
|
fn name(&self) -> &str;
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
2019-12-04 22:14:52 +01:00
|
|
|
Signature::new(self.name()).desc(self.usage()).filter()
|
2019-05-28 08:45:18 +02:00
|
|
|
}
|
|
|
|
|
2019-08-30 00:52:32 +02:00
|
|
|
fn usage(&self) -> &str;
|
2019-08-14 19:02:39 +02:00
|
|
|
|
2020-12-18 08:53:49 +01:00
|
|
|
async fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError>;
|
2019-09-04 03:50:23 +02:00
|
|
|
|
|
|
|
fn is_binary(&self) -> bool {
|
|
|
|
false
|
|
|
|
}
|
2020-05-11 22:05:44 +02:00
|
|
|
|
2020-09-19 01:48:30 +02:00
|
|
|
// Commands that are not meant to be run by users
|
|
|
|
fn is_internal(&self) -> bool {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
|
2020-05-18 14:56:01 +02:00
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
|
|
Vec::new()
|
2020-05-11 22:05:44 +02:00
|
|
|
}
|
2019-08-30 00:52:32 +02:00
|
|
|
}
|
|
|
|
|
2020-12-18 08:53:49 +01:00
|
|
|
// Custom commands are blocks, so we can use the information in the block to also
|
|
|
|
// implement a WholeStreamCommand
|
2021-01-01 03:13:59 +01:00
|
|
|
#[allow(clippy::suspicious_else_formatting)]
|
2020-12-18 08:53:49 +01:00
|
|
|
#[async_trait]
|
|
|
|
impl WholeStreamCommand for Block {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
&self.params.name
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
|
|
|
self.params.clone()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
2021-01-07 18:14:51 +01:00
|
|
|
&self.params.usage
|
2020-12-18 08:53:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
async fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
|
|
|
|
let call_info = args.call_info.clone();
|
|
|
|
|
|
|
|
let mut block = self.clone();
|
|
|
|
block.set_redirect(call_info.args.external_redirection);
|
|
|
|
|
|
|
|
let ctx = EvaluationContext::from_args(&args);
|
|
|
|
let evaluated = call_info.evaluate(&ctx).await?;
|
|
|
|
|
|
|
|
let input = args.input;
|
|
|
|
ctx.scope.enter_scope();
|
|
|
|
if let Some(args) = evaluated.args.positional {
|
|
|
|
// FIXME: do not do this
|
|
|
|
for arg in args.into_iter().zip(self.params.positional.iter()) {
|
|
|
|
let name = arg.1 .0.name();
|
|
|
|
|
|
|
|
if name.starts_with('$') {
|
|
|
|
ctx.scope.add_var(name, arg.0);
|
|
|
|
} else {
|
|
|
|
ctx.scope.add_var(format!("${}", name), arg.0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-12-21 08:36:59 +01:00
|
|
|
if let Some(args) = evaluated.args.named {
|
|
|
|
for named in &block.params.named {
|
|
|
|
let name = named.0;
|
|
|
|
if let Some(value) = args.get(name) {
|
|
|
|
if name.starts_with('$') {
|
|
|
|
ctx.scope.add_var(name, value.clone());
|
|
|
|
} else {
|
|
|
|
ctx.scope.add_var(format!("${}", name), value.clone());
|
|
|
|
}
|
|
|
|
} else if name.starts_with('$') {
|
|
|
|
ctx.scope
|
|
|
|
.add_var(name, UntaggedValue::nothing().into_untagged_value());
|
|
|
|
} else {
|
|
|
|
ctx.scope.add_var(
|
|
|
|
format!("${}", name),
|
|
|
|
UntaggedValue::nothing().into_untagged_value(),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for named in &block.params.named {
|
|
|
|
let name = named.0;
|
|
|
|
if name.starts_with('$') {
|
|
|
|
ctx.scope
|
|
|
|
.add_var(name, UntaggedValue::nothing().into_untagged_value());
|
|
|
|
} else {
|
|
|
|
ctx.scope.add_var(
|
|
|
|
format!("${}", name),
|
|
|
|
UntaggedValue::nothing().into_untagged_value(),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-12-18 08:53:49 +01:00
|
|
|
let result = run_block(&block, &ctx, input).await;
|
|
|
|
ctx.scope.exit_scope();
|
|
|
|
result.map(|x| x.to_output_stream())
|
|
|
|
}
|
|
|
|
|
|
|
|
fn is_binary(&self) -> bool {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
|
|
|
|
fn is_internal(&self) -> bool {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
|
|
vec![]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-30 04:23:40 +02:00
|
|
|
#[derive(Clone)]
|
|
|
|
pub struct Command(Arc<dyn WholeStreamCommand>);
|
2019-06-07 08:34:42 +02:00
|
|
|
|
2019-11-21 15:33:14 +01:00
|
|
|
impl PrettyDebugWithSource for Command {
|
|
|
|
fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
|
2020-04-30 04:23:40 +02:00
|
|
|
b::typed(
|
|
|
|
"whole stream command",
|
|
|
|
b::description(self.name())
|
|
|
|
+ b::space()
|
|
|
|
+ b::equals()
|
|
|
|
+ b::space()
|
|
|
|
+ self.signature().pretty_debug(source),
|
|
|
|
)
|
2019-11-21 15:33:14 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Overhaul the expansion system
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`
2019-09-18 00:26:27 +02:00
|
|
|
impl std::fmt::Debug for Command {
|
|
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
2020-04-30 04:23:40 +02:00
|
|
|
write!(f, "Command({})", self.name())
|
Overhaul the expansion system
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`
2019-09-18 00:26:27 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-02 21:15:07 +02:00
|
|
|
impl Command {
|
|
|
|
pub fn name(&self) -> &str {
|
2020-04-30 04:23:40 +02:00
|
|
|
self.0.name()
|
2019-08-02 21:15:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn signature(&self) -> Signature {
|
2020-04-30 04:23:40 +02:00
|
|
|
self.0.signature()
|
2019-08-02 21:15:07 +02:00
|
|
|
}
|
|
|
|
|
2019-08-30 00:52:32 +02:00
|
|
|
pub fn usage(&self) -> &str {
|
2020-04-30 04:23:40 +02:00
|
|
|
self.0.usage()
|
2019-08-30 00:52:32 +02:00
|
|
|
}
|
|
|
|
|
2020-07-18 00:22:43 +02:00
|
|
|
pub fn examples(&self) -> Vec<Example> {
|
|
|
|
self.0.examples()
|
|
|
|
}
|
|
|
|
|
2020-12-18 08:53:49 +01:00
|
|
|
pub async fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
|
2020-01-17 23:46:18 +01:00
|
|
|
if args.call_info.switch_present("help") {
|
2020-05-16 05:18:24 +02:00
|
|
|
let cl = self.0.clone();
|
2020-06-29 19:39:11 +02:00
|
|
|
Ok(OutputStream::one(Ok(ReturnSuccess::Value(
|
2020-12-18 08:53:49 +01:00
|
|
|
UntaggedValue::string(get_help(&*cl, &args.scope)).into_value(Tag::unknown()),
|
2020-06-29 19:39:11 +02:00
|
|
|
))))
|
2020-01-17 23:46:18 +01:00
|
|
|
} else {
|
2020-12-18 08:53:49 +01:00
|
|
|
self.0.run(args).await
|
2019-06-07 08:34:42 +02:00
|
|
|
}
|
|
|
|
}
|
2019-08-14 19:02:39 +02:00
|
|
|
|
2019-09-04 03:50:23 +02:00
|
|
|
pub fn is_binary(&self) -> bool {
|
2020-04-30 04:23:40 +02:00
|
|
|
self.0.is_binary()
|
2019-09-04 03:50:23 +02:00
|
|
|
}
|
2020-05-11 22:05:44 +02:00
|
|
|
|
2020-09-19 01:48:30 +02:00
|
|
|
pub fn is_internal(&self) -> bool {
|
|
|
|
self.0.is_internal()
|
|
|
|
}
|
|
|
|
|
2020-05-11 22:05:44 +02:00
|
|
|
pub fn stream_command(&self) -> &dyn WholeStreamCommand {
|
|
|
|
&*self.0
|
|
|
|
}
|
2019-06-07 08:34:42 +02:00
|
|
|
}
|
|
|
|
|
2020-04-30 04:23:40 +02:00
|
|
|
pub fn whole_stream_command(command: impl WholeStreamCommand + 'static) -> Command {
|
|
|
|
Command(Arc::new(command))
|
2019-07-24 00:22:11 +02:00
|
|
|
}
|