From 47d5dbcfffa7842466187197513ffa403a0fdb59 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Tue, 16 Apr 2019 22:06:01 +0200 Subject: Handle nullary union variants Closes #36 --- dhall/src/normalize.rs | 10 +++++----- dhall/src/typecheck.rs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'dhall') diff --git a/dhall/src/normalize.rs b/dhall/src/normalize.rs index fa669d8..7f56669 100644 --- a/dhall/src/normalize.rs +++ b/dhall/src/normalize.rs @@ -667,12 +667,12 @@ mod spec_tests { norm!(success_unit_True, "unit/True"); norm!(success_unit_Type, "unit/Type"); norm!(success_unit_TypeAnnotation, "unit/TypeAnnotation"); - // norm!(success_unit_UnionNormalizeAlternatives, "unit/UnionNormalizeAlternatives"); + norm!(success_unit_UnionNormalizeAlternatives, "unit/UnionNormalizeAlternatives"); norm!(success_unit_UnionNormalizeArguments, "unit/UnionNormalizeArguments"); - // norm!(success_unit_UnionProjectConstructor, "unit/UnionProjectConstructor"); - // norm!(success_unit_UnionSortAlternatives, "unit/UnionSortAlternatives"); - // norm!(success_unit_UnionType, "unit/UnionType"); + norm!(success_unit_UnionProjectConstructor, "unit/UnionProjectConstructor"); + norm!(success_unit_UnionSortAlternatives, "unit/UnionSortAlternatives"); + norm!(success_unit_UnionType, "unit/UnionType"); norm!(success_unit_UnionTypeEmpty, "unit/UnionTypeEmpty"); - // norm!(success_unit_UnionTypeNormalizeArguments, "unit/UnionTypeNormalizeArguments"); + norm!(success_unit_UnionTypeNormalizeArguments, "unit/UnionTypeNormalizeArguments"); norm!(success_unit_Variable, "unit/Variable"); } diff --git a/dhall/src/typecheck.rs b/dhall/src/typecheck.rs index d9566d0..ffa149b 100644 --- a/dhall/src/typecheck.rs +++ b/dhall/src/typecheck.rs @@ -1021,7 +1021,7 @@ mod spec_tests { // tc_success!(tc_success_simple_kindParameter, "simple/kindParameter"); // tc_success!(tc_success_simple_mergeEquivalence, "simple/mergeEquivalence"); // tc_success!(tc_success_simple_mixedFieldAccess, "simple/mixedFieldAccess"); - // tc_success!(tc_success_simple_unionsOfTypes, "simple/unionsOfTypes"); + tc_success!(tc_success_simple_unionsOfTypes, "simple/unionsOfTypes"); // tc_failure!(tc_failure_combineMixedRecords, "combineMixedRecords"); // tc_failure!(tc_failure_duplicateFields, "duplicateFields"); -- cgit v1.2.3