From f83cece2b46340b9eec21943de2ed86617343299 Mon Sep 17 00:00:00 2001
From: greg <greg.shuflin@protonmail.com>
Date: Thu, 2 Feb 2017 01:21:40 -0800
Subject: [PATCH] Import Maaru into main

---
 src/maaru_lang/mod.rs | 5 +++++
 src/main.rs           | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/maaru_lang/mod.rs b/src/maaru_lang/mod.rs
index f35ae19..cede430 100644
--- a/src/maaru_lang/mod.rs
+++ b/src/maaru_lang/mod.rs
@@ -1,7 +1,12 @@
 use language::{ProgrammingLanguage, EvaluationMachine, ParseError, TokenError, LLVMCodeString};
 
 pub struct Maaru {
+}
 
+impl Maaru {
+    pub fn new() -> Maaru {
+        Maaru { }
+    }
 }
 
 pub struct MaaruEvaluator {
diff --git a/src/main.rs b/src/main.rs
index b0c3607..3fa1518 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -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()) {