Merge pull request #567 from phadej/export-jsstring-scientific

Export jstring_ and scientific parsers

Author: bergmark

Data/Aeson/Parser.hs

@@ -33,6 +33,7 @@ module Data.Aeson.Parser
       json
     , value
     , jstring
+    , scientific
     -- * Strict parsers
     -- $strict
     , json'
@@ -46,7 +47,7 @@ module Data.Aeson.Parser
 
 import Prelude ()
 
-import Data.Aeson.Parser.Internal (decodeStrictWith, decodeWith, eitherDecodeStrictWith, eitherDecodeWith, json, json', jstring, value, value')
+import Data.Aeson.Parser.Internal (decodeStrictWith, decodeWith, eitherDecodeStrictWith, eitherDecodeWith, json, json', jstring, scientific, value, value')
 
 -- $lazy
 --

Data/Aeson/Parser/Internal.hs

@@ -23,6 +23,8 @@ module Data.Aeson.Parser.Internal
       json, jsonEOF
     , value
     , jstring
+    , jstring_
+    , scientific
     -- * Strict parsers
     , json', jsonEOF'
     , value'
@@ -334,7 +336,7 @@ decimal0 = do
     then fail "leading zero"
     else return (B.foldl' step 0 digits)
 
-{-# INLINE scientific #-}
+-- | Parse a JSON number.
 scientific :: Parser Scientific
 scientific = do
   let minus = 45
@@ -364,3 +366,4 @@ scientific = do
   (A.satisfy (\ex -> ex == littleE || ex == bigE) *>
       fmap (Sci.scientific signedCoeff . (e +)) (signed decimal)) <|>
     return (Sci.scientific signedCoeff    e)
+{-# INLINE scientific #-}

aeson.cabal

@@ -93,6 +93,7 @@ library
     Data.Aeson.Encoding.Internal
     Data.Aeson.Internal
     Data.Aeson.Internal.Time
+    Data.Aeson.Parser.Internal
 
   -- Deprecated modules
   exposed-modules:
@@ -101,7 +102,6 @@ library
   other-modules:
     Data.Aeson.Encoding.Builder
     Data.Aeson.Internal.Functions
-    Data.Aeson.Parser.Internal
     Data.Aeson.Parser.Unescape
     Data.Aeson.Parser.Time
     Data.Aeson.Types.FromJSON