From fa6de4c077ab4f1c28d2ec64a33a3be8c5a9bb1c Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Sun, 22 Dec 2019 18:24:21 +0000
Subject: Update dhall-lang submodule

---
 dhall/src/semantics/phase/typecheck.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'dhall/src/semantics/phase/typecheck.rs')

diff --git a/dhall/src/semantics/phase/typecheck.rs b/dhall/src/semantics/phase/typecheck.rs
index c439f74..856f5c3 100644
--- a/dhall/src/semantics/phase/typecheck.rs
+++ b/dhall/src/semantics/phase/typecheck.rs
@@ -774,7 +774,15 @@ fn type_last_layer(
             for l in labels {
                 match kts.get(l) {
                     None => return mkerr(ProjectionMissingEntry),
-                    Some(t) => new_kts.insert(l.clone(), t.clone()),
+                    Some(t) => {
+                        use std::collections::hash_map::Entry;
+                        match new_kts.entry(l.clone()) {
+                            Entry::Occupied(_) => {
+                                return mkerr(ProjectionDuplicateField)
+                            }
+                            Entry::Vacant(e) => e.insert(t.clone()),
+                        }
+                    }
                 };
             }
 
-- 
cgit v1.2.3


From e294450e1e76491e96019b8a3695463e09d1739b Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Sun, 22 Dec 2019 19:02:18 +0000
Subject: Implement parsing for record completion

---
 dhall/src/semantics/phase/typecheck.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'dhall/src/semantics/phase/typecheck.rs')

diff --git a/dhall/src/semantics/phase/typecheck.rs b/dhall/src/semantics/phase/typecheck.rs
index 856f5c3..c9834e1 100644
--- a/dhall/src/semantics/phase/typecheck.rs
+++ b/dhall/src/semantics/phase/typecheck.rs
@@ -792,6 +792,7 @@ fn type_last_layer(
             ))
         }
         ProjectionByExpr(_, _) => unimplemented!("selection by expression"),
+        Completion(_, _) => unimplemented!("record completion"),
     };
 
     Ok(match ret {
-- 
cgit v1.2.3


From 0e928ebde4ab8b662499eb716f366b97479c75fc Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Mon, 23 Dec 2019 21:59:47 +0000
Subject: Add two new Integer builtins

---
 dhall/src/semantics/phase/typecheck.rs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'dhall/src/semantics/phase/typecheck.rs')

diff --git a/dhall/src/semantics/phase/typecheck.rs b/dhall/src/semantics/phase/typecheck.rs
index c9834e1..7ea4951 100644
--- a/dhall/src/semantics/phase/typecheck.rs
+++ b/dhall/src/semantics/phase/typecheck.rs
@@ -235,6 +235,9 @@ fn type_of_builtin<E>(b: Builtin) -> Expr<E> {
 
         IntegerToDouble => make_type!(Integer -> Double),
         IntegerShow => make_type!(Integer -> Text),
+        IntegerNegate => make_type!(Integer -> Integer),
+        IntegerClamp => make_type!(Integer -> Natural),
+
         DoubleShow => make_type!(Double -> Text),
         TextShow => make_type!(Text -> Text),
 
-- 
cgit v1.2.3


From 5f52c5bda0277edd87323eb67dcda721cd18a9d3 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 24 Dec 2019 20:23:19 +0000
Subject: Extend merge to work on Optionals

---
 dhall/src/semantics/phase/typecheck.rs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'dhall/src/semantics/phase/typecheck.rs')

diff --git a/dhall/src/semantics/phase/typecheck.rs b/dhall/src/semantics/phase/typecheck.rs
index 7ea4951..97502d4 100644
--- a/dhall/src/semantics/phase/typecheck.rs
+++ b/dhall/src/semantics/phase/typecheck.rs
@@ -1,3 +1,4 @@
+use std::borrow::Cow;
 use std::cmp::max;
 use std::collections::HashMap;
 
@@ -695,8 +696,19 @@ fn type_last_layer(
             let union_type = union.get_type()?;
             let union_borrow = union_type.as_whnf();
             let variants = match &*union_borrow {
-                ValueKind::UnionType(kts) => kts,
-                _ => return mkerr(Merge2ArgMustBeUnion(union.clone())),
+                ValueKind::UnionType(kts) => Cow::Borrowed(kts),
+                ValueKind::AppliedBuiltin(syntax::Builtin::Optional, args)
+                    if args.len() == 1 =>
+                {
+                    let ty = &args[0];
+                    let mut kts = HashMap::new();
+                    kts.insert("None".into(), None);
+                    kts.insert("Some".into(), Some(ty.clone()));
+                    Cow::Owned(kts)
+                }
+                _ => {
+                    return mkerr(Merge2ArgMustBeUnionOrOptional(union.clone()))
+                }
             };
 
             let mut inferred_type = None;
-- 
cgit v1.2.3