language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-30 07:14:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

renamed repl function

Browse source
This commit is contained in:
Anton-4 2020-11-17 09:48:19 +01:00
parent 62e9a1d6ea
commit d8f720a92f
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cli/src/repl.rs
View file

@ -75,7 +75,7 @@ pub fn main() -> io::Result<()> {
} else if prev_line_blank { } else if prev_line_blank {
// After two blank lines in a row, give up and try parsing it // After two blank lines in a row, give up and try parsing it
// even though it's going to fail. This way you don't get stuck. // even though it's going to fail. This way you don't get stuck.
match print_output(pending_src.as_str()) { match eval_and_format(pending_src.as_str()) {
Ok(output) => { Ok(output) => {
println!("{}", output); println!("{}", output);
} }
@ -97,12 +97,12 @@ pub fn main() -> io::Result<()> {
} }
_ => { _ => {
let result = if pending_src.is_empty() { let result = if pending_src.is_empty() {
print_output(line) eval_and_format(line)
} else { } else {
pending_src.push('\n'); pending_src.push('\n');
pending_src.push_str(line); pending_src.push_str(line);
print_output(pending_src.as_str()) eval_and_format(pending_src.as_str())
}; };
match result { match result {
@ -117,7 +117,7 @@ pub fn main() -> io::Result<()> {
// If we hit an eof, and we're allowed to keep going, // If we hit an eof, and we're allowed to keep going,
// append the str to the src we're building up and continue. // append the str to the src we're building up and continue.
// (We only need to append it here if it was empty before; // (We only need to append it here if it was empty before;
// otherwise, we already appended it before calling print_output.) // otherwise, we already appended it before calling eval_and_format.)
if pending_src.is_empty() { if pending_src.is_empty() {
pending_src.push_str(line); pending_src.push_str(line);
@ -141,7 +141,7 @@ fn report_parse_error(fail: Fail) {
println!("TODO Gracefully report parse error in repl: {:?}", fail); println!("TODO Gracefully report parse error in repl: {:?}", fail);
} }
fn print_output(src: &str) -> Result<String, Fail> { fn eval_and_format(src: &str) -> Result<String, Fail> {
gen(src.as_bytes(), Triple::host(), OptLevel::Normal).map(|output| match output { gen(src.as_bytes(), Triple::host(), OptLevel::Normal).map(|output| match output {
ReplOutput::NoProblems { expr, expr_type } => { ReplOutput::NoProblems { expr, expr_type } => {
format!("\n{} \u{001b}[35m:\u{001b}[0m {}", expr, expr_type) format!("\n{} \u{001b}[35m:\u{001b}[0m {}", expr, expr_type)