Import Maaru into main

This commit is contained in:
greg 2017-02-02 01:21:40 -08:00
parent 8fd5fb5a0b
commit f83cece2b4
2 changed files with 10 additions and 1 deletions

View File

@ -1,7 +1,12 @@
use language::{ProgrammingLanguage, EvaluationMachine, ParseError, TokenError, LLVMCodeString};
pub struct Maaru {
}
impl Maaru {
pub fn new() -> Maaru {
Maaru { }
}
}
pub struct MaaruEvaluator {

View File

@ -22,7 +22,11 @@ mod llvm_wrap;
fn main() {
let languages: Vec<Box<LanguageInterface>> = vec![Box::new((Schala::new(), SchalaEvaluator::new(None)))];
let languages: Vec<Box<LanguageInterface>> =
vec![
Box::new((Schala::new(), SchalaEvaluator::new(None))),
Box::new((maaru_lang::Maaru::new(), maaru_lang::MaaruEvaluator::new())),
];
let option_matches =
match program_options().parse(std::env::args()) {