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

Move Evaluator state into interpreter state

Browse Source
This commit is contained in:
greg 2016-01-22 02:20:12 -08:00
parent 229e6ae733
commit a8cafa8c64
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.rs
View File

@ -26,7 +26,11 @@ fn main() {
source_file.read_to_string(&mut buffer).unwrap(); source_file.read_to_string(&mut buffer).unwrap();
panic!("Not implemented yet"); panic!("Not implemented yet");
} else { } else {
let initial_state = InterpreterState { show_tokens: false, show_parse: false }; let initial_state = InterpreterState {
show_tokens: false,
show_parse: false,
evaluator: Evaluator::new(),
};
REPL::with_prompt_and_state(Box::new(repl_handler), ">> ", initial_state) REPL::with_prompt_and_state(Box::new(repl_handler), ">> ", initial_state)
.run(); .run();
} }
@ -35,6 +39,7 @@ fn main() {
struct InterpreterState { struct InterpreterState {
show_tokens: bool, show_tokens: bool,
show_parse: bool, show_parse: bool,
evaluator: Evaluator,
} }
impl ReplState for InterpreterState { impl ReplState for InterpreterState {
@ -76,8 +81,7 @@ fn repl_handler(input: &str, state: &mut InterpreterState) -> String {
println!("AST: {:?}", ast); println!("AST: {:?}", ast);
} }
let mut evaluator = Evaluator::new(); let mut output: Vec<String> = state.evaluator.run(ast);
let mut output: Vec<String> = evaluator.run(ast);
//for now only handle last output //for now only handle last output
output.pop().unwrap_or("".to_string()) output.pop().unwrap_or("".to_string())