diff options
Diffstat (limited to 'src/Data/JLD/Expansion.hs')
-rw-r--r-- | src/Data/JLD/Expansion.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Data/JLD/Expansion.hs b/src/Data/JLD/Expansion.hs index ff2d9c3..79a992d 100644 --- a/src/Data/JLD/Expansion.hs +++ b/src/Data/JLD/Expansion.hs | |||
@@ -24,7 +24,6 @@ import Data.JLD.Util ( | |||
24 | valueContains, | 24 | valueContains, |
25 | valueIsEmptyArray, | 25 | valueIsEmptyArray, |
26 | valueIsNotArray, | 26 | valueIsNotArray, |
27 | valueIsNotNull, | ||
28 | valueIsNotString, | 27 | valueIsNotString, |
29 | valueIsScalar, | 28 | valueIsScalar, |
30 | valueIsString, | 29 | valueIsString, |
@@ -760,7 +759,7 @@ expandObject maybePropertyContext value = do | |||
760 | -- 16. | 759 | -- 16. |
761 | | Just resultType <- KM.lookup (show KeywordType) result -> | 760 | | Just resultType <- KM.lookup (show KeywordType) result -> |
762 | eoNormalizeObject | 761 | eoNormalizeObject |
763 | <| if valueIsNotArray resultType && valueIsNotNull resultType | 762 | <| if valueIsNotArray resultType && resultType /= Null |
764 | then KM.insert (show KeywordType) (Array <| V.singleton resultType) result | 763 | then KM.insert (show KeywordType) (Array <| V.singleton resultType) result |
765 | else result | 764 | else result |
766 | -- 17. | 765 | -- 17. |
@@ -797,7 +796,7 @@ expandArrayItem item = do | |||
797 | 796 | ||
798 | case item'' of | 797 | case item'' of |
799 | -- 5.2.3. | 798 | -- 5.2.3. |
800 | Array a -> pure <| V.filter valueIsNotNull a | 799 | Array a -> pure <| V.filter (/= Null) a |
801 | Null -> pure mempty | 800 | Null -> pure mempty |
802 | _ -> pure <| V.singleton item'' | 801 | _ -> pure <| V.singleton item'' |
803 | 802 | ||