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

Move some code around

Browse Source
This commit is contained in:
greg 2018-02-08 01:15:27 -08:00
parent 8bd399f97a
commit 21511f5120
1 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/schala_lang/type_check.rs
View File

@ -84,49 +84,47 @@ impl TypeContext {
for statement in ast.0.iter() { for statement in ast.0.iter() {
match *statement { match *statement {
Statement::ExpressionStatement(_) => (), Statement::ExpressionStatement(_) => (),
Statement::Declaration(ref decl) => { Statement::Declaration(ref decl) => match *decl {
match *decl { FuncSig(_) => (),
FuncSig(_) => (), 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, ty) = 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 ty = TConst(UserT(type_constructor.clone()));
let ty = TConst(UserT(type_constructor.clone())); (spec, ty)
(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 ty = TFunc(Box::new(type_arg), Box::new(TConst(UserT(type_constructor.clone()))));
let ty = TFunc(Box::new(type_arg), Box::new(TConst(UserT(type_constructor.clone())))); (spec, ty)
(spec, ty)
}, },
&Variant::Record(_, _) => unimplemented!(), &Variant::Record(_, _) => unimplemented!(),
}; };
let entry = TypeContextEntry { ty, constant: true };
self.symbol_table.insert(spec, entry);
}
},
TypeAlias { .. } => (),
Binding {ref name, ref constant, ref expr} => {
let spec = PathSpecifier(name.clone());
let ty = expr.1.as_ref()
.map(|ty| self.from_anno(ty))
.unwrap_or_else(|| { self.alloc_existential_type() }); // this call to alloc_existential is OK b/c a binding only ever has one type, so if the annotation is absent, it's fine to just make one de novo
let entry = TypeContextEntry { ty, constant: *constant };
self.symbol_table.insert(spec, entry);
},
FuncDecl(ref signature, _) => {
let spec = PathSpecifier(signature.name.clone());
let ty = self.from_signature(signature);
let entry = TypeContextEntry { ty, constant: true }; let entry = TypeContextEntry { ty, constant: true };
self.symbol_table.insert(spec, entry); self.symbol_table.insert(spec, entry);
}, }
} },
TypeAlias { .. } => (),
Binding {ref name, ref constant, ref expr} => {
let spec = PathSpecifier(name.clone());
let ty = expr.1.as_ref()
.map(|ty| self.from_anno(ty))
.unwrap_or_else(|| { self.alloc_existential_type() }); // this call to alloc_existential is OK b/c a binding only ever has one type, so if the annotation is absent, it's fine to just make one de novo
let entry = TypeContextEntry { ty, constant: *constant };
self.symbol_table.insert(spec, entry);
},
FuncDecl(ref signature, _) => {
let spec = PathSpecifier(signature.name.clone());
let ty = self.from_signature(signature);
let entry = TypeContextEntry { ty, constant: true };
self.symbol_table.insert(spec, entry);
},
} }
} }
} }