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

More static type work

Browse Source
This commit is contained in:
greg 2018-02-21 18:12:46 -08:00
parent bb0fb716e4
commit 12f55fa844
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/schala_lang/typechecking.rs
View File

@ -71,8 +71,21 @@ 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::TypeName::*;
use self::Type::*; use self::TConst::*; use self::Type::*; use self::TConst::*;
Ok(Unit) Ok(match anno {
&Tuple(_) => return Err(format!("Tuples not yet implemented")),
&Singleton(ref name) => match name {
&TypeSingletonName { ref name, .. } => match **name {
ref n if n == "Int" => Const(Int),
ref n if n == "Float" => Const(Float),
ref n if n == "Bool" => Const(Bool),
ref n if n == "String" => Const(StringT),
ref n => Const(Custom((format!("{}", n))))
}
}
})
} }
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::*;