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

Fix open ended ranges (#4677)

Browse Source 
* Make open ended ranges more open ended

* Add test
This commit is contained in:
JT 2022-02-28 11:15:31 -05:00 committed by GitHub
parent b09acdb7f9
commit cb5c61d217
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/nu-command/src/viewers/table.rs
View File

@ -138,6 +138,11 @@ impl Command for Table {
let base_pipeline = val.to_base_value(span)?.into_pipeline_data(); let base_pipeline = val.to_base_value(span)?.into_pipeline_data();
self.run(engine_state, stack, call, base_pipeline) self.run(engine_state, stack, call, base_pipeline)
} }
PipelineData::Value(x @ Value::Range { .. }, ..) => Ok(Value::String {
val: x.into_string("", &config),
span: call.head,
}
.into_pipeline_data()),
x => Ok(x), x => Ok(x),
} }
} }

4
crates/nu-protocol/src/value/range.rs
View File

@ -37,12 +37,12 @@ impl Range {
let to = if let Value::Nothing { .. } = to { let to = if let Value::Nothing { .. } = to {
if let Ok(Value::Bool { val: true, .. }) = next.lt(expr_span, &from) { if let Ok(Value::Bool { val: true, .. }) = next.lt(expr_span, &from) {
Value::Int { Value::Int {
val: -100i64, val: i64::MIN,
span: expr_span, span: expr_span,
} }
} else { } else {
Value::Int { Value::Int {
val: 100i64, val: i64::MAX,
span: expr_span, span: expr_span,
} }
} }

5
src/tests/test_engine.rs
View File

@ -272,3 +272,8 @@ fn shortcircuiting_and() -> TestResult {
fn shortcircuiting_or() -> TestResult { fn shortcircuiting_or() -> TestResult {
run_test(r#"$true || (5 / 0; $false)"#, "true") run_test(r#"$true || (5 / 0; $false)"#, "true")
} }
#[test]
fn open_ended_range() -> TestResult {
run_test(r#"1.. | first 100000 | length"#, "100000")
}