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

Removed (for now) LLVMCodeString

Browse Source
This commit is contained in:
greg 2018-03-20 21:13:34 -07:00
parent 43ade31f3e
commit 9d4082463a
3 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
schala-lib/src/language.rs
View File

@ -9,15 +9,6 @@ pub struct LLVMCodeString(pub String);
pub struct EvalOptions { pub struct EvalOptions {
pub debug: DebugOptions, pub debug: DebugOptions,
pub execution_method: ExecutionMethod pub execution_method: ExecutionMethod
/*
pub debug_tokens: bool,
pub debug_parse: bool,
pub debug_type: bool,
pub debug_symbol_table: bool,
pub show_llvm_ir: bool,
pub trace_evaluation: bool,
pub compile: bool,
*/
} }
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub enum ExecutionMethod { pub enum ExecutionMethod {
@ -161,10 +152,4 @@ 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 compile(&mut self, _input: &str) -> LLVMCodeString {
LLVMCodeString("".to_string())
}
fn can_compile(&self) -> bool {
false
}
} }

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

@ -33,7 +33,7 @@ pub mod llvm_wrap;
include!(concat!(env!("OUT_DIR"), "/static.rs")); include!(concat!(env!("OUT_DIR"), "/static.rs"));
pub use language::{ProgrammingLanguageInterface, EvalOptions, ExecutionMethod, TraceArtifact, LanguageOutput, LLVMCodeString, FinishedComputation, UnfinishedComputation}; pub use language::{LLVMCodeString, ProgrammingLanguageInterface, EvalOptions, ExecutionMethod, TraceArtifact, LanguageOutput, FinishedComputation, UnfinishedComputation};
pub type PLIGenerator = Box<Fn() -> Box<ProgrammingLanguageInterface> + Send + Sync>; pub type PLIGenerator = Box<Fn() -> Box<ProgrammingLanguageInterface> + Send + Sync>;
pub fn schala_main(generators: Vec<PLIGenerator>) { pub fn schala_main(generators: Vec<PLIGenerator>) {
@ -306,6 +306,7 @@ impl Repl {
} }
} }
/*
pub fn compilation_sequence(llvm_code: LLVMCodeString, sourcefile: &str) { pub fn compilation_sequence(llvm_code: LLVMCodeString, sourcefile: &str) {
use std::process::Command; use std::process::Command;
@ -351,6 +352,7 @@ pub fn compilation_sequence(llvm_code: LLVMCodeString, sourcefile: &str) {
.expect(&format!("failed to run rm {}", filename)); .expect(&format!("failed to run rm {}", filename));
} }
} }
*/
fn program_options() -> getopts::Options { fn program_options() -> getopts::Options {
let mut options = getopts::Options::new(); let mut options = getopts::Options::new();

5
src/maaru_lang/mod.rs
View File

@ -3,7 +3,7 @@ pub mod parser;
pub mod eval; pub mod eval;
pub mod compilation; pub mod compilation;
use schala_lib::{ProgrammingLanguageInterface, EvalOptions, LanguageOutput, TraceArtifact, LLVMCodeString}; use schala_lib::{ProgrammingLanguageInterface, EvalOptions, LanguageOutput, TraceArtifact};
#[derive(Debug)] #[derive(Debug)]
pub struct TokenError { pub struct TokenError {
@ -74,6 +74,8 @@ impl<'a> ProgrammingLanguageInterface for Maaru<'a> {
return output; return output;
} }
/* TODO make this work with new framework */
/*
fn can_compile(&self) -> bool { fn can_compile(&self) -> bool {
true true
} }
@ -96,4 +98,5 @@ impl<'a> ProgrammingLanguageInterface for Maaru<'a> {
}; };
compilation::compile_ast(ast) compilation::compile_ast(ast)
} }
*/
} }