Move AST to AST.Document

2019-12-28 07:07:58 +01:00
parent 78ee76f9d5
commit fdf5914626
7 changed files with 232 additions and 188 deletions
--- a/src/Language/GraphQL/AST/Parser.hs
+++ b/src/Language/GraphQL/AST/Parser.hs
@ -25,13 +25,16 @@ definition = DefinitionOperation <$> operationDefinition
         <?> "definition error!"

 operationDefinition :: Parser OperationDefinition
-operationDefinition = OperationSelectionSet <$> selectionSet
-                  <|> OperationDefinition   <$> operationType
-                                            <*> optional name
-                                            <*> opt variableDefinitions
-                                            <*> opt directives
-                                            <*> selectionSet
-                  <?> "operationDefinition error"
+operationDefinition = SelectionSet <$> selectionSet
+    <|> operationDefinition'
+    <?> "operationDefinition error"
+  where
+    operationDefinition'
+        = OperationDefinition <$> operationType
+        <*> optional name
+        <*> opt variableDefinitions
+        <*> opt directives
+        <*> selectionSet

 operationType :: Parser OperationType
 operationType = Query <$ symbol "query"