From a53fc6e6767bba80bf1697d732d88c4a1e0e9e42 Mon Sep 17 00:00:00 2001
From: FintanH
Date: Wed, 31 Jul 2019 12:05:48 +0100
Subject: Add the typechecking of RecursiveRecordMerge.

This introduces an external function for HashMaps to perform an outer
join so that you can do a unionWith but with more power by having a new
tagert type.

Using outer_join and recursively looking through records of records we
have an implementation for combining records.
---
 dhall/src/error/mod.rs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'dhall/src/error')

diff --git a/dhall/src/error/mod.rs b/dhall/src/error/mod.rs
index 125d013..2345348 100644
--- a/dhall/src/error/mod.rs
+++ b/dhall/src/error/mod.rs
@@ -55,6 +55,7 @@ pub(crate) enum TypeMessage {
     TypeMismatch(Typed, Normalized, Typed),
     AnnotMismatch(Typed, Normalized),
     Untyped,
+    FieldCollision(Label),
     InvalidListElement(usize, Normalized, Typed),
     InvalidListType(Normalized),
     InvalidOptionalType(Normalized),
@@ -63,6 +64,7 @@ pub(crate) enum TypeMessage {
     IfBranchMustBeTerm(bool, Typed),
     InvalidFieldType(Label, Type),
     NotARecord(Label, Normalized),
+    MustCombineRecord(Typed),
     MissingRecordField(Label, Typed),
     MissingUnionField(Label, Normalized),
     BinOpTypeMismatch(BinOp, Typed),
@@ -78,6 +80,7 @@ pub(crate) enum TypeMessage {
     MergeHandlerReturnTypeMustNotBeDependent,
     ProjectionMustBeRecord,
     ProjectionMissingEntry,
+    RecordMismatch(Typed, Typed),
     Sort,
     RecordTypeDuplicateField,
     UnionTypeDuplicateField,
-- 
cgit v1.2.3