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

Floats, pathspec changes

Browse Source
This commit is contained in:
greg 2017-10-09 04:02:50 -07:00
parent ed8359bcd7
commit 66c7bbeb07
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/schala_lang/type_check.rs
View File

@ -4,9 +4,7 @@ use std::rc::Rc;
use schala_lang::parsing::{AST, Statement, Declaration, Signature, Expression, ExpressionType, Operation, TypeName}; use schala_lang::parsing::{AST, Statement, Declaration, Signature, Expression, ExpressionType, Operation, TypeName};
#[derive(Debug, PartialEq, Eq, Hash)] #[derive(Debug, PartialEq, Eq, Hash)]
struct PathSpecifier { struct PathSpecifier(Rc<String>);
name: Rc<String>,
}
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
struct TypeContextEntry { struct TypeContextEntry {
@ -39,9 +37,7 @@ impl TypeContext {
TypeDecl { .. } => (), TypeDecl { .. } => (),
TypeAlias { .. } => (), TypeAlias { .. } => (),
Binding {ref name, ref constant, ref expr} => { Binding {ref name, ref constant, ref expr} => {
let spec = PathSpecifier { let spec = PathSpecifier(name.clone());
name: name.clone(),
};
let type_var = expr.1.as_ref() let type_var = expr.1.as_ref()
.map(|ty| self.from_anno(ty)) .map(|ty| self.from_anno(ty))
.unwrap_or_else(|| { self.get_existential_type() }); .unwrap_or_else(|| { self.get_existential_type() });
@ -49,10 +45,7 @@ impl TypeContext {
self.symbol_table.insert(spec, entry); self.symbol_table.insert(spec, entry);
}, },
FuncDecl(ref signature, _) => { FuncDecl(ref signature, _) => {
let spec = PathSpecifier { let spec = PathSpecifier(signature.name.clone());
name: signature.name.clone(),
};
let type_var = self.from_signature(signature); let type_var = self.from_signature(signature);
let entry = TypeContextEntry { type_var, constant: true }; let entry = TypeContextEntry { type_var, constant: true };
self.symbol_table.insert(spec, entry); self.symbol_table.insert(spec, entry);
@ -63,10 +56,7 @@ impl TypeContext {
} }
} }
fn lookup(&mut self, binding: &Rc<String>) -> Option<TypeContextEntry> { fn lookup(&mut self, binding: &Rc<String>) -> Option<TypeContextEntry> {
let key = PathSpecifier { let key = PathSpecifier(binding.clone());
name: binding.clone(),
};
self.symbol_table.get(&key).map(|entry| entry.clone()) self.symbol_table.get(&key).map(|entry| entry.clone())
} }
pub fn debug_symbol_table(&self) -> String { pub fn debug_symbol_table(&self) -> String {
@ -120,6 +110,7 @@ pub enum TypeVariable {
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
pub enum UVar { pub enum UVar {
Integer, Integer,
Float,
Boolean, Boolean,
Unit, Unit,
Function(Box<TypeVariable>, Box<TypeVariable>), Function(Box<TypeVariable>, Box<TypeVariable>),
@ -171,6 +162,7 @@ impl TypeContext {
self.from_anno(anno) self.from_anno(anno)
}, },
(&IntLiteral(_), _) => Univ(UVar::Integer), (&IntLiteral(_), _) => Univ(UVar::Integer),
(&FloatLiteral(_), _) => Univ(UVar::Float),
(&BoolLiteral(_), _) => Univ(UVar::Boolean), (&BoolLiteral(_), _) => Univ(UVar::Boolean),
(&Variable(ref name), _) => self.lookup(name).map(|entry| entry.type_var) (&Variable(ref name), _) => self.lookup(name).map(|entry| entry.type_var)
.ok_or(format!("Couldn't find {}", name))?, .ok_or(format!("Couldn't find {}", name))?,