From 46dbac7f69ad9bb441efab334a7640104e27a62a Mon Sep 17 00:00:00 2001 From: greg Date: Mon, 23 Oct 2017 00:43:43 -0700 Subject: [PATCH] Starting to split project into multiple crates --- Cargo.toml | 4 + {src/schala_lang => schala-lang/src}/eval.rs | 3 +- schala-lang/src/mod.rs | 0 .../src}/parsing.rs | 0 .../src}/type_check.rs | 3 +- src/main.rs | 9 +- src/schala_lang/mod.rs | 95 ------------------- 7 files changed, 16 insertions(+), 98 deletions(-) rename {src/schala_lang => schala-lang/src}/eval.rs (98%) create mode 100644 schala-lang/src/mod.rs rename {src/schala_lang => schala-lang/src}/parsing.rs (100%) rename {src/schala_lang => schala-lang/src}/type_check.rs (98%) delete mode 100644 src/schala_lang/mod.rs diff --git a/Cargo.toml b/Cargo.toml index 921c6af..348aecc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,5 +22,9 @@ rocket_contrib = "*" phf = "0.7.12" includedir = "0.2.0" +schala-lang = { path = "schala-lang" } + [build-dependencies] includedir_codegen = "0.2.0" + +[workspace] diff --git a/src/schala_lang/eval.rs b/schala-lang/src/eval.rs similarity index 98% rename from src/schala_lang/eval.rs rename to schala-lang/src/eval.rs index 536b370..9bd7725 100644 --- a/src/schala_lang/eval.rs +++ b/schala-lang/src/eval.rs @@ -1,7 +1,8 @@ -use schala_lang::parsing::{AST, Statement, Declaration, Expression, Variant, ExpressionType, Operation}; use std::collections::HashMap; use std::rc::Rc; +use parsing::{AST, Statement, Declaration, Expression, Variant, ExpressionType, Operation}; + pub struct ReplState { values: HashMap, ValueEntry>, } diff --git a/schala-lang/src/mod.rs b/schala-lang/src/mod.rs new file mode 100644 index 0000000..e69de29 diff --git a/src/schala_lang/parsing.rs b/schala-lang/src/parsing.rs similarity index 100% rename from src/schala_lang/parsing.rs rename to schala-lang/src/parsing.rs diff --git a/src/schala_lang/type_check.rs b/schala-lang/src/type_check.rs similarity index 98% rename from src/schala_lang/type_check.rs rename to schala-lang/src/type_check.rs index caf15e7..f7f7f0d 100644 --- a/src/schala_lang/type_check.rs +++ b/schala-lang/src/type_check.rs @@ -1,9 +1,10 @@ use std::collections::HashMap; use std::rc::Rc; +use parsing::{AST, Statement, Declaration, Signature, Expression, ExpressionType, Operation, Variant, TypeName}; + //SKOLEMIZATION - how you prevent an unassigned existential type variable from leaking! -use schala_lang::parsing::{AST, Statement, Declaration, Signature, Expression, ExpressionType, Operation, Variant, TypeName}; // from Niko's talk /* fn type_check(expression, expected_ty) -> Ty { diff --git a/src/main.rs b/src/main.rs index 68534ac..5cf6649 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,13 +16,17 @@ extern crate rocket_contrib; extern crate includedir; extern crate phf; + +extern crate schala_lang; + use std::path::Path; use std::fs::File; use std::io::{Read, Write}; use std::process::exit; use std::default::Default; -mod schala_lang; + +mod schala_language; mod maaru_lang; mod robo_lang; @@ -366,3 +370,6 @@ fn program_options() -> getopts::Options { options } + + + diff --git a/src/schala_lang/mod.rs b/src/schala_lang/mod.rs deleted file mode 100644 index 7dff4d1..0000000 --- a/src/schala_lang/mod.rs +++ /dev/null @@ -1,95 +0,0 @@ -use itertools::Itertools; -use language::{ProgrammingLanguageInterface, EvalOptions, TraceArtifact, ReplOutput}; - -mod parsing; -mod type_check; -mod eval; - -use self::type_check::{TypeContext}; - -pub struct Schala { - state: eval::ReplState, - type_context: TypeContext -} - -impl Schala { - pub fn new() -> Schala { - Schala { - state: eval::ReplState::new(), - type_context: TypeContext::new(), - } - } -} - -impl ProgrammingLanguageInterface for Schala { - fn get_language_name(&self) -> String { - "Schala".to_string() - } - - fn get_source_file_suffix(&self) -> String { - format!("schala") - } - - fn evaluate_in_repl(&mut self, input: &str, options: &EvalOptions) -> ReplOutput { - let mut output = ReplOutput::default(); - let tokens = parsing::tokenize(input); - if options.debug_tokens { - let token_string = tokens.iter().map(|t| format!("{:?}<{}>", t.token_type, t.offset)).join(", "); - output.add_artifact(TraceArtifact::new("tokens", format!("{:?}", token_string))); - - } - - { - let token_errors: Vec<&String> = tokens.iter().filter_map(|t| t.get_error()).collect(); - if token_errors.len() != 0 { - output.add_output(format!("Tokenization error: {:?}\n", token_errors)); - return output; - } - } - - let ast = match parsing::parse(tokens) { - (Ok(ast), trace) => { - if options.debug_parse { - output.add_artifact(TraceArtifact::new_parse_trace(trace)); - output.add_artifact(TraceArtifact::new("ast", format!("{:?}", ast))); - } - ast - }, - (Err(err), trace) => { - output.add_artifact(TraceArtifact::new_parse_trace(trace)); - output.add_output(format!("Parse error: {:?}\n", err.msg)); - return output; - } - }; - - self.type_context.add_symbols(&ast); - - if options.debug_symbol_table { - let text = self.type_context.debug_symbol_table(); - output.add_artifact(TraceArtifact::new("symbol_table", text)); - } - - match self.type_context.type_check(&ast) { - Ok(ty) => { - output.add_artifact(TraceArtifact::new("type_check", format!("type: {:?}", ty))); - }, - Err(msg) => { - output.add_artifact(TraceArtifact::new("type_check", msg)); - output.add_output(format!("Type error")); - return output; - } - } - - let evaluation_output = self.state.evaluate(ast); - let mut acc = String::new(); - let mut iter = evaluation_output.iter().peekable(); - while let Some(s) = iter.next() { - acc.push_str(&s); - if let Some(_) = iter.peek() { - acc.push_str("\n"); - } - } - output.add_output(acc); - return output; - } -}