holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

range iteration

Browse Source
This commit is contained in:
JT
2021-09-06 16:07:48 +12:00
parent 9e7d96ea50
commit 96b0edf9b0
5 changed files with 163 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
crates/nu-command/src/each.rs
View File

@ -30,8 +30,8 @@ impl Command for Each {
let context = context.clone();
match input {
Value::List { val, .. } => Ok(Value::List {
val: val
Value::Range { val, .. } => Ok(Value::ValueStream {
stream: val
.into_iter()
.map(move |x| {
let engine_state = context.engine_state.borrow();
@ -46,10 +46,32 @@ impl Command for Each {
match eval_block(&state, block, Value::nothing()) {
Ok(v) => v,
Err(err) => Value::Error { err },
Err(error) => Value::Error { error },
}
})
.collect(),
.into_value_stream(),
span: call.head,
}),
Value::List { val, .. } => Ok(Value::ValueStream {
stream: val
.into_iter()
.map(move |x| {
let engine_state = context.engine_state.borrow();
let block = engine_state.get_block(block_id);
let state = context.enter_scope();
if let Some(var) = block.signature.required_positional.first() {
if let Some(var_id) = &var.var_id {
state.add_var(*var_id, x);
}
}
match eval_block(&state, block, Value::nothing()) {
Ok(v) => v,
Err(error) => Value::Error { error },
}
})
.into_value_stream(),
span: call.head,
}),
Value::ValueStream { stream, .. } => Ok(Value::ValueStream {
@ -67,7 +89,7 @@ impl Command for Each {
match eval_block(&state, block, Value::nothing()) {
Ok(v) => v,
Err(err) => Value::Error { err },
Err(error) => Value::Error { error },
}
})
.into_value_stream(),