greg/schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Kill old trait infrastructure

Browse Source
This commit is contained in:
greg
2018-04-30 14:34:15 -07:00
parent 491face68b
commit 83fe71f721
5 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rukka/src/lib.rs
View File

@@ -4,7 +4,7 @@ extern crate itertools;
extern crate schala_repl;
use itertools::Itertools;
use schala_repl::{ProgrammingLanguageInterface, EvalOptions, LanguageOutput};
use schala_repl::{ProgrammingLanguageInterface, EvalOptions, UnfinishedComputation, FinishedComputation};
use std::iter::Peekable;
use std::vec::IntoIter;
use std::str::Chars;
@@ -73,12 +73,11 @@ impl ProgrammingLanguageInterface for Rukka {
format!("rukka")
}
fn evaluate_in_repl(&mut self, input: &str, _eval_options: &EvalOptions) -> LanguageOutput {
let mut output = LanguageOutput::default();
fn execute_pipeline(&mut self, input: &str, _eval_options: &EvalOptions) -> FinishedComputation {
let mut output = UnfinishedComputation::default();
let sexps = match read(input) {
Err(err) => {
output.add_output(format!("Error: {}", err));
return output;
return output.finish(Err(format!("Error: {}", err)));
},
Ok(sexps) => sexps
};
@@ -89,8 +88,7 @@ impl ProgrammingLanguageInterface for Rukka {
Err(err) => format!("{} Error: {}", i, err),
}
}).intersperse(format!("\n")).collect();
output.add_output(output_str);
output
output.finish(Ok(output_str))
}
}