diff options
| author | Danny Navarro <j@dannynavarro.net> | 2016-12-12 16:42:18 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-12 16:42:18 -0300 |
| commit | 5dc922202593b572a359019f129d1642350ee45d (patch) | |
| tree | e29701fb022d8defc91b5b6e29e419455c6f479a | |
| parent | 61f0a06096cc05ebc008db7e4647390f9a066a44 (diff) | |
| parent | 87c92e9d6eed3cf7a45f9df8da45c3a5689d28e1 (diff) | |
| download | graphql-5dc922202593b572a359019f129d1642350ee45d.tar.gz | |
Merge pull request #16 from teh/master
Parse number as scientific and interpret meaning separately.
| -rw-r--r-- | Data/GraphQL/Parser.hs | 16 | ||||
| -rw-r--r-- | graphql.cabal | 3 |
2 files changed, 12 insertions, 7 deletions
diff --git a/Data/GraphQL/Parser.hs b/Data/GraphQL/Parser.hs index 2de09b0..26902d4 100644 --- a/Data/GraphQL/Parser.hs +++ b/Data/GraphQL/Parser.hs @@ -8,14 +8,14 @@ import Control.Applicative ((<|>), empty, many, optional) import Control.Monad (when) import Data.Char (isDigit, isSpace) import Data.Foldable (traverse_) +import Data.Scientific (floatingOrInteger) import Data.Text (Text, append) import Data.Attoparsec.Text ( Parser , (<?>) , anyChar - , decimal - , double + , scientific , endOfLine , inClass , many1 @@ -23,7 +23,6 @@ import Data.Attoparsec.Text , option , peekChar , sepBy1 - , signed , takeWhile , takeWhile1 ) @@ -149,9 +148,7 @@ typeCondition = namedType -- explicit types use the `typedValue` parser. value :: Parser Value value = ValueVariable <$> variable - -- TODO: Handle maxBound, Int32 in spec. - <|> ValueInt <$> tok (signed decimal) - <|> ValueFloat <$> tok (signed double) + <|> number <|> ValueBoolean <$> booleanValue <|> ValueString <$> stringValue -- `true` and `false` have been tried before @@ -159,6 +156,13 @@ value = ValueVariable <$> variable <|> ValueList <$> listValue <|> ValueObject <$> objectValue <?> "value error!" + where + number = do + v <- scientific + case floatingOrInteger v of + Left r -> pure (ValueFloat r) + -- TODO: Handle maxBound, Int32 in spec. + Right i -> pure (ValueInt i) booleanValue :: Parser Bool booleanValue = True <$ tok "true" diff --git a/graphql.cabal b/graphql.cabal index b73e259..d330abd 100644 --- a/graphql.cabal +++ b/graphql.cabal @@ -34,7 +34,8 @@ library attoparsec >= 0.10.4.0, base >= 4.7 && < 5, text >= 0.11.3.1, - unordered-containers >= 0.2.5.0 + unordered-containers >= 0.2.5.0, + scientific >=0.3.1 && <0.4 if impl(ghc >= 8.0) ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances else |