extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-15 21:14:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed extra file

Browse Source
This commit is contained in:
Tanishq Kancharla 2021-09-27 08:10:45 -04:00
parent 719920fa37
commit 2b5ef1b2d7
2 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
crates/nu-command/src/source.rs
View File

@ -32,86 +32,87 @@ impl Command for Source {
call: &Call,
input: Value,
) -> Result<nu_protocol::Value, nu_protocol::ShellError> {
source(_context, call, input)
Ok(Value::Nothing { span: call.head })
// source(_context, call, input)
}
}
pub fn source(ctx: &EvaluationContext, call: &Call, input: Value) -> Result<Value, ShellError> {
let filename = call.positional[0]
.as_string()
.expect("internal error: missing file name");
// pub fn source(ctx: &EvaluationContext, call: &Call, input: Value) -> Result<Value, ShellError> {
// let filename = call.positional[0]
// .as_string()
// .expect("internal error: missing file name");
let source_file = Path::new(&filename);
// let source_file = Path::new(&filename);
// This code is in the current Nushell version
// ...Not entirely sure what it's doing or if there's an equivalent in engine-q
// // This code is in the current Nushell version
// // ...Not entirely sure what it's doing or if there's an equivalent in engine-q
// Note: this is a special case for setting the context from a command
// In this case, if we don't set it now, we'll lose the scope that this
// variable should be set into.
// // Note: this is a special case for setting the context from a command
// // In this case, if we don't set it now, we'll lose the scope that this
// // variable should be set into.
// let lib_dirs = &ctx
// .configs()
// .lock()
// .global_config
// .as_ref()
// .map(|configuration| match configuration.var("lib_dirs") {
// Some(paths) => paths
// .table_entries()
// .cloned()
// .map(|path| path.as_string())
// .collect(),
// None => vec![],
// });
// // let lib_dirs = &ctx
// // .configs()
// // .lock()
// // .global_config
// // .as_ref()
// // .map(|configuration| match configuration.var("lib_dirs") {
// // Some(paths) => paths
// // .table_entries()
// // .cloned()
// // .map(|path| path.as_string())
// // .collect(),
// // None => vec![],
// // });
// if let Some(dir) = lib_dirs {
// for lib_path in dir {
// match lib_path {
// Ok(name) => {
// let path = PathBuf::from(name).join(source_file);
// // if let Some(dir) = lib_dirs {
// // for lib_path in dir {
// // match lib_path {
// // Ok(name) => {
// // let path = PathBuf::from(name).join(source_file);
// if let Ok(contents) =
// std::fs::read_to_string(&expand_path(Cow::Borrowed(path.as_path())))
// {
// let result = script::run_script_standalone(contents, true, ctx, false);
// // if let Ok(contents) =
// // std::fs::read_to_string(&expand_path(Cow::Borrowed(path.as_path())))
// // {
// // let result = script::run_script_standalone(contents, true, ctx, false);
// if let Err(err) = result {
// ctx.error(err);
// }
// return Ok(OutputStream::empty());
// }
// }
// Err(reason) => {
// ctx.error(reason.clone());
// }
// }
// }
// }
// // if let Err(err) = result {
// // ctx.error(err);
// // }
// // return Ok(OutputStream::empty());
// // }
// // }
// // Err(reason) => {
// // ctx.error(reason.clone());
// // }
// // }
// // }
// // }
// This is to stay consistent w/ the code taken from nushell
let path = source_file;
// // This is to stay consistent w/ the code taken from nushell
// let path = source_file;
let contents = std::fs::read(path);
// let contents = std::fs::read(path);
match contents {
Ok(contents) => {
let engine_state = EngineState::new();
let mut working_set = StateWorkingSet::new(&engine_state);
// match contents {
// Ok(contents) => {
// let engine_state = EngineState::new();
// let mut working_set = StateWorkingSet::new(&engine_state);
let (block, err) = parse(&mut working_set, None, &contents, true);
if let Some(e) = err {
// Be more specific here: need to convert parse error to string
Err(e.into())
} else {
let result = eval_block(ctx, &block, input);
match result {
Err(e) => Err(e),
_ => Ok(Value::nothing()),
}
}
}
Err(_) => Err(ShellError::InternalError(
"Can't load file to source".to_string(),
)),
}
}
// let (block, err) = parse(&mut working_set, None, &contents, true);
// if let Some(e) = err {
// // Be more specific here: need to convert parse error to string
// Err(e.into())
// } else {
// let result = eval_block(ctx, &block, input);
// match result {
// Err(e) => Err(e),
// _ => Ok(Value::nothing()),
// }
// }
// }
// Err(_) => Err(ShellError::InternalError(
// "Can't load file to source".to_string(),
// )),
// }
// }

1
example.nu
View File

@ -1 +0,0 @@
length [1,2,3,4]