From aec80599f161096b68cac88ffb8852a61b62fcfa Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Sun, 19 Jan 2020 18:30:13 +0000
Subject: Restore more types in value_to_tyexpr

---
 dhall/src/semantics/phase/normalize.rs | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'dhall/src/semantics/phase')

diff --git a/dhall/src/semantics/phase/normalize.rs b/dhall/src/semantics/phase/normalize.rs
index 541a196..f0a6a8c 100644
--- a/dhall/src/semantics/phase/normalize.rs
+++ b/dhall/src/semantics/phase/normalize.rs
@@ -374,9 +374,13 @@ pub(crate) fn apply_any(f: Value, a: Value, ty: &Value) -> ValueKind<Value> {
             let args = args.iter().cloned().chain(once(a.clone())).collect();
             apply_builtin(*b, args, ty)
         }
-        ValueKind::UnionConstructor(l, kts) => {
-            ValueKind::UnionLit(l.clone(), a, kts.clone())
-        }
+        ValueKind::UnionConstructor(l, kts, uniont) => ValueKind::UnionLit(
+            l.clone(),
+            a,
+            kts.clone(),
+            uniont.clone(),
+            f.get_type().unwrap(),
+        ),
         _ => {
             drop(f_borrow);
             ValueKind::PartialExpr(ExprKind::App(f, a))
@@ -692,9 +696,11 @@ pub(crate) fn normalize_one_layer(
                         Ret::Expr(expr)
                     }
                 },
-                UnionType(kts) => {
-                    Ret::ValueKind(UnionConstructor(l.clone(), kts.clone()))
-                }
+                UnionType(kts) => Ret::ValueKind(UnionConstructor(
+                    l.clone(),
+                    kts.clone(),
+                    v.get_type().unwrap(),
+                )),
                 _ => {
                     drop(v_borrow);
                     Ret::Expr(expr)
@@ -710,7 +716,8 @@ pub(crate) fn normalize_one_layer(
             let handlers_borrow = handlers.as_whnf();
             let variant_borrow = variant.as_whnf();
             match (&*handlers_borrow, &*variant_borrow) {
-                (RecordLit(kvs), UnionConstructor(l, _)) => match kvs.get(l) {
+                (RecordLit(kvs), UnionConstructor(l, _, _)) => match kvs.get(l)
+                {
                     Some(h) => Ret::Value(h.clone()),
                     None => {
                         drop(handlers_borrow);
@@ -718,7 +725,7 @@ pub(crate) fn normalize_one_layer(
                         Ret::Expr(expr)
                     }
                 },
-                (RecordLit(kvs), UnionLit(l, v, _)) => match kvs.get(l) {
+                (RecordLit(kvs), UnionLit(l, v, _, _, _)) => match kvs.get(l) {
                     Some(h) => Ret::Value(h.app(v.clone())),
                     None => {
                         drop(handlers_borrow);
-- 
cgit v1.2.3