Per https://nnethercote.github.io/perf-book/hashing.html, we have basically no reason to use the default hasher over a faster, non-DoS-resistant hasher. This gives a nice perf boost basically for free: hello outpath time: [704.76 ms 714.91 ms 725.63 ms] change: [-7.2391% -6.1018% -4.9189%] (p = 0.00 < 0.05) Performance has improved. Change-Id: If5587f444ed3af69f8af4eead6af3ea303b4ae68 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12046 Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de> Reviewed-by: Ilan Joselevich <personal@ilanjoselevich.com> Autosubmit: aspen <root@gws.fyi>
274 lines
7.9 KiB
Rust
274 lines
7.9 KiB
Rust
use std::path::PathBuf;
|
|
use std::rc::Rc;
|
|
|
|
use rustc_hash::FxHashMap;
|
|
use rustyline::{error::ReadlineError, Editor};
|
|
use smol_str::SmolStr;
|
|
use tvix_eval::{GlobalsMap, SourceCode, Value};
|
|
use tvix_glue::tvix_store_io::TvixStoreIO;
|
|
|
|
use crate::{
|
|
assignment::Assignment, evaluate, interpret, AllowIncomplete, Args, IncompleteInput,
|
|
InterpretResult,
|
|
};
|
|
|
|
fn state_dir() -> Option<PathBuf> {
|
|
let mut path = dirs::data_dir();
|
|
if let Some(p) = path.as_mut() {
|
|
p.push("tvix")
|
|
}
|
|
path
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub(crate) enum ReplCommand<'a> {
|
|
Expr(&'a str),
|
|
Assign(Assignment<'a>),
|
|
Explain(&'a str),
|
|
Print(&'a str),
|
|
Quit,
|
|
Help,
|
|
}
|
|
|
|
impl<'a> ReplCommand<'a> {
|
|
const HELP: &'static str = "
|
|
Welcome to the Tvix REPL!
|
|
|
|
The following commands are supported:
|
|
|
|
<expr> Evaluate a Nix language expression and print the result, along with its inferred type
|
|
<x> = <expr> Bind the result of an expression to a variable
|
|
:d <expr> Evaluate a Nix language expression and print a detailed description of the result
|
|
:p <expr> Evaluate a Nix language expression and print the result recursively
|
|
:q Exit the REPL
|
|
:?, :h Display this help text
|
|
";
|
|
|
|
pub fn parse(input: &'a str) -> Self {
|
|
if input.starts_with(':') {
|
|
if let Some(without_prefix) = input.strip_prefix(":d ") {
|
|
return Self::Explain(without_prefix);
|
|
} else if let Some(without_prefix) = input.strip_prefix(":p ") {
|
|
return Self::Print(without_prefix);
|
|
}
|
|
|
|
let input = input.trim_end();
|
|
match input {
|
|
":q" => return Self::Quit,
|
|
":h" | ":?" => return Self::Help,
|
|
_ => {}
|
|
}
|
|
}
|
|
|
|
if let Some(assignment) = Assignment::parse(input) {
|
|
return Self::Assign(assignment);
|
|
}
|
|
|
|
Self::Expr(input)
|
|
}
|
|
}
|
|
|
|
pub struct CommandResult {
|
|
output: String,
|
|
continue_: bool,
|
|
}
|
|
|
|
impl CommandResult {
|
|
pub fn finalize(self) -> bool {
|
|
print!("{}", self.output);
|
|
self.continue_
|
|
}
|
|
|
|
pub fn output(&self) -> &str {
|
|
&self.output
|
|
}
|
|
}
|
|
|
|
pub struct Repl<'a> {
|
|
/// In-progress multiline input, when the input so far doesn't parse as a complete expression
|
|
multiline_input: Option<String>,
|
|
rl: Editor<()>,
|
|
/// Local variables defined at the top-level in the repl
|
|
env: FxHashMap<SmolStr, Value>,
|
|
|
|
io_handle: Rc<TvixStoreIO>,
|
|
args: &'a Args,
|
|
source_map: SourceCode,
|
|
globals: Option<Rc<GlobalsMap>>,
|
|
}
|
|
|
|
impl<'a> Repl<'a> {
|
|
pub fn new(io_handle: Rc<TvixStoreIO>, args: &'a Args) -> Self {
|
|
let rl = Editor::<()>::new().expect("should be able to launch rustyline");
|
|
Self {
|
|
multiline_input: None,
|
|
rl,
|
|
env: FxHashMap::default(),
|
|
io_handle,
|
|
args,
|
|
source_map: Default::default(),
|
|
globals: None,
|
|
}
|
|
}
|
|
|
|
pub fn run(&mut self) {
|
|
if self.args.compile_only {
|
|
eprintln!("warning: `--compile-only` has no effect on REPL usage!");
|
|
}
|
|
|
|
let history_path = match state_dir() {
|
|
// Attempt to set up these paths, but do not hard fail if it
|
|
// doesn't work.
|
|
Some(mut path) => {
|
|
let _ = std::fs::create_dir_all(&path);
|
|
path.push("history.txt");
|
|
let _ = self.rl.load_history(&path);
|
|
Some(path)
|
|
}
|
|
|
|
None => None,
|
|
};
|
|
|
|
loop {
|
|
let prompt = if self.multiline_input.is_some() {
|
|
" > "
|
|
} else {
|
|
"tvix-repl> "
|
|
};
|
|
|
|
let readline = self.rl.readline(prompt);
|
|
match readline {
|
|
Ok(line) => {
|
|
if !self.send(line).finalize() {
|
|
break;
|
|
}
|
|
}
|
|
Err(ReadlineError::Interrupted) | Err(ReadlineError::Eof) => break,
|
|
|
|
Err(err) => {
|
|
eprintln!("error: {}", err);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
if let Some(path) = history_path {
|
|
self.rl.save_history(&path).unwrap();
|
|
}
|
|
}
|
|
|
|
/// Send a line of user input to the REPL. Returns a result indicating the output to show to the
|
|
/// user, and whether or not to continue
|
|
pub fn send(&mut self, line: String) -> CommandResult {
|
|
if line.is_empty() {
|
|
return CommandResult {
|
|
output: String::new(),
|
|
continue_: true,
|
|
};
|
|
}
|
|
|
|
let input = if let Some(mi) = &mut self.multiline_input {
|
|
mi.push('\n');
|
|
mi.push_str(&line);
|
|
mi
|
|
} else {
|
|
&line
|
|
};
|
|
|
|
let res = match ReplCommand::parse(input) {
|
|
ReplCommand::Quit => {
|
|
return CommandResult {
|
|
output: String::new(),
|
|
continue_: false,
|
|
};
|
|
}
|
|
ReplCommand::Help => {
|
|
println!("{}", ReplCommand::HELP);
|
|
Ok(InterpretResult::empty_success(None))
|
|
}
|
|
ReplCommand::Expr(input) => interpret(
|
|
Rc::clone(&self.io_handle),
|
|
input,
|
|
None,
|
|
self.args,
|
|
false,
|
|
AllowIncomplete::Allow,
|
|
Some(&self.env),
|
|
self.globals.clone(),
|
|
Some(self.source_map.clone()),
|
|
),
|
|
ReplCommand::Assign(Assignment { ident, value }) => {
|
|
match evaluate(
|
|
Rc::clone(&self.io_handle),
|
|
&value.to_string(), /* FIXME: don't re-parse */
|
|
None,
|
|
self.args,
|
|
AllowIncomplete::Allow,
|
|
Some(&self.env),
|
|
self.globals.clone(),
|
|
Some(self.source_map.clone()),
|
|
) {
|
|
Ok(result) => {
|
|
if let Some(value) = result.value {
|
|
self.env.insert(ident.into(), value);
|
|
}
|
|
Ok(InterpretResult::empty_success(Some(result.globals)))
|
|
}
|
|
Err(incomplete) => Err(incomplete),
|
|
}
|
|
}
|
|
ReplCommand::Explain(input) => interpret(
|
|
Rc::clone(&self.io_handle),
|
|
input,
|
|
None,
|
|
self.args,
|
|
true,
|
|
AllowIncomplete::Allow,
|
|
Some(&self.env),
|
|
self.globals.clone(),
|
|
Some(self.source_map.clone()),
|
|
),
|
|
ReplCommand::Print(input) => interpret(
|
|
Rc::clone(&self.io_handle),
|
|
input,
|
|
None,
|
|
&Args {
|
|
strict: true,
|
|
..(self.args.clone())
|
|
},
|
|
false,
|
|
AllowIncomplete::Allow,
|
|
Some(&self.env),
|
|
self.globals.clone(),
|
|
Some(self.source_map.clone()),
|
|
),
|
|
};
|
|
|
|
match res {
|
|
Ok(InterpretResult {
|
|
output,
|
|
globals,
|
|
success: _,
|
|
}) => {
|
|
self.rl.add_history_entry(input);
|
|
self.multiline_input = None;
|
|
if globals.is_some() {
|
|
self.globals = globals;
|
|
}
|
|
CommandResult {
|
|
output,
|
|
continue_: true,
|
|
}
|
|
}
|
|
Err(IncompleteInput) => {
|
|
if self.multiline_input.is_none() {
|
|
self.multiline_input = Some(line);
|
|
}
|
|
CommandResult {
|
|
output: String::new(),
|
|
continue_: true,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|