From c285ee182eeef9f8bc478bf7228293297a5ff9e1 Mon Sep 17 00:00:00 2001 From: greg Date: Mon, 26 Feb 2018 19:16:49 -0800 Subject: [PATCH] Temporarily disable type-erroring and tighten some code --- src/schala_lang/eval.rs | 8 +++----- src/schala_lang/mod.rs | 2 ++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/schala_lang/eval.rs b/src/schala_lang/eval.rs index 56b3c82..957c5c7 100644 --- a/src/schala_lang/eval.rs +++ b/src/schala_lang/eval.rs @@ -167,11 +167,9 @@ impl<'a> State<'a> { use self::ValueEntry::*; match self.values.get(&name) { None => return Err(format!("Value {} not found", *name)), - Some(lookup) => { - match lookup { - &Binding { ref val } => Ok(val.clone()), - &Function { .. } => Ok(FullyEvaluatedExpr::FuncLit(name.clone())) - } + Some(lookup) => match lookup { + &Binding { ref val } => Ok(val.clone()), + &Function { .. } => Ok(FullyEvaluatedExpr::FuncLit(name.clone())) } } } diff --git a/src/schala_lang/mod.rs b/src/schala_lang/mod.rs index 69fec0b..bdc85d4 100644 --- a/src/schala_lang/mod.rs +++ b/src/schala_lang/mod.rs @@ -75,8 +75,10 @@ impl ProgrammingLanguageInterface for Schala { }, Err(msg) => { output.add_artifact(TraceArtifact::new("type_check", msg)); + /* output.add_output(format!("Type error")); return output; + */ } }