Refactor a bit

dhall-lang · Aug 9, 2019 · 9d2b3cb · 9d2b3cb
1 parent 74e281d
commit 9d2b3cb
Showing 1 changed file with 8 additions and 15 deletions.
diff --git a/dhall-json/src/Dhall/JSON.hs b/dhall-json/src/Dhall/JSON.hs
@@ -447,24 +447,17 @@ dhallToJSON e0 = loop (Core.alphaNormalize (Core.normalize e0))
                     )
                  ] | isInlineNesting nesting
                    , Just (alternativeName, mExpr) <- getContents contents -> do
-                       let name = Core.TextLit (Core.Chunks [] alternativeName)
-
-                       kvs <- case mExpr of
-                           Just (Core.RecordLit kvs) ->
-                               return
-                                   (Dhall.Map.insert
-                                      field
-                                      name
-                                      kvs)
+                       kvs0 <- case mExpr of
+                           Just (Core.RecordLit kvs) -> return kvs
                            Just alternativeContents ->
                                Left (InvalidInlineContents e alternativeContents)
-                           Nothing ->
-                               return
-                                   (Dhall.Map.singleton
-                                       field
-                                       name)
+                           Nothing -> return mempty
+
+                       let name = Core.TextLit (Core.Chunks [] alternativeName)
+
+                       let kvs1 = Dhall.Map.insert field name kvs0
 
-                       loop (Core.RecordLit kvs)
+                       loop (Core.RecordLit kvs1)
 
                 _ -> do
                     a' <- traverse loop a