diff options
Diffstat (limited to 'src/type')
| -rw-r--r-- | src/type/check.rs | 4 | ||||
| -rw-r--r-- | src/type/conversion.rs | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/type/check.rs b/src/type/check.rs index 02b629c..69e9141 100644 --- a/src/type/check.rs +++ b/src/type/check.rs @@ -218,10 +218,10 @@ impl SExp { pub fn type_check(&self) -> Result<Type, TypeError> { let res = self.infer_type(HashMap::new()); match res { - Ok(res) => {println!("maybe unbound: {}", res); match res.is_concrete() { + Ok(res) => match res.is_concrete() { Ok(()) => Ok(res), Err(name) => Err(UnboundGeneric(name)), - }}, + }, e => e, } } diff --git a/src/type/conversion.rs b/src/type/conversion.rs index 5d29ba0..baeab90 100644 --- a/src/type/conversion.rs +++ b/src/type/conversion.rs @@ -94,6 +94,7 @@ impl Type { /// List(vec![Integer, Boolean]).into_type(&vecof(vt("T"))), /// Ok(vecof(vt("T"))) /// ); + /// assert_eq!(List(vec![Boolean, Integer, Integer]).into_type(&List(vec![Boolean, vt("T"), vt("T")])), Ok(List(vec![Boolean, Integer, Integer]))) /// ``` /// /// Though the conversion from (a) to a is also convenient: @@ -115,6 +116,14 @@ impl Type { (List(x), b) if x.len() == 1 && &x[0] == b => Ok(x[0].clone()), + (List(v1), List(v2)) if v1.len() == v2.len() => { + let mut res = vec![]; + for (t1, t2) in v1.into_iter().zip(v2) { + res.push(t1.clone().into_type(&t2)?); + } + Ok(List(res)) + } + (List(v), VecOf(b)) => match v.get(0) { Some(first) => { let cand = v.into_iter() |