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

Minor syntax changes

Browse Source
This commit is contained in:
greg 2018-04-29 22:14:00 -07:00
parent 3a181dd0ac
commit 06638dc030
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,7 +105,7 @@ impl ProgrammingLanguageInterface for Schala {
fn execute_pipeline(&mut self, input: &str, options: &EvalOptions) -> FinishedComputation { fn execute_pipeline(&mut self, input: &str, options: &EvalOptions) -> FinishedComputation {
//let chain = pass_chain![tokenizing::tokenize, parsing::parse]; //let chain = pass_chain![tokenizing::tokenize, parsing::parse];
let mut chain = pass_chain![self, let mut chain = pass_chain![self;
tokenizing_stage, tokenizing_stage,
parsing_stage, parsing_stage,
symbol_table_stage, symbol_table_stage,
@ -115,6 +115,7 @@ impl ProgrammingLanguageInterface for Schala {
chain(input) chain(input)
} }
/*
fn execute(&mut self, input: &str, options: &EvalOptions) -> FinishedComputation { fn execute(&mut self, input: &str, options: &EvalOptions) -> FinishedComputation {
schala_codegen::print_a_thing!(); schala_codegen::print_a_thing!();
@ -187,4 +188,5 @@ impl ProgrammingLanguageInterface for Schala {
.map(|v| { v.into_iter().intersperse(format!("\n")).collect() }); .map(|v| { v.into_iter().intersperse(format!("\n")).collect() });
evaluation.output(eval_output) evaluation.output(eval_output)
} }
*/
} }

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

@ -194,7 +194,7 @@ pub trait ProgrammingLanguageInterface {
#[macro_export] #[macro_export]
macro_rules! pass_chain { macro_rules! pass_chain {
($state:expr, $($pass:path), *) => { ($state:expr; $($pass:path), *) => {
|text_input| { |text_input| {
let mut comp = UnfinishedComputation::default(); let mut comp = UnfinishedComputation::default();
pass_chain_helper! { $state, comp; text_input $(, $pass)* } pass_chain_helper! { $state, comp; text_input $(, $pass)* }