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

Pass mutable handle to unfinishedcomputation

Browse Source
This commit is contained in:
greg 2018-04-29 21:04:57 -07:00
parent fb4de6f2d6
commit 1d1a5fb6fc
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
schala-lang/src/lib.rs
View File

@ -40,22 +40,22 @@ impl Schala {
}
}
fn tokenizing_stage(_handle: &mut Schala, input: &str) -> Result<Vec<tokenizing::Token>, ()> {
fn tokenizing_stage(_handle: &mut Schala, input: &str, comp: Option<&mut UnfinishedComputation>) -> Result<Vec<tokenizing::Token>, ()> {
Ok(tokenizing::tokenize(input))
}
fn parsing_stage(_handle: &mut Schala, input: Vec<tokenizing::Token>) -> Result<parsing::AST, parsing::ParseError> {
fn parsing_stage(_handle: &mut Schala, input: Vec<tokenizing::Token>, comp: Option<&mut UnfinishedComputation>) -> Result<parsing::AST, parsing::ParseError> {
parsing::parse(input).0
}
fn symbol_table_stage(handle: &mut Schala, input: parsing::AST) -> Result<parsing::AST, String> {
fn symbol_table_stage(handle: &mut Schala, input: parsing::AST, comp: Option<&mut UnfinishedComputation>) -> Result<parsing::AST, String> {
match handle.type_context.add_top_level_types(&input) {
Ok(()) => Ok(input),
Err(msg) => Err(msg)
}
}
fn typechecking_stage(handle: &mut Schala, input: parsing::AST) -> Result<parsing::AST, String> {
fn typechecking_stage(handle: &mut Schala, input: parsing::AST, comp: Option<&mut UnfinishedComputation>) -> Result<parsing::AST, String> {
match handle.type_context.type_check_ast(&input) {
Ok(ty) => {
println!("FINAL TYPE: {:?}", ty);
@ -70,7 +70,7 @@ fn typechecking_stage(handle: &mut Schala, input: parsing::AST) -> Result<parsin
}
}
fn eval_stage(handle: &mut Schala, input: parsing::AST) -> Result<String, String> {
fn eval_stage(handle: &mut Schala, input: parsing::AST, comp: Option<&mut UnfinishedComputation>) -> Result<String, String> {
let evaluation_outputs = handle.state.evaluate(input);
let text_output: Result<Vec<String>, String> = evaluation_outputs
.into_iter()

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

@ -208,7 +208,8 @@ macro_rules! pass_chain_helper {
{
let pass_name = stringify!($pass);
println!("Running pass {}", pass_name);
let output = $pass($state, $input);
let debug_pointer: Option<&mut UnfinishedComputation> = None;
let output = $pass($state, $input, debug_pointer);
match output {
Ok(result) => pass_chain_helper! { $state, $comp; result $(, $rest)* },
Err(err) => {