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

rename type_var to ty

Browse Source
This commit is contained in:
greg 2017-10-10 22:14:55 -07:00
parent cd11d18385
commit 617a30b967
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/schala_lang/type_check.rs
View File

@ -56,7 +56,7 @@ struct PathSpecifier(Rc<String>);
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
struct TypeContextEntry { struct TypeContextEntry {
type_var: Type, ty: Type,
constant: bool constant: bool
} }
@ -86,43 +86,43 @@ impl TypeContext {
Impl { .. } => (), Impl { .. } => (),
TypeDecl(ref type_constructor, ref body) => { TypeDecl(ref type_constructor, ref body) => {
for variant in body.0.iter() { for variant in body.0.iter() {
let (spec, type_var) = match variant { let (spec, ty) = match variant {
&Variant::UnitStruct(ref data_constructor) => { &Variant::UnitStruct(ref data_constructor) => {
let spec = PathSpecifier(data_constructor.clone()); let spec = PathSpecifier(data_constructor.clone());
let type_var = TConst(UserT(type_constructor.clone())); let ty = TConst(UserT(type_constructor.clone()));
(spec, type_var) (spec, ty)
}, },
&Variant::TupleStruct(ref data_construcor, ref args) => { &Variant::TupleStruct(ref data_construcor, ref args) => {
//TODO fix //TODO fix
let arg = args.get(0).unwrap(); let arg = args.get(0).unwrap();
let type_arg = self.from_anno(arg); let type_arg = self.from_anno(arg);
let spec = PathSpecifier(data_construcor.clone()); let spec = PathSpecifier(data_construcor.clone());
let type_var = TConst(FunctionT( let ty = TConst(FunctionT(
Box::new(type_arg), Box::new(type_arg),
Box::new(TConst(UserT(type_constructor.clone()))), Box::new(TConst(UserT(type_constructor.clone()))),
)); ));
(spec, type_var) (spec, ty)
}, },
&Variant::Record(_, _) => unimplemented!(), &Variant::Record(_, _) => unimplemented!(),
}; };
let entry = TypeContextEntry { type_var, constant: true }; let entry = TypeContextEntry { ty, constant: true };
self.symbol_table.insert(spec, entry); self.symbol_table.insert(spec, entry);
} }
}, },
TypeAlias { .. } => (), TypeAlias { .. } => (),
Binding {ref name, ref constant, ref expr} => { Binding {ref name, ref constant, ref expr} => {
let spec = PathSpecifier(name.clone()); let spec = PathSpecifier(name.clone());
let type_var = expr.1.as_ref() let ty = 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() });
let entry = TypeContextEntry { type_var, constant: *constant }; let entry = TypeContextEntry { ty, constant: *constant };
self.symbol_table.insert(spec, entry); self.symbol_table.insert(spec, entry);
}, },
FuncDecl(ref signature, _) => { FuncDecl(ref signature, _) => {
let spec = PathSpecifier(signature.name.clone()); let spec = PathSpecifier(signature.name.clone());
let type_var = self.from_signature(signature); let ty = self.from_signature(signature);
let entry = TypeContextEntry { type_var, constant: true }; let entry = TypeContextEntry { ty, constant: true };
self.symbol_table.insert(spec, entry); self.symbol_table.insert(spec, entry);
}, },
} }
@ -234,7 +234,7 @@ impl TypeContext {
}, },
(&Value(ref name), ref _anno) => { (&Value(ref name), ref _anno) => {
self.lookup(name) self.lookup(name)
.map(|entry| entry.type_var) .map(|entry| entry.ty)
.ok_or(format!("Couldn't find {}", name))? .ok_or(format!("Couldn't find {}", name))?
}, },
(&BinExp(ref op, box ref lhs, box ref rhs), ref _anno) => { (&BinExp(ref op, box ref lhs, box ref rhs), ref _anno) => {