Skip to content

unify Combine and CombineTypes #2651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 30 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b66de13
wip add the functionality of CombineTypes to Combine
winitzki Mar 13, 2025
e07a39e
wip
winitzki Mar 13, 2025
068d623
pretty-print //\\ as /\ now globlly
winitzki Mar 13, 2025
bb59a38
typechecking of record type /\ record type
winitzki Mar 13, 2025
f7c03e3
undo the formatting change because tests fail
winitzki Mar 14, 2025
d21abae
implement /\ reduction for record types
winitzki Mar 14, 2025
be4ea39
fix isNormalized
winitzki Mar 14, 2025
11a7b3c
add comment
winitzki Mar 17, 2025
8050d24
remove wrong import
winitzki Mar 17, 2025
8fe9623
refactor code for clarity
winitzki Mar 20, 2025
e7b55f0
Merge branch 'main' into feature/unify-Combine-and-CombineTypes
winitzki May 5, 2025
20dfebd
bump ci
winitzki May 7, 2025
5933b6a
bump ci
winitzki May 7, 2025
79d0da8
Merge branch 'main' into feature/unify-Combine-and-CombineTypes
winitzki May 14, 2025
189d572
bump ci
winitzki May 15, 2025
0bcc84d
bump ci
winitzki May 16, 2025
0ecadb1
bump ci
winitzki May 16, 2025
400549e
bump ci
winitzki May 17, 2025
43a8741
bump ci
winitzki May 17, 2025
5f51a3f
bump ci
winitzki May 18, 2025
7a5bca8
Merge branch 'main' into feature/unify-Combine-and-CombineTypes
winitzki Jun 18, 2025
7864ec9
bump ci
winitzki Jun 19, 2025
d7b782c
refactor to use combineTypesCheckingForFieldCollisions outside of loo…
winitzki Jun 19, 2025
53a5a3d
minor rewrite
winitzki Jun 19, 2025
df0330c
Add a better error message for the case of /\ on record terms or types
winitzki Jun 19, 2025
aa6fd30
implement better error messages
winitzki Jun 20, 2025
c942a3d
wip adding unit tests for CombineTypes feature
winitzki Jun 20, 2025
87845fa
add unit tests for new error messages
winitzki Jun 20, 2025
9557e57
better error messages and more unit tests
winitzki Jun 21, 2025
5cfc83c
Merge branch 'main' into feature/unify-Combine-and-CombineTypes
winitzki Jul 1, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions dhall/src/Dhall/Eval.hs
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,12 @@ vCombine mk t u =
t'
(VRecordLit m, VRecordLit m') ->
VRecordLit (Map.unionWith (vCombine Nothing) m m')
(VRecord m, u') | null m ->
u'
(t', VRecord m) | null m ->
t'
(VRecord m, VRecord m') ->
VRecord (Map.unionWith (vCombine Nothing) m m')
(t', u') ->
VCombine mk t' u'

Expand Down
16 changes: 12 additions & 4 deletions dhall/src/Dhall/Normalize.hs
Original file line number Diff line number Diff line change
Expand Up @@ -548,15 +548,20 @@ normalizeWithM ctx e0 = loop (Syntax.denote e0)
kts' = traverse (traverse loop) kts
Combine cs mk x y -> decide <$> loop x <*> loop y
where
mergeFields (RecordField _ expr _ _) (RecordField _ expr' _ _) =
Syntax.makeRecordField $ decide expr expr'
decide (RecordLit m) r | Data.Foldable.null m =
r
decide l (RecordLit n) | Data.Foldable.null n =
l
decide (RecordLit m) (RecordLit n) =
RecordLit (Dhall.Map.unionWith f m n)
where
f (RecordField _ expr _ _) (RecordField _ expr' _ _) =
Syntax.makeRecordField $ decide expr expr'
RecordLit (Dhall.Map.unionWith mergeFields m n)
decide (Record m) r | Data.Foldable.null m =
r
decide l (Record n) | Data.Foldable.null n =
l
decide (Record m) (Record n) =
Record (Dhall.Map.unionWith mergeFields m n)
decide l r =
Combine cs mk l r
CombineTypes cs x y -> decide <$> loop x <*> loop y
Expand Down Expand Up @@ -949,6 +954,9 @@ isNormalized e0 = loop (Syntax.denote e0)
decide (RecordLit m) _ | Data.Foldable.null m = False
decide _ (RecordLit n) | Data.Foldable.null n = False
decide (RecordLit _) (RecordLit _) = False
decide (Record m) _ | Data.Foldable.null m = False
decide _ (Record n) | Data.Foldable.null n = False
decide (Record _) (Record _) = False
decide _ _ = True
CombineTypes _ x y -> loop x && loop y && decide x y
where
Expand Down
Loading
Loading