Implementation of toMap #1041
Implementation of toMap #1041
Conversation
|
Could you please remove the unrelated changes you accidentally included in the PR? That would make merging much easier. In particular, why did you add the edit: Never mind, the commit history tells the story here. |
This reverts commit b5bdbab.
…to blamario-master
|
@blamario: If you merge blamario#1 into your branch then this should be ready to merge |
I have merged it, but |
Did you |
That was it, thanks! All tests are passing now. |
|
@blamario: Thank you so much for all the work you put into this! 🙂 |
| @@ -527,6 +528,15 @@ eval !env t = | |||
| | Just f <- Dhall.Map.lookup k m -> maybe f (vApp f) mt | |||
| | otherwise -> error errorMsg | |||
| (x, y, ma) -> VMerge x y ma | |||
| ToMap x ma -> case (evalE x, evalE <$> ma) of | |||
| (VRecordLit m, Just (VList t)) | null m -> | |||
| VListLit (Just t) (Dhall.Map.foldMapWithKey entry m) | |||
There was a problem hiding this comment.
Since we know that m is empty:
| VListLit (Just t) (Dhall.Map.foldMapWithKey entry m) | |
| VListLit (Just t) Data.Sequence.empty |
| (VRecordLit m, Just (VList t)) | null m -> | ||
| VListLit (Just t) (Dhall.Map.foldMapWithKey entry m) | ||
| (VRecordLit m, _) -> | ||
| VListLit Nothing (Dhall.Map.foldMapWithKey entry m) |
There was a problem hiding this comment.
mconcatting a singleton for each element seems fairly inefficient to me. I suspect it would be better to do something like
Data.Sequence.fromList . ... . Dhall.Map.toList
| ) | ||
| ) | ||
|
|
||
| let keyValues = Dhall.Map.foldMapWithKey entry kvsX |
…addressing my own comments on #1041.
…addressing my own comments on #1041.
I believe I'm done. A dhall-lang PR with tests will follow.