rustfmt
Signed-off-by: Ava Hahn <ava@aidanis.online>
This commit is contained in:
parent
ecbc47d4fe
commit
bc09cb07b1
17 changed files with 236 additions and 217 deletions
|
|
@ -17,8 +17,8 @@
|
|||
|
||||
use dirs::home_dir;
|
||||
use relish::ast::{eval, lex, Ctr, Seg, SymTable};
|
||||
use relish::stdlib::{static_stdlib, dynamic_stdlib};
|
||||
use relish::aux::configure;
|
||||
use relish::stdlib::{dynamic_stdlib, static_stdlib};
|
||||
use rustyline::error::ReadlineError;
|
||||
use rustyline::Editor;
|
||||
use std::env;
|
||||
|
|
@ -39,23 +39,19 @@ fn main() {
|
|||
}
|
||||
|
||||
let mut syms = SymTable::new();
|
||||
static_stdlib(&mut syms)
|
||||
.unwrap_or_else(|err: String| eprintln!("{}", err));
|
||||
dynamic_stdlib(&mut syms)
|
||||
.unwrap_or_else(|err: String| eprintln!("{}", err));
|
||||
{ // scope the below borrow of syms
|
||||
static_stdlib(&mut syms).unwrap_or_else(|err: String| eprintln!("{}", err));
|
||||
dynamic_stdlib(&mut syms).unwrap_or_else(|err: String| eprintln!("{}", err));
|
||||
{
|
||||
// scope the below borrow of syms
|
||||
let cfg_file = env::var("RELISH_CFG_FILE").unwrap_or(cfg_file_name);
|
||||
configure(
|
||||
cfg_file.clone(),
|
||||
&mut syms,
|
||||
).unwrap_or_else(|err: String| eprintln!("failed to load script {}\n{}",
|
||||
cfg_file, err));
|
||||
configure(cfg_file.clone(), &mut syms)
|
||||
.unwrap_or_else(|err: String| eprintln!("failed to load script {}\n{}", cfg_file, err));
|
||||
}
|
||||
dynamic_stdlib(&mut syms)
|
||||
.unwrap_or_else(|err: String| eprintln!("{}", err));
|
||||
dynamic_stdlib(&mut syms).unwrap_or_else(|err: String| eprintln!("{}", err));
|
||||
|
||||
loop {
|
||||
let s = *syms.call_symbol(&"CFG_RELISH_PROMPT".to_string(), &Seg::new(), true)
|
||||
let s = *syms
|
||||
.call_symbol(&"CFG_RELISH_PROMPT".to_string(), &Seg::new(), true)
|
||||
.unwrap_or_else(|err: String| {
|
||||
eprintln!("{}", err);
|
||||
Box::new(Ctr::String("<prompt broken!>".to_string()))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue