language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 08:34:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

have the repl eval named defs

Browse source
This commit is contained in:
Richard Feldman 2022-10-30 03:58:44 -04:00
parent 4d8a3ba3d7
commit 08cf8e727f
No known key found for this signature in database
GPG key ID: F1F21AA5B1D9E43B
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/repl_cli/src/repl_state.rs
View file

@ -110,9 +110,13 @@ impl ReplState {
pub fn eval_and_format<'a>(&mut self, src: &str) -> String { pub fn eval_and_format<'a>(&mut self, src: &str) -> String {
let arena = Bump::new(); let arena = Bump::new();
let mut opt_var_name;
let src = match parse_src(&arena, src) { let src = match parse_src(&arena, src) {
ParseOutcome::Expr(_) => src, ParseOutcome::Expr(_) => {
opt_var_name = None;
src
}
ParseOutcome::ValueDef(value_def) => { ParseOutcome::ValueDef(value_def) => {
match value_def { match value_def {
ValueDef::Annotation( ValueDef::Annotation(
@ -155,10 +159,10 @@ impl ReplState {
.. ..
} => { } => {
self.add_past_def(ident.to_string(), src.to_string()); self.add_past_def(ident.to_string(), src.to_string());
opt_var_name = Some(ident.to_string());
// Return early without running eval, since neither standalone annotations // Eval the body of the def by adding a lookup to it
// nor pending potential AnnotatedBody exprs can be evaluated as expressions. *ident
return String::new();
} }
ValueDef::Annotation(_, _) ValueDef::Annotation(_, _)
| ValueDef::Body(_, _) | ValueDef::Body(_, _)
@ -190,16 +194,17 @@ impl ReplState {
// Record e.g. "val1" as a past def, unless our input was exactly the name of // Record e.g. "val1" as a past def, unless our input was exactly the name of
// an existing identifer (e.g. I just typed "val1" into the prompt - there's no // an existing identifer (e.g. I just typed "val1" into the prompt - there's no
// need to reassign "val1" to "val2" just because I wanted to see what its value was!) // need to reassign "val1" to "val2" just because I wanted to see what its value was!)
let opt_var_name; let (output, problems) = match opt_var_name
let (output, problems) = match self.past_def_idents.get(src.trim()) { .or_else(|| self.past_def_idents.get(src.trim()).cloned())
{
Some(existing_ident) => { Some(existing_ident) => {
opt_var_name = Some(existing_ident.to_string()); opt_var_name = Some(existing_ident);
gen_and_eval_llvm(&self.with_past_defs(src), Triple::host(), OptLevel::Normal) gen_and_eval_llvm(&self.with_past_defs(&src), Triple::host(), OptLevel::Normal)
} }
None => { None => {
let (output, problems) = let (output, problems) =
gen_and_eval_llvm(&self.with_past_defs(src), Triple::host(), OptLevel::Normal); gen_and_eval_llvm(&self.with_past_defs(&src), Triple::host(), OptLevel::Normal);
// Don't persist defs that have compile errors // Don't persist defs that have compile errors
if problems.errors.is_empty() { if problems.errors.is_empty() {