From c448698f797f2304dca0e0b8b833959de00ca079 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Mon, 20 Jan 2020 15:27:19 +0000
Subject: Reimplement basic tck/nze with proper environments

Inspired from dhall_haskell
---
 dhall/src/tests.rs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'dhall/src/tests.rs')

diff --git a/dhall/src/tests.rs b/dhall/src/tests.rs
index f1648cf..d86574a 100644
--- a/dhall/src/tests.rs
+++ b/dhall/src/tests.rs
@@ -158,9 +158,12 @@ pub fn run_test(test: Test<'_>) -> Result<()> {
             parse_file_str(&file_path)?.resolve().unwrap_err();
         }
         TypeInferenceSuccess(expr_file_path, expected_file_path) => {
-            let expr =
-                parse_file_str(&expr_file_path)?.resolve()?.typecheck()?;
-            let ty = expr.get_type()?.to_expr();
+            // let expr =
+            //     parse_file_str(&expr_file_path)?.resolve()?.typecheck()?;
+            // let ty = expr.get_type()?.to_expr();
+            let expr = parse_file_str(&expr_file_path)?.resolve()?.to_expr();
+            let tyexpr = crate::semantics::nze::nzexpr::typecheck(expr)?;
+            let ty = tyexpr.get_type()?.to_expr();
             let expected = parse_file_str(&expected_file_path)?.to_expr();
             assert_eq_display!(ty, expected);
         }
@@ -203,9 +206,13 @@ pub fn run_test(test: Test<'_>) -> Result<()> {
             }
         }
         Normalization(expr_file_path, expected_file_path) => {
-            let expr = parse_file_str(&expr_file_path)?
-                .resolve()?
-                .typecheck()?
+            // let expr = parse_file_str(&expr_file_path)?
+            //     .resolve()?
+            //     .typecheck()?
+            //     .normalize()
+            //     .to_expr();
+            let expr = parse_file_str(&expr_file_path)?.resolve()?.to_expr();
+            let expr = crate::semantics::nze::nzexpr::typecheck(expr)?
                 .normalize()
                 .to_expr();
             let expected = parse_file_str(&expected_file_path)?.to_expr();
-- 
cgit v1.2.3