Temporarily disable type-erroring

and tighten some code
This commit is contained in:
greg 2018-02-26 19:16:49 -08:00
parent 51cf8a4824
commit 63f5f155ae
2 changed files with 5 additions and 5 deletions

View File

@ -167,14 +167,12 @@ impl<'a> State<'a> {
use self::ValueEntry::*; use self::ValueEntry::*;
match self.values.get(&name) { match self.values.get(&name) {
None => return Err(format!("Value {} not found", *name)), None => return Err(format!("Value {} not found", *name)),
Some(lookup) => { Some(lookup) => match lookup {
match lookup {
&Binding { ref val } => Ok(val.clone()), &Binding { ref val } => Ok(val.clone()),
&Function { .. } => Ok(FullyEvaluatedExpr::FuncLit(name.clone())) &Function { .. } => Ok(FullyEvaluatedExpr::FuncLit(name.clone()))
} }
} }
} }
}
fn eval_binexp(&mut self, op: BinOp, lhs: Box<Expression>, rhs: Box<Expression>) -> EvalResult<FullyEvaluatedExpr> { fn eval_binexp(&mut self, op: BinOp, lhs: Box<Expression>, rhs: Box<Expression>) -> EvalResult<FullyEvaluatedExpr> {
use self::FullyEvaluatedExpr::*; use self::FullyEvaluatedExpr::*;

View File

@ -75,8 +75,10 @@ impl ProgrammingLanguageInterface for Schala {
}, },
Err(msg) => { Err(msg) => {
output.add_artifact(TraceArtifact::new("type_check", msg)); output.add_artifact(TraceArtifact::new("type_check", msg));
/*
output.add_output(format!("Type error")); output.add_output(format!("Type error"));
return output; return output;
*/
} }
} }