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

Kill old execute method

Browse Source
This commit is contained in:
greg 2018-04-29 22:53:17 -07:00
parent 832d0d4ee3
commit 8a5b8619fa
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
schala-repl/src/language.rs
View File

@ -173,9 +173,6 @@ pub trait ProgrammingLanguageInterface {
FinishedComputation { artifacts: HashMap::new(), text_output: Err(format!("Execution pipeline not done")) } FinishedComputation { artifacts: HashMap::new(), text_output: Err(format!("Execution pipeline not done")) }
} }
fn execute(&mut self, _input: &str, _eval_options: &EvalOptions) -> FinishedComputation {
FinishedComputation { artifacts: HashMap::new(), text_output: Err(format!("REPL evaluation not implemented")) }
}
fn get_language_name(&self) -> String; fn get_language_name(&self) -> String;
fn get_source_file_suffix(&self) -> String; fn get_source_file_suffix(&self) -> String;
fn handle_custom_interpreter_directives(&mut self, _commands: &Vec<&str>) -> Option<String> { fn handle_custom_interpreter_directives(&mut self, _commands: &Vec<&str>) -> Option<String> {

5
schala-repl/src/lib.rs
View File

@ -119,7 +119,7 @@ fn run_noninteractive(filename: &str, languages: Vec<Box<ProgrammingLanguageInte
panic!("Not ready to go yet"); panic!("Not ready to go yet");
}, },
ExecutionMethod::Interpret => { ExecutionMethod::Interpret => {
let output = language.execute(&buffer, &options); let output = language.execute_pipeline(&buffer, &options);
output.to_noninteractive().map(|text| println!("{}", text)); output.to_noninteractive().map(|text| println!("{}", text));
} }
} }
@ -210,9 +210,6 @@ impl Repl {
fn input_handler(&mut self, input: &str) -> String { fn input_handler(&mut self, input: &str) -> String {
let ref mut language = self.languages[self.current_language_index]; let ref mut language = self.languages[self.current_language_index];
/*
let interpreter_output = language.execute(input, &self.options);
*/
let interpreter_output = language.execute_pipeline(input, &self.options); let interpreter_output = language.execute_pipeline(input, &self.options);
interpreter_output.to_repl() interpreter_output.to_repl()
} }