From 57536e63996d9d9e8812ad13531e8faaea2e6cb6 Mon Sep 17 00:00:00 2001 From: greg Date: Tue, 10 Oct 2017 01:11:24 -0700 Subject: [PATCH] Move some type checking code around --- src/schala_lang/type_check.rs | 75 +++++++++++++++++------------------ 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/src/schala_lang/type_check.rs b/src/schala_lang/type_check.rs index 6541c89..dce4d53 100644 --- a/src/schala_lang/type_check.rs +++ b/src/schala_lang/type_check.rs @@ -3,6 +3,43 @@ use std::rc::Rc; use schala_lang::parsing::{AST, Statement, Declaration, Signature, Expression, ExpressionType, Operation, TypeName}; +// from Niko's talk +/* fn type_check(expression, expected_ty) -> Ty { + let ty = bare_type_check(expression, expected_type); + if ty icompatible with expected_ty { + try_coerce(expression, ty, expected_ty) + } else { + ty + } + } + + fn bare_type_check(exprssion, expected_type) -> Ty { ... } + */ + +// from https://www.youtube.com/watch?v=il3gD7XMdmA +// typeInfer :: Expr a -> Matching (Type a) +// unify :: Type a -> Type b -> Matching (Type c) + + +#[derive(Debug, PartialEq, Clone)] +pub enum TypeVariable { + Univ(UVar), + Exist(u64), +} + +#[derive(Debug, PartialEq, Clone)] +pub enum UVar { + Integer, + Float, + String, + Boolean, + Unit, + Function(Box, Box), + Bottom, +} + +type TypeCheckResult = Result; + #[derive(Debug, PartialEq, Eq, Hash)] struct PathSpecifier(Rc); @@ -99,45 +136,7 @@ impl TypeContext { output_type } } -} -#[derive(Debug, PartialEq, Clone)] -pub enum TypeVariable { - Univ(UVar), - Exist(u64), -} - -#[derive(Debug, PartialEq, Clone)] -pub enum UVar { - Integer, - Float, - String, - Boolean, - Unit, - Function(Box, Box), - Bottom, -} - -type TypeCheckResult = Result; - -// from Niko's talk -/* fn type_check(expression, expected_ty) -> Ty { - let ty = bare_type_check(expression, expected_type); - if ty icompatible with expected_ty { - try_coerce(expression, ty, expected_ty) - } else { - ty - } - } - - fn bare_type_check(exprssion, expected_type) -> Ty { ... } - */ - -// from https://www.youtube.com/watch?v=il3gD7XMdmA -// typeInfer :: Expr a -> Matching (Type a) -// unify :: Type a -> Type b -> Matching (Type c) - -impl TypeContext { pub fn type_check(&mut self, ast: &AST) -> TypeCheckResult { let mut last = TypeVariable::Univ(UVar::Unit); for statement in ast.0.iter() {