From 6d951491be0093f7568462a3139115cdab6766ed Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Sun, 12 Jan 2020 07:19:28 +0100 Subject: Replace Parser.manyNE with NonEmpty.some --- src/Language/GraphQL/AST/Parser.hs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/Language') diff --git a/src/Language/GraphQL/AST/Parser.hs b/src/Language/GraphQL/AST/Parser.hs index 113b0a4..8268687 100644 --- a/src/Language/GraphQL/AST/Parser.hs +++ b/src/Language/GraphQL/AST/Parser.hs @@ -7,7 +7,7 @@ module Language.GraphQL.AST.Parser ) where import Control.Applicative (Alternative(..), optional) -import Data.List.NonEmpty (NonEmpty(..)) +import qualified Control.Applicative.Combinators.NonEmpty as NonEmpty import Language.GraphQL.AST import qualified Language.GraphQL.AST.Document as Document import Language.GraphQL.AST.Lexer @@ -17,7 +17,7 @@ import Text.Megaparsec (lookAhead, option, try, ()) document :: Parser Document.Document document = unicodeBOM >> spaceConsumer - >> lexeme (manyNE $ Document.ExecutableDefinition <$> definition) + >> lexeme (NonEmpty.some $ Document.ExecutableDefinition <$> definition) definition :: Parser ExecutableDefinition definition = DefinitionOperation <$> operationDefinition @@ -44,7 +44,7 @@ operationType = Query <$ symbol "query" -- * SelectionSet selectionSet :: Parser SelectionSet -selectionSet = braces $ manyNE selection +selectionSet = braces $ NonEmpty.some selection selectionSetOpt :: Parser SelectionSetOpt selectionSetOpt = braces $ some selection @@ -186,6 +186,3 @@ but :: Parser a -> Parser () but pn = False <$ lookAhead pn <|> pure True >>= \case False -> empty True -> pure () - -manyNE :: Alternative f => f a -> f (NonEmpty a) -manyNE p = (:|) <$> p <*> many p -- cgit v1.2.3