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

Set LAST_EXIT_CODE on parse error (#5084)

Browse Source
This commit is contained in:
Reilly Wood 2022-04-04 04:11:27 -07:00 committed by GitHub
parent c4cfbaec2d
commit a86e6ce89b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
crates/nu-cli/src/util.rs
View File

@ -259,6 +259,7 @@ pub fn eval_source(
&[], &[],
); );
if let Some(err) = err { if let Some(err) = err {
set_last_exit_code(stack, 1);
report_error(&working_set, &err); report_error(&working_set, &err);
return false; return false;
} }
@ -286,22 +287,10 @@ pub fn eval_source(
if let Some(exit_code) = exit_code.take().and_then(|it| it.last()) { if let Some(exit_code) = exit_code.take().and_then(|it| it.last()) {
stack.add_env_var("LAST_EXIT_CODE".to_string(), exit_code); stack.add_env_var("LAST_EXIT_CODE".to_string(), exit_code);
} else { } else {
stack.add_env_var( set_last_exit_code(stack, 0);
"LAST_EXIT_CODE".to_string(),
Value::Int {
val: 0,
span: Span { start: 0, end: 0 },
},
);
} }
} else { } else {
stack.add_env_var( set_last_exit_code(stack, 0);
"LAST_EXIT_CODE".to_string(),
Value::Int {
val: 0,
span: Span { start: 0, end: 0 },
},
);
} }
if let Err(err) = print_pipeline_data(pipeline_data, engine_state, stack) { if let Err(err) = print_pipeline_data(pipeline_data, engine_state, stack) {
@ -319,13 +308,7 @@ pub fn eval_source(
} }
} }
Err(err) => { Err(err) => {
stack.add_env_var( set_last_exit_code(stack, 1);
"LAST_EXIT_CODE".to_string(),
Value::Int {
val: 1,
span: Span { start: 0, end: 0 },
},
);
let working_set = StateWorkingSet::new(engine_state); let working_set = StateWorkingSet::new(engine_state);
@ -338,6 +321,16 @@ pub fn eval_source(
true true
} }
fn set_last_exit_code(stack: &mut Stack, exit_code: i64) {
stack.add_env_var(
"LAST_EXIT_CODE".to_string(),
Value::Int {
val: exit_code,
span: Span { start: 0, end: 0 },
},
);
}
fn seems_like_number(bytes: &[u8]) -> bool { fn seems_like_number(bytes: &[u8]) -> bool {
if bytes.is_empty() { if bytes.is_empty() {
false false