Make schala-lib::language private and reexport

schala-lib/src/lib.rs

@@ -23,13 +23,13 @@ use std::io::{Read, Write};
 use std::process::exit;
 use std::default::Default;
 
-pub mod language;
-use language::{ProgrammingLanguageInterface, EvalOptions, LLVMCodeString};
+mod language;
 mod webapp;
 pub mod llvm_wrap;
 
 include!(concat!(env!("OUT_DIR"), "/static.rs"));
 
+pub use language::{ProgrammingLanguageInterface, EvalOptions, ReplOutput, TraceArtifact, LLVMCodeString};
 pub type PLIGenerator = Box<Fn() -> Box<ProgrammingLanguageInterface> + Send + Sync>;
 
 pub fn schala_main(generators: Vec<PLIGenerator>) {

src/maaru_lang/compilation.rs

@@ -6,7 +6,7 @@ use self::llvm_sys::prelude::*;
 use self::llvm_sys::{LLVMIntPredicate};
 
 use maaru_lang::parser::{AST, Statement, Function, Prototype, Expression, BinOp};
-use schala_lib::language::LLVMCodeString;
+use schala_lib::LLVMCodeString;
 
 use schala_lib::llvm_wrap as LLVMWrap;
 

src/maaru_lang/mod.rs

@@ -3,7 +3,7 @@ pub mod parser;
 pub mod eval;
 pub mod compilation;
 
-use schala_lib::language::{ProgrammingLanguageInterface, EvalOptions, ReplOutput, TraceArtifact, LLVMCodeString};
+use schala_lib::{ProgrammingLanguageInterface, EvalOptions, ReplOutput, TraceArtifact, LLVMCodeString};
 
 #[derive(Debug)]
 pub struct TokenError {

src/main.rs

@@ -13,7 +13,6 @@ mod robo_lang;
 
 extern crate schala_lib;
 use schala_lib::{PLIGenerator, schala_main};
-use schala_lib::language::ProgrammingLanguageInterface;
 
 #[link_args="-ltinfo"]
 extern { }

src/robo_lang/mod.rs

@@ -1,6 +1,5 @@
 use itertools::Itertools;
-
-use schala_lib::language::{ProgrammingLanguageInterface, EvalOptions, ReplOutput};
+use schala_lib::{ProgrammingLanguageInterface, EvalOptions, ReplOutput};
 
 pub struct Robo {
 }

src/schala_lang/mod.rs

@@ -1,5 +1,5 @@
 use itertools::Itertools;
-use schala_lib::language::{ProgrammingLanguageInterface, EvalOptions, TraceArtifact, ReplOutput};
+use schala_lib::{ProgrammingLanguageInterface, EvalOptions, TraceArtifact, ReplOutput};
 
 mod parsing;
 mod type_check;