aboutsummaryrefslogtreecommitdiff
path: root/src/type/check.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/type/check.rs')
-rw-r--r--src/type/check.rs24
1 files changed, 13 insertions, 11 deletions
diff --git a/src/type/check.rs b/src/type/check.rs
index 91ca422..e536ce7 100644
--- a/src/type/check.rs
+++ b/src/type/check.rs
@@ -163,11 +163,7 @@ impl SExp {
/// };
/// ```
pub fn type_check(&self) -> Result<Type, TypeError> {
- let ty = self.infer_type(HashMap::new())?;
- match ty.is_concrete() {
- Ok(()) => Ok(ty),
- Err(s) => Err(UnboundGeneric(ty, s)),
- }
+ self.infer_type(HashMap::new())
}
@@ -198,7 +194,6 @@ impl SExp {
List(vec![VecType, vecof(vt("T"))])
)),
Atom(Let) => Ok(LetType),
- Atom(Print) => Ok(arr(vt("_"), arr(vt("T"), vt("T")))),
SCons(op, l) => {
@@ -303,11 +298,10 @@ impl Type {
restype = restype.subst(&name, &ty);
}
- //match restype.is_concrete() {
- // Ok(()) => Ok(arr(argtype.clone(), restype)),
- // Err(unbound) => Err(UnboundGeneric(unbound)),
- //}
- Ok(arr(argtype.clone(), restype))
+ match restype.is_concrete() {
+ Ok(()) => Ok(arr(argtype.clone(), restype)),
+ Err(unbound) => Err(UnboundGeneric(unbound)),
+ }
},
_ => Err(OtherError)
}
@@ -385,6 +379,14 @@ mod tests {
use super::{*, TypeError};
#[test]
+ fn test_failing_infer_generics() {
+ assert_eq!(
+ arr(Integer, VarType("X".to_string())).infer_generics(&Integer),
+ Err(TypeError::UnboundGeneric(String::from("X")))
+ );
+ }
+
+ #[test]
fn test_infer_generics() {
// Simple identity function, really all we