c350e29 · typeable/aeson

git.iko.soy/typeable/aeson

Rework objectValues to use commaSeparated

This gives us a further 10% performance improvement when parsing object-heavy inputs, e.g. json-data/twitter100.json (gh-134).

commitc350e29bc83a25501e62a80dd234b57d18ef2f83 authorBryan O'Sullivan <bos@serpentine.com> dateTue 26 Nov 2013, 14:51 (13 years ago) parent9b7824d

1 file changed+4−3

unifiedsplit

Data/Aeson/Parser/Internal.hs+4−3

@@ -106,8 +106,7 @@ objectValues str val = do

106106 a <- str <* skipSpace

107107 b <- char ':' *> skipSpace *> val

108108 return (a,b)

109− vals <- ((pair <* skipSpace) `sepBy` (char ',' *> skipSpace)) <* char '}'

110− return (H.fromList vals)

109+ H.fromList <$> commaSeparated pair closeCurly

111110{-# INLINE objectValues #-}

112111

113112array_ :: Parser Value

@@ -179,12 +178,14 @@ value' = most <|> num

179178 !n <- rational

180179 return (Number n)

181180

182−backslash, closeSquare, comma, doubleQuote :: Word8

181+backslash, closeCurly, closeSquare, comma, doubleQuote :: Word8

183182backslash = 92

183+closeCurly = 125

184184closeSquare = 93

185185comma = 44

186186doubleQuote = 34

187187{-# INLINE backslash #-}

188+{-# INLINE closeCurly #-}

188189{-# INLINE closeSquare #-}

189190{-# INLINE comma #-}

190191{-# INLINE doubleQuote #-}