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

Add self

Browse Source
This commit is contained in:
greg 2018-04-29 03:22:36 -07:00
parent fd89de77cc
commit 5abaadc0ca
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,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 chain = pass_chain![tokenizing_stage, parsing_stage]; let chain = pass_chain![self, tokenizing_stage, parsing_stage];
chain(input) chain(input)
} }

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

@ -172,7 +172,7 @@ pub trait ProgrammingLanguageInterface {
} }
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> {
None None
} }
fn custom_interpreter_directives_help(&self) -> String { fn custom_interpreter_directives_help(&self) -> String {
@ -182,8 +182,8 @@ pub trait ProgrammingLanguageInterface {
#[macro_export] #[macro_export]
macro_rules! pass_chain { macro_rules! pass_chain {
($($pass:path), *) => { ($self:expr, $($pass:path), *) => {
|text_input| { pass_chain_helper! { text_input $(, $pass)* } } |text_input| { pass_chain_helper! { $self, text_input $(, $pass)* } }
}; };
} }
@ -191,13 +191,13 @@ macro_rules! pass_chain {
//but should in the future return a FinishedComputation //but should in the future return a FinishedComputation
#[macro_export] #[macro_export]
macro_rules! pass_chain_helper { macro_rules! pass_chain_helper {
($input:expr, $pass:path $(, $rest:path)*) => { ($self:expr, $input:expr, $pass:path $(, $rest:path)*) => {
{ {
let pass_name = stringify!($pass); let pass_name = stringify!($pass);
println!("Running pass {}", pass_name); println!("Running pass {}", pass_name);
let output = $pass($input); let output = $pass($input);
match output { match output {
Ok(result) => pass_chain_helper! { result $(, $rest)* }, Ok(result) => pass_chain_helper! { $self, result $(, $rest)* },
Err(err) => { Err(err) => {
let comp = UnfinishedComputation::default(); let comp = UnfinishedComputation::default();
comp.output(Err(format!("Pass {} failed with {:?}", pass_name, err))) comp.output(Err(format!("Pass {} failed with {:?}", pass_name, err)))
@ -206,7 +206,7 @@ macro_rules! pass_chain_helper {
} }
}; };
// Done // Done
($final_output:expr) => { ($self:expr, $final_output:expr) => {
{ {
let comp = UnfinishedComputation::default(); let comp = UnfinishedComputation::default();
let final_output: FinishedComputation = comp.output(Ok(format!("{:?}", $final_output))); let final_output: FinishedComputation = comp.output(Ok(format!("{:?}", $final_output)));