From ebe43bd6f1fd6feb1564ab9837399de7808b67b5 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 18 Feb 2020 18:39:10 +0000
Subject: Borrow relevant Hir from Tir

---
 dhall/src/semantics/resolve/hir.rs | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'dhall/src/semantics/resolve/hir.rs')

diff --git a/dhall/src/semantics/resolve/hir.rs b/dhall/src/semantics/resolve/hir.rs
index 346abbf..d421718 100644
--- a/dhall/src/semantics/resolve/hir.rs
+++ b/dhall/src/semantics/resolve/hir.rs
@@ -48,11 +48,11 @@ impl Hir {
         self.span.clone()
     }
 
-    /// Converts a HIR expr back to the corresponding AST expression.
+    /// Converts a closed Hir expr back to the corresponding AST expression.
     pub fn to_expr(&self, opts: ToExprOptions) -> NormalizedExpr {
         hir_to_expr(self, opts, &mut NameEnv::new())
     }
-    /// Converts a HIR expr back to the corresponding AST expression.
+    /// Converts a closed Hir expr back to the corresponding AST expression.
     pub fn to_expr_noopts(&self) -> NormalizedExpr {
         let opts = ToExprOptions {
             normalize: false,
@@ -70,7 +70,10 @@ impl Hir {
     }
 
     /// Typecheck the Hir.
-    pub fn typecheck(&self, env: &TyEnv) -> Result<Tir, TypeError> {
+    pub fn typecheck<'hir>(
+        &'hir self,
+        env: &TyEnv,
+    ) -> Result<Tir<'hir>, TypeError> {
         type_with(env, self, None)
     }
 
@@ -78,6 +81,17 @@ impl Hir {
     pub fn eval(&self, env: impl Into<NzEnv>) -> Nir {
         Nir::new_thunk(env.into(), self.clone())
     }
+    /// Eval a closed Hir (i.e. without free variables). It will actually get evaluated only as
+    /// needed on demand.
+    pub fn eval_closed_expr(&self) -> Nir {
+        self.eval(NzEnv::new())
+    }
+    /// Eval a closed Hir fully and recursively;
+    pub fn rec_eval_closed_expr(&self) -> Nir {
+        let val = self.eval_closed_expr();
+        val.normalize();
+        val
+    }
 }
 
 fn hir_to_expr(
-- 
cgit v1.2.3