forked from extern/nushell
ef7fbf4bf9
Reverts nushell/nushell#8310 In anticipation that we may want to revert this PR. I'm starting the process because of this issue. This stopped working ``` let-env NU_LIB_DIRS = [ ($nu.config-path | path dirname | path join 'scripts') 'C:\Users\username\source\repos\forks\nu_scripts' ($nu.config-path | path dirname) ] ``` You have to do this now instead. ``` const NU_LIB_DIRS = [ 'C:\Users\username\AppData\Roaming\nushell\scripts' 'C:\Users\username\source\repos\forks\nu_scripts' 'C:\Users\username\AppData\Roaming\nushell' ] ``` In talking with @kubouch, he was saying that the `let-env` version should keep working. Hopefully it's a small change.
129 lines
3.4 KiB
Rust
129 lines
3.4 KiB
Rust
use nu_protocol::{
|
|
ast::Call,
|
|
engine::{EngineState, Stack},
|
|
FromValue, ShellError,
|
|
};
|
|
|
|
use crate::eval_expression;
|
|
|
|
pub trait CallExt {
|
|
fn get_flag<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
name: &str,
|
|
) -> Result<Option<T>, ShellError>;
|
|
|
|
fn rest<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
starting_pos: usize,
|
|
) -> Result<Vec<T>, ShellError>;
|
|
|
|
fn opt<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
pos: usize,
|
|
) -> Result<Option<T>, ShellError>;
|
|
|
|
fn req<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
pos: usize,
|
|
) -> Result<T, ShellError>;
|
|
|
|
fn req_parser_info<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
pos: usize,
|
|
) -> Result<T, ShellError>;
|
|
}
|
|
|
|
impl CallExt for Call {
|
|
fn get_flag<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
name: &str,
|
|
) -> Result<Option<T>, ShellError> {
|
|
if let Some(expr) = self.get_flag_expr(name) {
|
|
let result = eval_expression(engine_state, stack, &expr)?;
|
|
FromValue::from_value(&result).map(Some)
|
|
} else {
|
|
Ok(None)
|
|
}
|
|
}
|
|
|
|
fn rest<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
starting_pos: usize,
|
|
) -> Result<Vec<T>, ShellError> {
|
|
let mut output = vec![];
|
|
|
|
for expr in self.positional_iter().skip(starting_pos) {
|
|
let result = eval_expression(engine_state, stack, expr)?;
|
|
output.push(FromValue::from_value(&result)?);
|
|
}
|
|
|
|
Ok(output)
|
|
}
|
|
|
|
fn opt<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
pos: usize,
|
|
) -> Result<Option<T>, ShellError> {
|
|
if let Some(expr) = self.positional_nth(pos) {
|
|
let result = eval_expression(engine_state, stack, expr)?;
|
|
FromValue::from_value(&result).map(Some)
|
|
} else {
|
|
Ok(None)
|
|
}
|
|
}
|
|
|
|
fn req<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
pos: usize,
|
|
) -> Result<T, ShellError> {
|
|
if let Some(expr) = self.positional_nth(pos) {
|
|
let result = eval_expression(engine_state, stack, expr)?;
|
|
FromValue::from_value(&result)
|
|
} else if self.positional_len() == 0 {
|
|
Err(ShellError::AccessEmptyContent { span: self.head })
|
|
} else {
|
|
Err(ShellError::AccessBeyondEnd {
|
|
max_idx: self.positional_len() - 1,
|
|
span: self.head,
|
|
})
|
|
}
|
|
}
|
|
|
|
fn req_parser_info<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
pos: usize,
|
|
) -> Result<T, ShellError> {
|
|
if let Some(expr) = self.parser_info_nth(pos) {
|
|
let result = eval_expression(engine_state, stack, expr)?;
|
|
FromValue::from_value(&result)
|
|
} else if self.parser_info.is_empty() {
|
|
Err(ShellError::AccessEmptyContent { span: self.head })
|
|
} else {
|
|
Err(ShellError::AccessBeyondEnd {
|
|
max_idx: self.parser_info.len() - 1,
|
|
span: self.head,
|
|
})
|
|
}
|
|
}
|
|
}
|