diff options
| author | Basile Henry | 2020-11-27 23:08:14 +0100 |
|---|---|---|
| committer | Basile Henry | 2020-11-27 23:08:50 +0100 |
| commit | 711ad900153aedb7b35896c0705c932972edded2 (patch) | |
| tree | f0ec889d5028b8d2e95ebf1e183da4271d243f36 | |
| parent | 8be3891b1e30f61b1f38b96e1ed200f367066032 (diff) | |
If can return a type
3 files changed, 4 insertions, 10 deletions
diff --git a/dhall/src/operations/typecheck.rs b/dhall/src/operations/typecheck.rs index 3016fea..bc0e864 100644 --- a/dhall/src/operations/typecheck.rs +++ b/dhall/src/operations/typecheck.rs @@ -350,8 +350,8 @@ pub fn typecheck_operation( if *x.ty().kind() != NirKind::from_builtin(Builtin::Bool) { return span_err("InvalidPredicate"); } - if y.ty().ty().as_const() != Some(Const::Type) { - return span_err("IfBranchMustBeTerm"); + if y.ty().ty().as_const().is_none() { + return span_err("IfBranchMustBeTermTypeOrKind"); } if y.ty() != z.ty() { return span_err("IfBranchMismatch"); diff --git a/dhall/tests/type-inference/failure/unit/IfBranchesNotTermTypeOrKind.txt b/dhall/tests/type-inference/failure/unit/IfBranchesNotTermTypeOrKind.txt index 8b46d1f..4023128 100644 --- a/dhall/tests/type-inference/failure/unit/IfBranchesNotTermTypeOrKind.txt +++ b/dhall/tests/type-inference/failure/unit/IfBranchesNotTermTypeOrKind.txt @@ -1,6 +1,6 @@ -Type error: error: IfBranchMustBeTerm +Type error: error: IfBranchMustBeTermTypeOrKind --> <current file>:1:1 | 1 | if True then Kind else Kind - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ IfBranchMustBeTerm + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ IfBranchMustBeTermTypeOrKind | diff --git a/dhall/tests/type-inference/failure/unit/IfBranchesNotType.txt b/dhall/tests/type-inference/failure/unit/IfBranchesNotType.txt deleted file mode 100644 index 4c9ec28..0000000 --- a/dhall/tests/type-inference/failure/unit/IfBranchesNotType.txt +++ /dev/null @@ -1,6 +0,0 @@ -Type error: error: IfBranchMustBeTerm - --> <current file>:1:1 - | -1 | if True then Type else Type - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ IfBranchMustBeTerm - | |