diff options
| author | Nadrieril | 2020-11-03 23:31:37 +0000 |
|---|---|---|
| committer | GitHub | 2020-11-03 23:31:37 +0000 |
| commit | 51b40c6e36a0aad28ffb44debf84cba4c7028680 (patch) | |
| tree | 4585a98c7ef97a3b3afa1934a9d184cfb89040d1 /dhall/src/semantics/tck | |
| parent | 71c8e889610b8b9bb6155c20ca91bac4ebc9daee (diff) | |
| parent | ecc5242463308c16f38dbd5015b9f264f990b76a (diff) | |
Merge pull request #196 from Nadrieril/allow-mutation-in-normalization
Diffstat (limited to 'dhall/src/semantics/tck')
| -rw-r--r-- | dhall/src/semantics/tck/tir.rs | 3 | ||||
| -rw-r--r-- | dhall/src/semantics/tck/typecheck.rs | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/dhall/src/semantics/tck/tir.rs b/dhall/src/semantics/tck/tir.rs index ec15a1f..f34802c 100644 --- a/dhall/src/semantics/tck/tir.rs +++ b/dhall/src/semantics/tck/tir.rs @@ -117,6 +117,9 @@ impl<'hir> Tir<'hir> { pub fn ty(&self) -> &Type { &self.ty } + pub fn into_ty(self) -> Type { + self.ty + } pub fn to_hir(&self) -> Hir { self.as_hir().clone() diff --git a/dhall/src/semantics/tck/typecheck.rs b/dhall/src/semantics/tck/typecheck.rs index d21c7ce..498bd76 100644 --- a/dhall/src/semantics/tck/typecheck.rs +++ b/dhall/src/semantics/tck/typecheck.rs @@ -35,7 +35,7 @@ fn type_one_layer( ) -> Result<Type, TypeError> { let span_err = |msg: &str| mk_span_err(span.clone(), msg); - Ok(match &ekind { + Ok(match ekind { ExprKind::Import(..) => { unreachable!("This case should have been handled in resolution") } @@ -57,7 +57,7 @@ fn type_one_layer( NumKind::Double(_) => Builtin::Double, }), ExprKind::Builtin(b) => { - let t_hir = type_of_builtin(*b); + let t_hir = type_of_builtin(b); typecheck(&t_hir)?.eval_to_type(env)? } ExprKind::TextLit(interpolated) => { |