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

type of a declaration should be Void, not Unit

Browse Source 
I think this makes sense

Also kill some compiler warnings
This commit is contained in:
greg 2018-02-22 03:25:05 -08:00
parent c35401da65
commit e7103b925b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/schala_lang/typechecking.rs
View File

@ -56,7 +56,7 @@ impl TypeContext {
}, },
_ => return Err(format!("other formats not done")) _ => return Err(format!("other formats not done"))
} }
Ok(Unit) Ok(Void)
} }
fn type_infer(&mut self, expr: &parsing::Expression) -> TypeResult<Type> { fn type_infer(&mut self, expr: &parsing::Expression) -> TypeResult<Type> {
use self::parsing::Expression; use self::parsing::Expression;
@ -81,7 +81,7 @@ impl TypeContext {
} }
} }
fn type_from_anno(&mut self, anno: &parsing::TypeName) -> TypeResult<Type> { fn type_from_anno(&mut self, anno: &parsing::TypeName) -> TypeResult<Type> {
use self::parsing::{TypeName, TypeSingletonName}; use self::parsing::TypeSingletonName;
use self::parsing::TypeName::*; use self::parsing::TypeName::*;
use self::Type::*; use self::TConst::*; use self::Type::*; use self::TConst::*;
Ok(match anno { Ok(match anno {
@ -98,7 +98,7 @@ impl TypeContext {
}) })
} }
fn unify(&mut self, t1: Type, t2: Type) -> TypeResult<Type> { fn unify(&mut self, t1: Type, t2: Type) -> TypeResult<Type> {
use self::Type::*; use self::TConst::*; use self::Type::*;// use self::TConst::*;
match (t1, t2) { match (t1, t2) {
(Const(ref a), Const(ref b)) if a == b => Ok(Const(a.clone())), (Const(ref a), Const(ref b)) if a == b => Ok(Const(a.clone())),
(a, b) => Err(format!("Types {:?} and {:?} don't unify", a, b)) (a, b) => Err(format!("Types {:?} and {:?} don't unify", a, b))