diff options
author | Nadrieril | 2020-01-20 15:27:19 +0000 |
---|---|---|
committer | Nadrieril | 2020-01-20 15:27:19 +0000 |
commit | c448698f797f2304dca0e0b8b833959de00ca079 (patch) | |
tree | f5a292aa4aa53f95b1b058a65df48b201ee969d3 /dhall/src/tests.rs | |
parent | aec80599f161096b68cac88ffb8852a61b62fcfa (diff) |
Reimplement basic tck/nze with proper environments
Inspired from dhall_haskell
Diffstat (limited to 'dhall/src/tests.rs')
-rw-r--r-- | dhall/src/tests.rs | 19 |
1 files changed, 13 insertions, 6 deletions
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(); |