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

Store constant state, func/binding as value

Browse Source 
on symbol table, instead of key
This commit is contained in:
greg 2017-10-09 02:38:33 -07:00
parent 996f75e15c
commit ed8359bcd7
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/schala_lang/type_check.rs
View File

@ -6,12 +6,16 @@ use schala_lang::parsing::{AST, Statement, Declaration, Signature, Expression, E
#[derive(Debug, PartialEq, Eq, Hash)]
struct PathSpecifier {
name: Rc<String>,
kind: &'static str,
constant: bool,
}
#[derive(Debug, PartialEq, Clone)]
struct TypeContextEntry {
type_var: TypeVariable,
constant: bool
}
pub struct TypeContext {
symbol_table: HashMap<PathSpecifier, TypeVariable>,
symbol_table: HashMap<PathSpecifier, TypeContextEntry>,
existential_type_label_count: u64
}
@ -37,40 +41,33 @@ impl TypeContext {
Binding {ref name, ref constant, ref expr} => {
let spec = PathSpecifier {
name: name.clone(),
kind: "binding",
constant: *constant
};
let binding_contents = expr.1.as_ref()
let type_var = expr.1.as_ref()
.map(|ty| self.from_anno(ty))
.unwrap_or_else(|| { self.get_existential_type() });
self.symbol_table.insert(spec, binding_contents);
let entry = TypeContextEntry { type_var, constant: *constant };
self.symbol_table.insert(spec, entry);
},
FuncDecl(ref signature, _) => {
let spec = PathSpecifier {
name: signature.name.clone(),
kind: "binding",
constant: true
};
let func_type = self.from_signature(signature);
self.symbol_table.insert(spec, func_type);
let type_var = self.from_signature(signature);
let entry = TypeContextEntry { type_var, constant: true };
self.symbol_table.insert(spec, entry);
},
}
}
}
}
}
fn lookup(&mut self, binding: &Rc<String>) -> Option<TypeVariable> {
use self::TypeVariable::*;
use self::UVar::*;
fn lookup(&mut self, binding: &Rc<String>) -> Option<TypeContextEntry> {
let key = PathSpecifier {
name: binding.clone(),
kind: "binding",
constant: true
};
self.symbol_table.get(&key).map(|x| x.clone())
self.symbol_table.get(&key).map(|entry| entry.clone())
}
pub fn debug_symbol_table(&self) -> String {
format!("Symbol table:\n {:?}", self.symbol_table)
@ -175,7 +172,7 @@ impl TypeContext {
},
(&IntLiteral(_), _) => Univ(UVar::Integer),
(&BoolLiteral(_), _) => Univ(UVar::Boolean),
(&Variable(ref name), _) => self.lookup(name)
(&Variable(ref name), _) => self.lookup(name).map(|entry| entry.type_var)
.ok_or(format!("Couldn't find {}", name))?,
(&Call { ref f, ref arguments }, _) => {
let f_type = self.infer(&*f)?;