Enginep/all (#3312)

* Add iter-extensions

* Move all to enginep style

* Remove iter extensions

* Fix clippy lints

* Add comment and make ? more visible

* Remove try_all

* Remove all because it cant return err
This commit is contained in:
Leonhard Kipp 2021-04-18 20:39:33 +02:00 committed by GitHub
parent d34068da18
commit d8e105fe34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -5,13 +5,11 @@ use nu_errors::ShellError;
use nu_protocol::{
hir::CapturedBlock, hir::ClassifiedCommand, Signature, SyntaxShape, UntaggedValue,
};
use nu_stream::ToActionStream;
pub struct Command;
#[derive(Deserialize)]
pub struct Arguments {
block: CapturedBlock,
struct AllArgs {
predicate: CapturedBlock,
}
impl WholeStreamCommand for Command {
@ -31,7 +29,7 @@ impl WholeStreamCommand for Command {
"Find if the table rows matches the condition."
}
fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
all(args)
}
@ -53,54 +51,55 @@ impl WholeStreamCommand for Command {
}
}
fn all(args: CommandArgs) -> Result<ActionStream, ShellError> {
let ctx = Arc::new(EvaluationContext::from_args(&args));
fn all(args: CommandArgs) -> Result<OutputStream, ShellError> {
let ctx = EvaluationContext::from_args(&args);
let tag = args.call_info.name_tag.clone();
let (Arguments { block }, input) = args.process()?;
let args = args.evaluate_once()?;
let all_args = AllArgs {
predicate: args.req(0)?,
};
let condition = {
if block.block.block.len() != 1 {
return Err(ShellError::labeled_error(
let err = Err(ShellError::labeled_error(
"Expected a condition",
"expected a condition",
tag,
args.call_info.name_tag.clone(),
));
//This seems a little odd. Can't we have predicates with pipelines/multiple statements?
let condition = {
if all_args.predicate.block.block.len() != 1 {
return err;
}
match block.block.block[0].pipelines.get(0) {
match all_args.predicate.block.block[0].pipelines.get(0) {
Some(item) => match item.list.get(0) {
Some(ClassifiedCommand::Expr(expr)) => expr.clone(),
_ => {
return Err(ShellError::labeled_error(
"Expected a condition",
"expected a condition",
tag,
));
return err;
}
},
None => {
return Err(ShellError::labeled_error(
"Expected a condition",
"expected a condition",
tag,
));
return err;
}
}
};
let scope = args.scope.clone();
let init = Ok(InputStream::one(
UntaggedValue::boolean(true).into_value(&tag),
));
Ok(input
.fold(init, move |acc, row| {
// Variables in nu are immutable. Having the same variable accross invocations
// of evaluate_baseline_expr does not mutate the variables and those each
// invocations are independent of each other!
scope.enter_scope();
scope.add_vars(&all_args.predicate.captured.entries);
let result = args.input.fold(init, move |acc, row| {
let condition = condition.clone();
let ctx = ctx.clone();
ctx.scope.enter_scope();
ctx.scope.add_vars(&block.captured.entries);
ctx.scope.add_var("$it", row);
let condition = evaluate_baseline_expr(&condition, &*ctx);
ctx.scope.exit_scope();
let condition = evaluate_baseline_expr(&condition, &ctx);
let curr = acc?.drain_vec();
let curr = curr
@ -117,8 +116,10 @@ fn all(args: CommandArgs) -> Result<ActionStream, ShellError> {
},
Err(e) => Err(e),
}
})?
.to_action_stream())
});
scope.exit_scope();
Ok(result?.to_output_stream())
}
#[cfg(test)]