@@ -102,8 +102,8 @@ reparse p s = case parse p s `feed` "" of
102 _ -> fail "unexpected failure"
102 _ -> fail "unexpected failure"
104unescape :: Parser ByteString
104unescape :: Parser ByteString
105−unescape = toByteString <$> go (Right mempty) where
105+unescape = toByteString <$> go mempty where
106− go (Right acc) = do
106+ go acc = do
107 h <- A.takeWhile (/=backslash)
107 h <- A.takeWhile (/=backslash)
108 let rest = do
108 let rest = do
109 start <- A.take 2
109 start <- A.take 2
@@ -113,9 +113,9 @@ unescape = toByteString <$> go (Right mempty) where
113 Just i -> i
113 Just i -> i
115 if slash /= backslash || escape == 255
115 if slash /= backslash || escape == 255
116− then go (Left "invalid JSON escape sequence")
116+ then fail "invalid JSON escape sequence"
117− else flip (<|>) (go (Left "invalid Unicode escape sequence")) $ do
117+ else do
118− let cont m = go (Right (acc `mappend` fromByteString h `mappend` m))
118+ let cont m = go (acc `mappend` fromByteString h `mappend` m)
119 {-# INLINE cont #-}
119 {-# INLINE cont #-}
120 if t /= 117 -- 'u'
120 if t /= 117 -- 'u'
121 then cont (fromWord8 (B.unsafeIndex mapping escape))
121 then cont (fromWord8 (B.unsafeIndex mapping escape))
@@ -130,8 +130,10 @@ unescape = toByteString <$> go (Right mempty) where
130 (b - 0xdc00) + 0x10000
130 (b - 0xdc00) + 0x10000
131 in cont (fromChar (chr c))
131 in cont (fromChar (chr c))
132 else fail "invalid UTF-16 surrogates"
132 else fail "invalid UTF-16 surrogates"
133− rest <|> return (acc `mappend` fromByteString h)
135+ then return (acc `mappend` fromByteString h)
134− go (Left err) = fail err
136+ else rest
135 mapping = "\"\\/\n\t\b\r\f"
137 mapping = "\"\\/\n\t\b\r\f"
137hexQuad :: Parser Int
139hexQuad :: Parser Int