Implement basic env-based normalization for Value-based TyExpr

1 files changed, 12 insertions, 2 deletions

diff --git a/dhall/src/tests.rs b/dhall/src/tests.rs
index 7795d17..4928c51 100644
--- a/dhall/src/tests.rs
+++ b/dhall/src/tests.rs
@@ -206,11 +206,21 @@ pub fn run_test(test: Test<'_>) -> Result<()> {
             }
         }
         Normalization(expr_file_path, expected_file_path) => {
+            // let expr = parse_file_str(&expr_file_path)?
+            //     .resolve()?
+            //     .typecheck()?
+            //     .normalize()
+            //     .to_expr();
             let expr = parse_file_str(&expr_file_path)?
                 .resolve()?
                 .typecheck()?
-                .normalize()
-                .to_expr();
+                .to_value()
+                .to_tyexpr_noenv()
+                .normalize_whnf_noenv()
+                .to_expr(crate::semantics::phase::ToExprOptions {
+                    alpha: false,
+                    normalize: true,
+                });
             // let expr = parse_file_str(&expr_file_path)?.resolve()?.to_expr();
             // let expr = crate::semantics::nze::nzexpr::typecheck(expr)?
             //     .normalize()