Merge branch 'master' into 🔥-monolithic-syntax

semantic-diff.cabal

@@ -30,9 +30,7 @@ library
                      , Data.Diff
                      , Data.Error
                      , Data.Functor.Both
-                     , Data.Functor.Classes.Eq.Generic
-                     , Data.Functor.Classes.Ord.Generic
-                     , Data.Functor.Classes.Show.Generic
+                     , Data.Functor.Classes.Generic
                      , Data.JSON.Fields
                      , Data.Language
                      , Data.Mergeable
@@ -159,7 +157,7 @@ test-suite test
   main-is:             Spec.hs
   other-modules:       Assigning.Assignment.Spec
                      , Data.Diff.Spec
-                     , Data.Functor.Classes.Ord.Generic.Spec
+                     , Data.Functor.Classes.Generic.Spec
                      , Data.Functor.Listable
                      , Data.Mergeable.Spec
                      , Data.Source.Spec

src/Data/Functor/Classes/Eq/Generic.hs

@@ -1,49 +0,0 @@
-{-# LANGUAGE TypeOperators #-}
-module Data.Functor.Classes.Eq.Generic
-( Eq1(..)
-, genericLiftEq
-) where
-
-import Data.Functor.Classes
-import GHC.Generics
-
--- | Generically-derivable lifting of the 'Eq' class to unary type constructors.
-class GEq1 f where
-  -- | Lift an equality test through the type constructor.
-  --
-  --   The function will usually be applied to an equality function, but the more general type ensures that the implementation uses it to compare elements of the first container with elements of the second.
-  gliftEq :: (a -> b -> Bool) -> f a -> f b -> Bool
-
--- | A suitable implementation of Eq1’s liftEq for Generic1 types.
-genericLiftEq :: (Generic1 f, GEq1 (Rep1 f)) => (a -> b -> Bool) -> f a -> f b -> Bool
-genericLiftEq f a b = gliftEq f (from1 a) (from1 b)
-
-
--- Generics
-
-instance GEq1 U1 where
-  gliftEq _ _ _ = True
-
-instance GEq1 Par1 where
-  gliftEq f (Par1 a) (Par1 b) = f a b
-
-instance Eq c => GEq1 (K1 i c) where
-  gliftEq _ (K1 a) (K1 b) = a == b
-
-instance Eq1 f => GEq1 (Rec1 f) where
-  gliftEq f (Rec1 a) (Rec1 b) = liftEq f a b
-
-instance GEq1 f => GEq1 (M1 i c f) where
-  gliftEq f (M1 a) (M1 b) = gliftEq f a b
-
-instance (GEq1 f, GEq1 g) => GEq1 (f :+: g) where
-  gliftEq f a b = case (a, b) of
-    (L1 a, L1 b) -> gliftEq f a b
-    (R1 a, R1 b) -> gliftEq f a b
-    _ -> False
-
-instance (GEq1 f, GEq1 g) => GEq1 (f :*: g) where
-  gliftEq f (a1 :*: b1) (a2 :*: b2) = gliftEq f a1 a2 && gliftEq f b1 b2
-
-instance (Eq1 f, GEq1 g) => GEq1 (f :.: g) where
-  gliftEq f (Comp1 a) (Comp1 b) = liftEq (gliftEq f) a b

src/Data/Functor/Classes/Generic.hs

@@ -0,0 +1,182 @@
+{-# LANGUAGE TypeOperators #-}
+module Data.Functor.Classes.Generic
+( Eq1(..)
+, genericLiftEq
+, Ord1(..)
+, genericLiftCompare
+, Show1(..)
+, GShow1Options(..)
+, defaultGShow1Options
+, genericLiftShowsPrec
+, genericLiftShowsPrecWithOptions
+) where
+
+import Data.Functor.Classes
+import Data.List (intersperse)
+import Data.Semigroup
+import GHC.Generics
+import Text.Show (showListWith)
+
+-- | Generically-derivable lifting of the 'Eq' class to unary type constructors.
+class GEq1 f where
+  -- | Lift an equality test through the type constructor.
+  --
+  --   The function will usually be applied to an equality function, but the more general type ensures that the implementation uses it to compare elements of the first container with elements of the second.
+  gliftEq :: (a -> b -> Bool) -> f a -> f b -> Bool
+
+-- | A suitable implementation of Eq1’s liftEq for Generic1 types.
+genericLiftEq :: (Generic1 f, GEq1 (Rep1 f)) => (a -> b -> Bool) -> f a -> f b -> Bool
+genericLiftEq f a b = gliftEq f (from1 a) (from1 b)
+
+
+-- | Generically-derivable lifting of the 'Ord' class to unary type constructors.
+class GOrd1 f where
+  -- | Lift a comparison function through the type constructor.
+  --
+  --   The function will usually be applied to a comparison function, but the more general type ensures that the implementation uses it to compare elements of the first container with elements of the second.
+  gliftCompare :: (a -> b -> Ordering) -> f a -> f b -> Ordering
+
+-- | A suitable implementation of Ord1’s liftCompare for Generic1 types.
+genericLiftCompare :: (Generic1 f, GOrd1 (Rep1 f)) => (a -> b -> Ordering) -> f a -> f b -> Ordering
+genericLiftCompare f a b = gliftCompare f (from1 a) (from1 b)
+
+
+-- | Generically-derivable lifting of the 'Show' class to unary type constructors.
+class GShow1 f where
+  -- | showsPrec function for an application of the type constructor based on showsPrec and showList functions for the argument type.
+  gliftShowsPrec :: GShow1Options -> (Int -> a -> ShowS) -> ([a] -> ShowS) -> Int -> f a -> ShowS
+
+data GShow1Options = GShow1Options { optionsUseRecordSyntax :: Bool }
+
+defaultGShow1Options :: GShow1Options
+defaultGShow1Options = GShow1Options { optionsUseRecordSyntax = False }
+
+class GShow1 f => GShow1Body f where
+  -- | showsPrec function for the body of an application of the type constructor based on showsPrec and showList functions for the argument type.
+  gliftShowsPrecBody :: GShow1Options -> Fixity -> Bool -> String -> (Int -> a -> ShowS) -> ([a] -> ShowS) -> Int -> f a -> ShowS
+
+  gliftShowsPrecAll :: GShow1Options -> Bool -> (Int -> a -> ShowS) -> ([a] -> ShowS) -> Int -> f a -> [ShowS]
+  gliftShowsPrecAll opts _ sp sl d a = [gliftShowsPrec opts sp sl d a]
+
+-- | showList function for an application of the type constructor based on showsPrec and showList functions for the argument type. The default implementation using standard list syntax is correct for most types.
+gliftShowList :: GShow1 f => GShow1Options -> (Int -> a -> ShowS) -> ([a] -> ShowS) -> [f a] -> ShowS
+gliftShowList opts sp sl = showListWith (gliftShowsPrec opts sp sl 0)
+
+-- | A suitable implementation of Show1’s liftShowsPrec for Generic1 types.
+genericLiftShowsPrec :: (Generic1 f, GShow1 (Rep1 f)) => (Int -> a -> ShowS) -> ([a] -> ShowS) -> Int -> f a -> ShowS
+genericLiftShowsPrec sp sl d = gliftShowsPrec defaultGShow1Options sp sl d . from1
+
+-- | A suitable implementation of Show1’s liftShowsPrec for Generic1 types.
+genericLiftShowsPrecWithOptions :: (Generic1 f, GShow1 (Rep1 f)) => GShow1Options -> (Int -> a -> ShowS) -> ([a] -> ShowS) -> Int -> f a -> ShowS
+genericLiftShowsPrecWithOptions options sp sl d = gliftShowsPrec options sp sl d . from1
+
+
+-- Generics
+
+instance GEq1 U1 where
+  gliftEq _ _ _ = True
+
+instance GEq1 Par1 where
+  gliftEq f (Par1 a) (Par1 b) = f a b
+
+instance Eq c => GEq1 (K1 i c) where
+  gliftEq _ (K1 a) (K1 b) = a == b
+
+instance Eq1 f => GEq1 (Rec1 f) where
+  gliftEq f (Rec1 a) (Rec1 b) = liftEq f a b
+
+instance GEq1 f => GEq1 (M1 i c f) where
+  gliftEq f (M1 a) (M1 b) = gliftEq f a b
+
+instance (GEq1 f, GEq1 g) => GEq1 (f :+: g) where
+  gliftEq f a b = case (a, b) of
+    (L1 a, L1 b) -> gliftEq f a b
+    (R1 a, R1 b) -> gliftEq f a b
+    _ -> False
+
+instance (GEq1 f, GEq1 g) => GEq1 (f :*: g) where
+  gliftEq f (a1 :*: b1) (a2 :*: b2) = gliftEq f a1 a2 && gliftEq f b1 b2
+
+instance (Eq1 f, GEq1 g) => GEq1 (f :.: g) where
+  gliftEq f (Comp1 a) (Comp1 b) = liftEq (gliftEq f) a b
+
+
+instance GOrd1 U1 where
+  gliftCompare _ _ _ = EQ
+
+instance GOrd1 Par1 where
+  gliftCompare f (Par1 a) (Par1 b) = f a b
+
+instance Ord c => GOrd1 (K1 i c) where
+  gliftCompare _ (K1 a) (K1 b) = compare a b
+
+instance Ord1 f => GOrd1 (Rec1 f) where
+  gliftCompare f (Rec1 a) (Rec1 b) = liftCompare f a b
+
+instance GOrd1 f => GOrd1 (M1 i c f) where
+  gliftCompare f (M1 a) (M1 b) = gliftCompare f a b
+
+instance (GOrd1 f, GOrd1 g) => GOrd1 (f :+: g) where
+  gliftCompare f a b = case (a, b) of
+    (L1 a, L1 b) -> gliftCompare f a b
+    (R1 a, R1 b) -> gliftCompare f a b
+    (L1 _, R1 _) -> LT
+    (R1 _, L1 _) -> GT
+
+instance (GOrd1 f, GOrd1 g) => GOrd1 (f :*: g) where
+  gliftCompare f (a1 :*: b1) (a2 :*: b2) = gliftCompare f a1 a2 <> gliftCompare f b1 b2
+
+instance (Ord1 f, GOrd1 g) => GOrd1 (f :.: g) where
+  gliftCompare f (Comp1 a) (Comp1 b) = liftCompare (gliftCompare f) a b
+
+
+instance GShow1 U1 where
+  gliftShowsPrec _ _ _ _ _ = id
+
+instance GShow1 Par1 where
+  gliftShowsPrec _ sp _ d (Par1 a) = sp d a
+
+instance Show c => GShow1 (K1 i c) where
+  gliftShowsPrec _ _ _ d (K1 a) = showsPrec d a
+
+instance Show1 f => GShow1 (Rec1 f) where
+  gliftShowsPrec _ sp sl d (Rec1 a) = liftShowsPrec sp sl d a
+
+instance GShow1 f => GShow1 (M1 D c f) where
+  gliftShowsPrec opts sp sl d (M1 a) = gliftShowsPrec opts sp sl d a
+
+instance (Constructor c, GShow1Body f) => GShow1 (M1 C c f) where
+  gliftShowsPrec opts sp sl d m = gliftShowsPrecBody opts (conFixity m) (conIsRecord m && optionsUseRecordSyntax opts) (conName m) sp sl d (unM1 m)
+
+instance GShow1Body U1 where
+  gliftShowsPrecBody _ _ _ conName _ _ _ _ = showString conName
+
+instance (Selector s, GShow1 f) => GShow1Body (M1 S s f) where
+  gliftShowsPrecBody opts _ conIsRecord conName sp sl d m = showParen (d > 10) $ showString conName . showChar ' ' . showBraces conIsRecord (foldr (.) id (gliftShowsPrecAll opts conIsRecord sp sl 11 m))
+
+  gliftShowsPrecAll opts conIsRecord sp sl d m = [ (if conIsRecord && not (null (selName m)) then showString (selName m) . showString " = " else id) . gliftShowsPrec opts sp sl (if conIsRecord then 0 else d) (unM1 m) ]
+
+instance (GShow1Body f, GShow1Body g) => GShow1Body (f :*: g) where
+  gliftShowsPrecBody opts conFixity conIsRecord conName sp sl d (a :*: b) = case conFixity of
+    Prefix       -> showParen (d > 10) $ showString conName . showChar ' ' . if conIsRecord
+      then showBraces True (foldr (.) id (intersperse (showString ", ") (gliftShowsPrecAll opts conIsRecord sp sl 11 (a :*: b))))
+      else foldr (.) id (intersperse (showString " ") (gliftShowsPrecAll opts conIsRecord sp sl 11 (a :*: b)))
+    Infix _ prec -> showParen (d > prec) $ gliftShowsPrec opts sp sl (succ prec) a . showChar ' ' . showString conName . showChar ' ' . gliftShowsPrec opts sp sl (succ prec) b
+
+  gliftShowsPrecAll opts conIsRecord sp sl d (a :*: b) = gliftShowsPrecAll opts conIsRecord sp sl d a ++ gliftShowsPrecAll opts conIsRecord sp sl d b
+
+instance GShow1 f => GShow1 (M1 S c f) where
+  gliftShowsPrec opts sp sl d (M1 a) = gliftShowsPrec opts sp sl d a
+
+instance (GShow1 f, GShow1 g) => GShow1 (f :+: g) where
+  gliftShowsPrec opts sp sl d (L1 l) = gliftShowsPrec opts sp sl d l
+  gliftShowsPrec opts sp sl d (R1 r) = gliftShowsPrec opts sp sl d r
+
+instance (GShow1 f, GShow1 g) => GShow1 (f :*: g) where
+  gliftShowsPrec opts sp sl d (a :*: b) = gliftShowsPrec opts sp sl d a . showChar ' ' . gliftShowsPrec opts sp sl d b
+
+instance (Show1 f, GShow1 g) => GShow1 (f :.: g) where
+  gliftShowsPrec opts sp sl d (Comp1 a) = liftShowsPrec (gliftShowsPrec opts sp sl) (gliftShowList opts sp sl) d a
+
+showBraces :: Bool -> ShowS -> ShowS
+showBraces should rest = if should then showChar '{' . rest . showChar '}' else rest

src/Data/Functor/Classes/Ord/Generic.hs

@@ -1,51 +0,0 @@
-{-# LANGUAGE TypeOperators #-}
-module Data.Functor.Classes.Ord.Generic
-( Ord1(..)
-, genericLiftCompare
-) where
-
-import Data.Functor.Classes
-import Data.Semigroup
-import GHC.Generics
-
--- | Generically-derivable lifting of the 'Ord' class to unary type constructors.
-class GOrd1 f where
-  -- | Lift a comparison function through the type constructor.
-  --
-  --   The function will usually be applied to a comparison function, but the more general type ensures that the implementation uses it to compare elements of the first container with elements of the second.
-  gliftCompare :: (a -> b -> Ordering) -> f a -> f b -> Ordering
-
--- | A suitable implementation of Ord1’s liftCompare for Generic1 types.
-genericLiftCompare :: (Generic1 f, GOrd1 (Rep1 f)) => (a -> b -> Ordering) -> f a -> f b -> Ordering
-genericLiftCompare f a b = gliftCompare f (from1 a) (from1 b)
-
-
--- Generics
-
-instance GOrd1 U1 where
-  gliftCompare _ _ _ = EQ
-
-instance GOrd1 Par1 where
-  gliftCompare f (Par1 a) (Par1 b) = f a b
-
-instance Ord c => GOrd1 (K1 i c) where
-  gliftCompare _ (K1 a) (K1 b) = compare a b
-
-instance Ord1 f => GOrd1 (Rec1 f) where
-  gliftCompare f (Rec1 a) (Rec1 b) = liftCompare f a b
-
-instance GOrd1 f => GOrd1 (M1 i c f) where
-  gliftCompare f (M1 a) (M1 b) = gliftCompare f a b
-
-instance (GOrd1 f, GOrd1 g) => GOrd1 (f :+: g) where
-  gliftCompare f a b = case (a, b) of
-    (L1 a, L1 b) -> gliftCompare f a b
-    (R1 a, R1 b) -> gliftCompare f a b
-    (L1 _, R1 _) -> LT
-    (R1 _, L1 _) -> GT
-
-instance (GOrd1 f, GOrd1 g) => GOrd1 (f :*: g) where
-  gliftCompare f (a1 :*: b1) (a2 :*: b2) = gliftCompare f a1 a2 <> gliftCompare f b1 b2
-
-instance (Ord1 f, GOrd1 g) => GOrd1 (f :.: g) where
-  gliftCompare f (Comp1 a) (Comp1 b) = liftCompare (gliftCompare f) a b

src/Data/Functor/Classes/Show/Generic.hs

@@ -1,61 +0,0 @@
-{-# LANGUAGE TypeOperators #-}
-module Data.Functor.Classes.Show.Generic
-( Show1(..)
-, genericLiftShowsPrec
-, genericLiftShowList
-) where
-
-import Data.Functor.Classes
-import GHC.Generics
-import Text.Show
-
--- | Generically-derivable lifting of the 'Show' class to unary type constructors.
-class GShow1 f where
-  -- | showsPrec function for an application of the type constructor based on showsPrec and showList functions for the argument type.
-  gliftShowsPrec :: (Int -> a -> ShowS) -> ([a] -> ShowS) -> Int -> f a -> ShowS
-
--- | showList function for an application of the type constructor based on showsPrec and showList functions for the argument type. The default implementation using standard list syntax is correct for most types.
-gliftShowList :: GShow1 f => (Int -> a -> ShowS) -> ([a] -> ShowS) -> [f a] -> ShowS
-gliftShowList sp sl = showListWith (gliftShowsPrec sp sl 0)
-
--- | A suitable implementation of Show1’s liftShowsPrec for Generic1 types.
-genericLiftShowsPrec :: (Generic1 f, GShow1 (Rep1 f)) => (Int -> a -> ShowS) -> ([a] -> ShowS) -> Int -> f a -> ShowS
-genericLiftShowsPrec sp sl d = gliftShowsPrec sp sl d . from1
-
--- | A suitable implementation of Show1’s liftShowsPrec for Generic1 types.
-genericLiftShowList :: (Generic1 f, GShow1 (Rep1 f)) => (Int -> a -> ShowS) -> ([a] -> ShowS) -> [f a] -> ShowS
-genericLiftShowList sp sl = gliftShowList sp sl . map from1
-
-
--- Generics
-
-instance GShow1 U1 where
-  gliftShowsPrec _ _ _ _ = id
-
-instance GShow1 Par1 where
-  gliftShowsPrec sp _ d (Par1 a) = sp d a
-
-instance Show c => GShow1 (K1 i c) where
-  gliftShowsPrec _ _ d (K1 a) = showsPrec d a
-
-instance Show1 f => GShow1 (Rec1 f) where
-  gliftShowsPrec sp sl d (Rec1 a) = liftShowsPrec sp sl d a
-
-instance GShow1 f => GShow1 (M1 D c f) where
-  gliftShowsPrec sp sl d (M1 a) = gliftShowsPrec sp sl d a
-
-instance (Constructor c, GShow1 f) => GShow1 (M1 C c f) where
-  gliftShowsPrec sp sl d m = showsUnaryWith (gliftShowsPrec sp sl) (conName m) d (unM1 m)
-
-instance GShow1 f => GShow1 (M1 S c f) where
-  gliftShowsPrec sp sl d (M1 a) = gliftShowsPrec sp sl d a
-
-instance (GShow1 f, GShow1 g) => GShow1 (f :+: g) where
-  gliftShowsPrec sp sl d (L1 l) = gliftShowsPrec sp sl d l
-  gliftShowsPrec sp sl d (R1 r) = gliftShowsPrec sp sl d r
-
-instance (GShow1 f, GShow1 g) => GShow1 (f :*: g) where
-  gliftShowsPrec sp sl d (a :*: b) = gliftShowsPrec sp sl d a . showChar ' ' . gliftShowsPrec sp sl d b
-
-instance (Show1 f, GShow1 g) => GShow1 (f :.: g) where
-  gliftShowsPrec sp sl d (Comp1 a) = liftShowsPrec (gliftShowsPrec sp sl) (gliftShowList sp sl) d a

src/Data/Syntax.hs

@@ -12,9 +12,7 @@ import Data.Foldable (asum, toList)
 import Data.Function ((&), on)
 import Data.Ix
 import Data.List.NonEmpty (NonEmpty(..), nonEmpty)
-import Data.Functor.Classes.Eq.Generic
-import Data.Functor.Classes.Ord.Generic
-import Data.Functor.Classes.Show.Generic
+import Data.Functor.Classes.Generic
 import Data.Mergeable
 import Data.Range
 import Data.Record

src/Data/Syntax/Comment.hs

@@ -4,9 +4,7 @@ module Data.Syntax.Comment where
 import Diffing.Algorithm
 import Data.Align.Generic
 import Data.ByteString (ByteString)
-import Data.Functor.Classes.Eq.Generic
-import Data.Functor.Classes.Ord.Generic
-import Data.Functor.Classes.Show.Generic
+import Data.Functor.Classes.Generic
 import Data.Mergeable
 import GHC.Generics
 

src/Data/Syntax/Declaration.hs

@@ -3,9 +3,7 @@ module Data.Syntax.Declaration where
 
 import Diffing.Algorithm
 import Data.Align.Generic
-import Data.Functor.Classes.Eq.Generic
-import Data.Functor.Classes.Ord.Generic
-import Data.Functor.Classes.Show.Generic
+import Data.Functor.Classes.Generic
 import Data.Mergeable
 import GHC.Generics
 

src/Data/Syntax/Expression.hs

@@ -3,9 +3,7 @@ module Data.Syntax.Expression where
 
 import Diffing.Algorithm
 import Data.Align.Generic
-import Data.Functor.Classes.Eq.Generic
-import Data.Functor.Classes.Ord.Generic
-import Data.Functor.Classes.Show.Generic
+import Data.Functor.Classes.Generic
 import Data.Mergeable
 import GHC.Generics
 

src/Data/Syntax/Literal.hs

@@ -4,9 +4,7 @@ module Data.Syntax.Literal where
 import Diffing.Algorithm
 import Data.Align.Generic
 import Data.ByteString (ByteString)
-import Data.Functor.Classes.Eq.Generic
-import Data.Functor.Classes.Ord.Generic
-import Data.Functor.Classes.Show.Generic
+import Data.Functor.Classes.Generic
 import Data.Mergeable
 import GHC.Generics
 import Prelude

src/Data/Syntax/Statement.hs

@@ -3,9 +3,7 @@ module Data.Syntax.Statement where
 
 import Diffing.Algorithm
 import Data.Align.Generic
-import Data.Functor.Classes.Eq.Generic
-import Data.Functor.Classes.Ord.Generic
-import Data.Functor.Classes.Show.Generic
+import Data.Functor.Classes.Generic
 import Data.Mergeable
 import GHC.Generics
 

src/Data/Syntax/Type.hs

@@ -3,9 +3,7 @@ module Data.Syntax.Type where
 
 import Diffing.Algorithm
 import Data.Align.Generic
-import Data.Functor.Classes.Eq.Generic
-import Data.Functor.Classes.Ord.Generic
-import Data.Functor.Classes.Show.Generic
+import Data.Functor.Classes.Generic
 import Data.Mergeable
 import GHC.Generics
 

src/Language/Go/Assignment.hs

@@ -373,11 +373,10 @@ fallThroughStatement :: Assignment
 fallThroughStatement = makeTerm <$> symbol FallthroughStatement <*> (Statement.Pattern <$> (makeTerm <$> location <*> (Syntax.Identifier <$> source)) <*> emptyTerm)
 
 functionDeclaration :: Assignment
-functionDeclaration =  makeTerm <$> (symbol FunctionDeclaration <|> symbol FuncLiteral) <*> children (mkFunctionDeclaration <$> name <*> manyTerm parameters <*> (types <|> identifier <|> returnParameters <|> emptyTerm) <*> (block <|> emptyTerm))
+functionDeclaration =  makeTerm <$> (symbol FunctionDeclaration <|> symbol FuncLiteral) <*> children (mkFunctionDeclaration <$> (identifier <|> emptyTerm) <*> manyTerm parameters <*> (types <|> identifier <|> returnParameters <|> emptyTerm) <*> (block <|> emptyTerm))
   where
     mkFunctionDeclaration name' params' types' block' = Declaration.Function [types'] name' params' block'
     returnParameters = makeTerm <$> symbol Parameters <*> children (manyTerm expression)
-    name = makeTerm <$> location <*> manyTermsTill expression (void (symbol Parameters))
 
 importDeclaration :: Assignment
 importDeclaration = makeTerm <$> symbol ImportDeclaration <*> children (Declaration.Import <$> manyTerm expression)
@@ -395,7 +394,7 @@ methodDeclaration = makeTerm <$> symbol MethodDeclaration <*> children (mkTypedM
     mkTypedMethodDeclaration receiver' name' parameters' type'' body' = Declaration.Method [type''] receiver' name' parameters' body'
 
 methodSpec :: Assignment
-methodSpec =  makeTerm <$> symbol MethodSpec <*> children (mkMethodSpec <$> expression <*> parameters <*> expression)
+methodSpec =  makeTerm <$> symbol MethodSpec <*> children (mkMethodSpec <$> expression <*> parameters <*> (expression <|> emptyTerm))
   where
     mkMethodSpec name' params optionalTypeLiteral = Declaration.MethodSignature [optionalTypeLiteral] name' [params]
 

src/Language/Go/Syntax.hs

@@ -3,9 +3,7 @@ module Language.Go.Syntax where
 
 import Data.Align.Generic
 import Data.ByteString (ByteString)
-import Data.Functor.Classes.Eq.Generic
-import Data.Functor.Classes.Ord.Generic
-import Data.Functor.Classes.Show.Generic
+import Data.Functor.Classes.Generic
 import Data.Mergeable
 import Diffing.Algorithm
 import GHC.Generics

src/Language/Go/Type.hs

@@ -2,9 +2,7 @@
 module Language.Go.Type where
 
 import Data.Align.Generic
-import Data.Functor.Classes.Eq.Generic
-import Data.Functor.Classes.Ord.Generic
-import Data.Functor.Classes.Show.Generic
+import Data.Functor.Classes.Generic
 import Data.Mergeable
 import Diffing.Algorithm
 import GHC.Generics

src/Language/Markdown/Syntax.hs

@@ -4,9 +4,7 @@ module Language.Markdown.Syntax where
 import Diffing.Algorithm
 import Data.Align.Generic
 import Data.ByteString (ByteString)
-import Data.Functor.Classes.Eq.Generic
-import Data.Functor.Classes.Ord.Generic
-import Data.Functor.Classes.Show.Generic
+import Data.Functor.Classes.Generic
 import Data.Mergeable
 import GHC.Generics
 

src/Language/Python/Syntax.hs

@@ -3,9 +3,7 @@ module Language.Python.Syntax where
 
 import Diffing.Algorithm
 import Data.Align.Generic
-import Data.Functor.Classes.Eq.Generic
-import Data.Functor.Classes.Ord.Generic
-import Data.Functor.Classes.Show.Generic
+import Data.Functor.Classes.Generic
 import Data.Mergeable
 import GHC.Generics
 

src/Language/TypeScript/Syntax.hs

@@ -4,9 +4,7 @@ module Language.TypeScript.Syntax where
 import Diffing.Algorithm
 import Data.Align.Generic
 import Data.ByteString (ByteString)
-import Data.Functor.Classes.Eq.Generic
-import Data.Functor.Classes.Ord.Generic
-import Data.Functor.Classes.Show.Generic
+import Data.Functor.Classes.Generic
 import Data.Mergeable
 import GHC.Generics
 

test/Data/Functor/Classes/Generic/Spec.hs

@@ -0,0 +1,87 @@
+module Data.Functor.Classes.Generic.Spec where
+
+import Data.Functor.Classes.Generic
+import Data.Functor.Listable
+import GHC.Generics
+import Test.Hspec
+import Test.Hspec.LeanCheck
+
+spec :: Spec
+spec = parallel $ do
+  describe "Eq1" $ do
+    describe "genericLiftEq" $ do
+      prop "equivalent to derived (==) for product types" $
+        \ a b -> genericLiftEq (==) a b `shouldBe` a == (b :: Product Int)
+
+      prop "equivalent to derived (==) for sum types" $
+        \ a b -> genericLiftEq (==) a b `shouldBe` a == (b :: Sum Int)
+
+      prop "equivalent to derived (==) for recursive types" $
+        \ a b -> genericLiftEq (==) a b `shouldBe` a == (b :: Tree Int)
+
+  describe "Ord1" $ do
+    describe "genericLiftCompare" $ do
+      prop "equivalent to derived compare for product types" $
+        \ a b -> genericLiftCompare compare a b `shouldBe` compare a (b :: Product Int)
+
+      prop "equivalent to derived compare for sum types" $
+        \ a b -> genericLiftCompare compare a b `shouldBe` compare a (b :: Sum Int)
+
+      prop "equivalent to derived compare for recursive types" $
+        \ a b -> genericLiftCompare compare a b `shouldBe` compare a (b :: Tree Int)
+
+  describe "Show1" $ do
+    describe "genericLiftShowsPrec" $ do
+      prop "equivalent to derived showsPrec for product types" $
+        \ a -> genericLiftShowsPrec showsPrec showList 0 a "" `shouldBe` showsPrec 0 (a :: Product Int) ""
+
+      prop "equivalent to derived showsPrec for sum types" $
+        \ a -> genericLiftShowsPrec showsPrec showList 0 a "" `shouldBe` showsPrec 0 (a :: Sum Int) ""
+
+      prop "equivalent to derived showsPrec for recursive types" $
+        \ a -> genericLiftShowsPrec showsPrec showList 0 a "" `shouldBe` showsPrec 0 (a :: Tree Int) ""
+
+      prop "equivalent to derived showsPrec for record selectors" $
+        \ a -> genericLiftShowsPrecWithOptions defaultGShow1Options { optionsUseRecordSyntax = True } showsPrec showList 0 a "" `shouldBe` showsPrec 0 (a :: Record Int) ""
+
+      prop "equivalent to derived showsPrec for infix constructors" $
+        \ a -> genericLiftShowsPrec showsPrec showList 0 a "" `shouldBe` showsPrec 0 (a :: Infix Int) ""
+
+
+data Product a = Product a a a
+  deriving (Eq, Generic1, Ord, Show)
+
+instance Listable a => Listable (Product a) where
+  tiers = cons3 Product
+
+
+data Sum a = Sum1 a | Sum2 a | Sum3 a
+  deriving (Eq, Generic1, Ord, Show)
+
+instance Listable a => Listable (Sum a) where
+  tiers = cons1 Sum1 \/ cons1 Sum2 \/ cons1 Sum3
+
+
+data Tree a = Leaf a | Branch [Tree a]
+  deriving (Eq, Generic1, Ord, Show)
+
+instance Listable a => Listable (Tree a) where
+  tiers = cons1 Leaf \/ cons1 Branch
+
+instance Eq1 Tree where liftEq = genericLiftEq
+instance Ord1 Tree where liftCompare = genericLiftCompare
+instance Show1 Tree where liftShowsPrec = genericLiftShowsPrec
+
+
+data Record a = Record { recordSelector1 :: a, recordSelector2 :: a, recordSelector3 :: a }
+  deriving (Eq, Generic1, Ord, Show)
+
+instance Listable a => Listable (Record a) where
+  tiers = cons3 Record
+
+
+data Infix a = a :<>: a
+  deriving (Eq, Generic1, Ord, Show)
+
+instance Listable a => Listable (Infix a) where
+  tiers = cons2 (:<>:)

test/Data/Functor/Classes/Ord/Generic/Spec.hs

@@ -1,44 +0,0 @@
-module Data.Functor.Classes.Ord.Generic.Spec where
-
-import Data.Functor.Classes.Eq.Generic
-import Data.Functor.Classes.Ord.Generic
-import Data.Functor.Listable
-import GHC.Generics
-import Test.Hspec
-import Test.Hspec.LeanCheck
-
-spec :: Spec
-spec = parallel $ do
-  describe "genericLiftCompare" $ do
-    prop "equivalent to derived compare for product types" $
-      \ a b -> genericLiftCompare compare a b `shouldBe` compare a (b :: Product Int)
-
-    prop "equivalent to derived compare for sum types" $
-      \ a b -> genericLiftCompare compare a b `shouldBe` compare a (b :: Sum Int)
-
-    prop "equivalent to derived compare for recursive types" $
-      \ a b -> genericLiftCompare compare a b `shouldBe` compare a (b :: Tree Int)
-
-
-data Product a = Product a a a
-  deriving (Eq, Generic1, Ord, Show)
-
-instance Listable a => Listable (Product a) where
-  tiers = cons3 Product
-
-
-data Sum a = Sum1 a | Sum2 a | Sum3 a
-  deriving (Eq, Generic1, Ord, Show)
-
-instance Listable a => Listable (Sum a) where
-  tiers = cons1 Sum1 \/ cons1 Sum2 \/ cons1 Sum3
-
-
-data Tree a = Leaf a | Branch [Tree a]
-  deriving (Eq, Generic1, Ord, Show)
-
-instance Listable a => Listable (Tree a) where
-  tiers = cons1 Leaf \/ cons1 Branch
-
-instance Eq1 Tree where liftEq = genericLiftEq
-instance Ord1 Tree where liftCompare = genericLiftCompare

test/Spec.hs

@@ -2,7 +2,7 @@ module Main where
 
 import qualified Assigning.Assignment.Spec
 import qualified Data.Diff.Spec
-import qualified Data.Functor.Classes.Ord.Generic.Spec
+import qualified Data.Functor.Classes.Generic.Spec
 import qualified Data.Mergeable.Spec
 import qualified Data.Source.Spec
 import qualified Data.Term.Spec
@@ -23,7 +23,7 @@ main = hspec $ do
   parallel $ do
     describe "Assigning.Assignment" Assigning.Assignment.Spec.spec
     describe "Data.Diff" Data.Diff.Spec.spec
-    describe "Data.Functor.Classes.Ord.Generic" Data.Functor.Classes.Ord.Generic.Spec.spec
+    describe "Data.Functor.Classes.Generic" Data.Functor.Classes.Generic.Spec.spec
     describe "Data.Mergeable" Data.Mergeable.Spec.spec
     describe "Data.Source" Data.Source.Spec.spec
     describe "Data.Term" Data.Term.Spec.spec

test/fixtures/go/array-types.diffA-B.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (

test/fixtures/go/array-types.diffB-A.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (

test/fixtures/go/array-types.parseA.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (

test/fixtures/go/array-types.parseB.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (

test/fixtures/go/array-with-implicit-length.diffA-B.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Assignment
       (Identifier)

test/fixtures/go/array-with-implicit-length.diffB-A.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Assignment
       (Identifier)

test/fixtures/go/array-with-implicit-length.parseA.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Assignment
       (Identifier)

test/fixtures/go/array-with-implicit-length.parseB.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Assignment
       (Identifier)

test/fixtures/go/assignment-statements.diffA-B.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Assignment

test/fixtures/go/assignment-statements.diffB-A.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Assignment

test/fixtures/go/assignment-statements.parseA.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Assignment

test/fixtures/go/assignment-statements.parseB.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Assignment

test/fixtures/go/binary-expressions.diffA-B.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Context

test/fixtures/go/binary-expressions.diffB-A.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Context

test/fixtures/go/binary-expressions.parseA.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Context

test/fixtures/go/binary-expressions.parseB.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Context

test/fixtures/go/call-expressions.diffA-B.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Call

test/fixtures/go/call-expressions.diffB-A.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Call

test/fixtures/go/call-expressions.parseA.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Call

test/fixtures/go/call-expressions.parseB.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Call

test/fixtures/go/case-statements.diffA-B.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
   { (Match
     {-(Empty)-}

test/fixtures/go/case-statements.diffB-A.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
   { (
     {-(Match

test/fixtures/go/case-statements.parseA.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Match
       (Empty)

test/fixtures/go/case-statements.parseB.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Match

test/fixtures/go/channel-types.diffA-B.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Type

test/fixtures/go/channel-types.diffB-A.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Type

test/fixtures/go/channel-types.parseA.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Type

test/fixtures/go/channel-types.parseB.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Type

test/fixtures/go/comment.diffA-B.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Context
     { (Comment)

test/fixtures/go/comment.diffB-A.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Context
     { (Comment)

test/fixtures/go/comment.parseA.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Context
       (Comment)

test/fixtures/go/comment.parseB.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Context
       (Comment)

test/fixtures/go/const-declarations-with-types.diffA-B.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Assignment
       (Annotation

test/fixtures/go/const-declarations-with-types.diffB-A.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Assignment
       (Annotation

test/fixtures/go/const-declarations-with-types.parseA.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Assignment
       (Annotation

test/fixtures/go/const-declarations-with-types.parseB.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Assignment
       (Annotation

test/fixtures/go/const-declarations-without-types.diffA-B.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Assignment
     { (Identifier)

test/fixtures/go/const-declarations-without-types.diffB-A.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Assignment
     { (

test/fixtures/go/const-declarations-without-types.parseA.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Assignment
       (Identifier)

test/fixtures/go/const-declarations-without-types.parseB.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Assignment
       (

test/fixtures/go/const-with-implicit-values.diffA-B.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Assignment

test/fixtures/go/const-with-implicit-values.diffB-A.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Assignment

test/fixtures/go/const-with-implicit-values.parseA.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Assignment

test/fixtures/go/const-with-implicit-values.parseB.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Assignment

test/fixtures/go/constructors.diffA-B.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Call

test/fixtures/go/constructors.diffB-A.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Call

test/fixtures/go/constructors.parseA.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Call

test/fixtures/go/constructors.parseB.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Call

test/fixtures/go/float-literals.diffA-B.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Assignment

test/fixtures/go/float-literals.diffB-A.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Assignment

test/fixtures/go/float-literals.parseA.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Assignment

test/fixtures/go/float-literals.parseB.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Assignment

test/fixtures/go/for-statements.diffA-B.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (For

test/fixtures/go/for-statements.diffB-A.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (For

test/fixtures/go/for-statements.parseA.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (For

test/fixtures/go/for-statements.parseB.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (For

test/fixtures/go/function-declarations.diffA-B.txt

@@ -3,22 +3,19 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     ([]))
   (Function
     (Empty)
-    (
-    { (Identifier)
-    ->(Identifier) })
+  { (Identifier)
+  ->(Identifier) }
     ([])
     ([]))
   (Function
     (Identifier)
-    (
-    { (Identifier)
-    ->(Identifier) })
+  { (Identifier)
+  ->(Identifier) }
     (
       (
         (Identifier)
@@ -31,9 +28,8 @@
     ([]))
   (Function
     (Empty)
-    (
-    { (Identifier)
-    ->(Identifier) })
+  { (Identifier)
+  ->(Identifier) }
     ([])
     (
       (Identifier)
@@ -41,9 +37,8 @@
     ([]))
   (Function
     (Empty)
-    (
-    { (Identifier)
-    ->(Identifier) })
+  { (Identifier)
+  ->(Identifier) }
     ([])
     (
       (
@@ -55,8 +50,7 @@
     ([]))
 {+(Function
   {+(Empty)+}
-  {+(
-    {+(Identifier)+})+}
+  {+(Identifier)+}
   {+([])+}
   {+([])+}
   {+(NoOp
@@ -64,16 +58,14 @@
   (Function
   { (Identifier)
   ->(Identifier) }
-    (
-    { (Identifier)
-    ->(Identifier) })
+  { (Identifier)
+  ->(Identifier) }
     ([])
     (Empty))
   (Function
     (Empty)
-    (
-    { (Identifier)
-    ->(Identifier) })
+  { (Identifier)
+  ->(Identifier) }
     (
       (Identifier)
       (Pointer

test/fixtures/go/function-declarations.diffB-A.txt

@@ -3,22 +3,19 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     ([]))
   (Function
     (Empty)
-    (
-    { (Identifier)
-    ->(Identifier) })
+  { (Identifier)
+  ->(Identifier) }
     ([])
     ([]))
   (Function
     (Identifier)
-    (
-    { (Identifier)
-    ->(Identifier) })
+  { (Identifier)
+  ->(Identifier) }
     (
       (
         (Identifier)
@@ -31,9 +28,8 @@
     ([]))
   (Function
     (Empty)
-    (
-    { (Identifier)
-    ->(Identifier) })
+  { (Identifier)
+  ->(Identifier) }
     ([])
     (
       (Identifier)
@@ -41,9 +37,8 @@
     ([]))
   (Function
     (Empty)
-    (
-    { (Identifier)
-    ->(Identifier) })
+  { (Identifier)
+  ->(Identifier) }
     ([])
     (
       (
@@ -55,14 +50,12 @@
     ([]))
 {+(Function
   {+(Identifier)+}
-  {+(
-    {+(Identifier)+})+}
+  {+(Identifier)+}
   {+([])+}
   {+(Empty)+})+}
 {+(Function
   {+(Empty)+}
-  {+(
-    {+(Identifier)+})+}
+  {+(Identifier)+}
   {+(
     {+(Identifier)+}
     {+(Pointer
@@ -73,22 +66,19 @@
   {+([])+})+}
 {-(Function
   {-(Empty)-}
-  {-(
-    {-(Identifier)-})-}
+  {-(Identifier)-}
   {-([])-}
   {-([])-}
   {-(NoOp
     {-(Empty)-})-})-}
 {-(Function
   {-(Identifier)-}
-  {-(
-    {-(Identifier)-})-}
+  {-(Identifier)-}
   {-([])-}
   {-(Empty)-})-}
 {-(Function
   {-(Empty)-}
-  {-(
-    {-(Identifier)-})-}
+  {-(Identifier)-}
   {-(
     {-(Identifier)-}
     {-(Pointer

test/fixtures/go/function-declarations.parseA.txt

@@ -3,20 +3,17 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     ([]))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     ([]))
   (Function
     (Identifier)
-    (
-      (Identifier))
+    (Identifier)
     (
       (
         (Identifier)
@@ -29,8 +26,7 @@
     ([]))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Identifier)
@@ -38,8 +34,7 @@
     ([]))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (
@@ -51,14 +46,12 @@
     ([]))
   (Function
     (Identifier)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Empty))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     (
       (Identifier)
       (Pointer

test/fixtures/go/function-declarations.parseB.txt

@@ -3,20 +3,17 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     ([]))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     ([]))
   (Function
     (Identifier)
-    (
-      (Identifier))
+    (Identifier)
     (
       (
         (Identifier)
@@ -29,8 +26,7 @@
     ([]))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Identifier)
@@ -38,8 +34,7 @@
     ([]))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (
@@ -51,22 +46,19 @@
     ([]))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     ([])
     (NoOp
       (Empty)))
   (Function
     (Identifier)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Empty))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     (
       (Identifier)
       (Pointer

test/fixtures/go/function-literals.diffA-B.txt

@@ -3,14 +3,13 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Assignment
       (Identifier)
       (Function
         (Empty)
-        ([])
+        (Empty)
         (
         { (Identifier)
         ->(Identifier) }

test/fixtures/go/function-literals.diffB-A.txt

@@ -3,14 +3,13 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Assignment
       (Identifier)
       (Function
         (Empty)
-        ([])
+        (Empty)
         (
         { (Identifier)
         ->(Identifier) }

test/fixtures/go/function-literals.parseA.txt

@@ -3,14 +3,13 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Assignment
       (Identifier)
       (Function
         (Empty)
-        ([])
+        (Empty)
         (
           (Identifier)
           (Identifier))

test/fixtures/go/function-literals.parseB.txt

@@ -3,14 +3,13 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (Assignment
       (Identifier)
       (Function
         (Empty)
-        ([])
+        (Empty)
         (
           (Identifier)
           (Identifier))

test/fixtures/go/function-types.diffA-B.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Type

test/fixtures/go/function-types.diffB-A.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Type

test/fixtures/go/function-types.parseA.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Type

test/fixtures/go/function-types.parseB.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Type

test/fixtures/go/go-and-defer-statements.diffA-B.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Defer

test/fixtures/go/go-and-defer-statements.diffB-A.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Defer

test/fixtures/go/go-and-defer-statements.parseA.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Defer

test/fixtures/go/go-and-defer-statements.parseB.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Defer

test/fixtures/go/grouped-import-declarations.diffA-B.txt

@@ -12,7 +12,6 @@
     ->(TextElement) }))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     ([])))

test/fixtures/go/grouped-import-declarations.diffB-A.txt

@@ -12,7 +12,6 @@
     ->(TextElement) }))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     ([])))

test/fixtures/go/grouped-import-declarations.parseA.txt

@@ -9,7 +9,6 @@
       (TextElement)))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     ([])))

test/fixtures/go/grouped-import-declarations.parseB.txt

@@ -9,7 +9,6 @@
       (TextElement)))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     ([])))

test/fixtures/go/grouped-var-declarations.diffA-B.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Assignment

test/fixtures/go/grouped-var-declarations.diffB-A.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Assignment

test/fixtures/go/grouped-var-declarations.parseA.txt

@@ -3,8 +3,7 @@
     (Identifier))
   (Function
     (Empty)
-    (
-      (Identifier))
+    (Identifier)
     ([])
     (
       (Assignment