more cabal file cleanups

MetaBrush.cabal

@@ -60,13 +60,11 @@ common common
         DeriveTraversable
         DeriveGeneric
         DerivingVia
-        DuplicateRecordFields
         FlexibleContexts
         FlexibleInstances
         FunctionalDependencies
         GADTs
         GeneralisedNewtypeDeriving
-        ImplicitParams
         InstanceSigs
         LambdaCase
         LexicalNegation
@@ -74,11 +72,8 @@ common common
         MultiWayIf
         NamedFieldPuns
         PatternSynonyms
-        QuantifiedConstraints
         RankNTypes
         RecordWildCards
-        RecursiveDo
-        ScopedTypeVariables
         StandaloneDeriving
         StandaloneKindSignatures
         TupleSections
@@ -86,7 +81,6 @@ common common
         TypeFamilies
         TypeOperators
         UnboxedTuples
-        UndecidableInstances
         ViewPatterns
 
     ghc-options:
@@ -105,6 +99,16 @@ common common
         -fwarn-missing-deriving-strategies
         -fno-warn-unticked-promoted-constructors
 
+    if flag(asserts)
+      cpp-options:
+          -DASSERTS
+
+    autogen-modules:
+        Paths_MetaBrush
+
+    other-modules:
+        Paths_MetaBrush
+
 common extras
 
     build-depends:
@@ -190,6 +194,7 @@ library splines
       , vector
            >= 0.12.1.2   && < 0.14
 
+
 library metabrushes
 
     import:
@@ -214,14 +219,6 @@ library metabrushes
       , MetaBrush.Serialisable
       , MetaBrush.Unique
       , MetaBrush.Util
-      , Paths_MetaBrush
-
-    autogen-modules:
-        Paths_MetaBrush
-
-    if flag(asserts)
-      cpp-options:
-          -DASSERTS
 
     build-depends:
         splines
@@ -229,12 +226,6 @@ library metabrushes
           ^>= 0.3.0.0
       , bytestring
            >= 0.10.10.0  && < 0.12
-      , dlist
-          ^>= 1.0
-      , Earley
-          ^>= 0.13.0.1
-      , tree-view
-          ^>= 0.5
 
 
 executable convert-metafont
@@ -305,18 +296,10 @@ executable MetaBrush
       , MetaBrush.UI.ToolBar
       , MetaBrush.UI.Viewport
       , MetaBrush.Time
-      , Paths_MetaBrush
-
-    autogen-modules:
-        Paths_MetaBrush
 
     ghc-options:
         -threaded -rtsopts
 
-    if flag(asserts)
-      cpp-options:
-          -DASSERTS
-
     build-depends:
         splines
       , metabrushes

src/app/MetaBrush/Application.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE OverloadedLabels  #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecursiveDo       #-}
 
 module MetaBrush.Application
   ( runApplication )

src/app/MetaBrush/Document/Selection.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE OverloadedStrings   #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 module MetaBrush.Document.Selection
   ( SelectionMode(..), selectionMode

src/app/MetaBrush/Event.hs

@@ -1,3 +1,6 @@
+{-# LANGUAGE ImplicitParams      #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+
 module MetaBrush.Event
   ( handleEvents )
   where

src/app/MetaBrush/GTK/Util.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE ScopedTypeVariables #-}
+
 module MetaBrush.GTK.Util
   ( withRGBA, showRGBA
   , widgetAddClasses, widgetAddClass

src/app/MetaBrush/Render/Document.hs

@@ -1,5 +1,6 @@
-{-# LANGUAGE AllowAmbiguousTypes   #-}
+{-# LANGUAGE AllowAmbiguousTypes #-}
-{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE OverloadedStrings   #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 module MetaBrush.Render.Document
   ( getDocumentRender, blankRender )

src/app/MetaBrush/Render/Rulers.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE ScopedTypeVariables #-}
+
 module MetaBrush.Render.Rulers
   ( renderRuler )
   where

src/metabrushes/MetaBrush/Brush.hs

@@ -1,4 +1,6 @@
-{-# LANGUAGE AllowAmbiguousTypes #-}
+{-# LANGUAGE AllowAmbiguousTypes  #-}
+{-# LANGUAGE ScopedTypeVariables  #-}
+{-# LANGUAGE UndecidableInstances #-}
 
 module MetaBrush.Brush
   ( Brush(..), SomeBrush(..), BrushFunction

src/metabrushes/MetaBrush/Document.hs

@@ -1,6 +1,5 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings    #-}
-
+{-# LANGUAGE UndecidableInstances #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module MetaBrush.Document
   ( AABB(..), mkAABB

src/metabrushes/MetaBrush/Document/Draw.hs

@@ -1,4 +1,5 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings   #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 module MetaBrush.Document.Draw
   ( DrawAnchor(..), anchorsAreComplementary

src/metabrushes/MetaBrush/Document/Serialise.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
 {-# LANGUAGE OverloadedStrings   #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 module MetaBrush.Document.Serialise
   ( documentToJSON, documentFromJSON

src/metabrushes/MetaBrush/Document/SubdivideStroke.hs

@@ -1,4 +1,5 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings   #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 module MetaBrush.Document.SubdivideStroke
   ( subdivide )

src/metabrushes/MetaBrush/Records.hs

@@ -1,5 +1,7 @@
-{-# LANGUAGE AllowAmbiguousTypes #-}
+{-# LANGUAGE AllowAmbiguousTypes  #-}
-{-# LANGUAGE PolyKinds           #-}
+{-# LANGUAGE PolyKinds            #-}
+{-# LANGUAGE ScopedTypeVariables  #-}
+{-# LANGUAGE UndecidableInstances #-}
 
 module MetaBrush.Records where
 

src/metabrushes/MetaBrush/Serialisable.hs

@@ -1,4 +1,6 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings    #-}
+{-# LANGUAGE ScopedTypeVariables  #-}
+{-# LANGUAGE UndecidableInstances #-}
 
 module MetaBrush.Serialisable
   ( Serialisable(..)

src/metabrushes/MetaBrush/Unique.hs

@@ -1,4 +1,5 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings    #-}
+{-# LANGUAGE UndecidableInstances #-}
 
 module MetaBrush.Unique
   ( MonadUnique(freshUnique)

src/splines/Math/Bezier/Cubic.hs

@@ -1,4 +1,6 @@
-{-# LANGUAGE AllowAmbiguousTypes   #-}
+{-# LANGUAGE AllowAmbiguousTypes  #-}
+{-# LANGUAGE ScopedTypeVariables  #-}
+{-# LANGUAGE UndecidableInstances #-}
 
 module Math.Bezier.Cubic
   ( Bezier(..)

src/splines/Math/Bezier/Cubic/Fit.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE ScopedTypeVariables #-}
+
 module Math.Bezier.Cubic.Fit
   ( FitParameters(..), FitPoint(..)
   , fitSpline, fitPiece

src/splines/Math/Bezier/Envelope.hs

@@ -1,3 +1,6 @@
+{-# LANGUAGE ScopedTypeVariables #-}
+
+-- TODO: unused module.
 module Math.Bezier.Envelope where
 
 -- acts

src/splines/Math/Bezier/Quadratic.hs

@@ -1,4 +1,6 @@
-{-# LANGUAGE AllowAmbiguousTypes #-}
+{-# LANGUAGE AllowAmbiguousTypes  #-}
+{-# LANGUAGE ScopedTypeVariables  #-}
+{-# LANGUAGE UndecidableInstances #-}
 
 module Math.Bezier.Quadratic
   ( Bezier(..)

src/splines/Math/Bezier/Spline.hs

@@ -1,3 +1,7 @@
+{-# LANGUAGE QuantifiedConstraints #-}
+{-# LANGUAGE ScopedTypeVariables   #-}
+{-# LANGUAGE UndecidableInstances  #-}
+
 module Math.Bezier.Spline where
 
 -- base

src/splines/Math/Bezier/Stroke.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
-
+{-# LANGUAGE ScopedTypeVariables #-}
-{-# OPTIONS_GHC -Wno-type-defaults #-}
 
 module Math.Bezier.Stroke
   ( Offset(..)

src/splines/Math/Epsilon.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE ScopedTypeVariables #-}
+
 module Math.Epsilon
   ( epsilon, nearZero )
   where

src/splines/Math/Linear.hs

@@ -1,6 +1,7 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
-{-# LANGUAGE PolyKinds #-}
+{-# LANGUAGE PolyKinds           #-}
-{-# LANGUAGE UnliftedNewtypes #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE UnliftedNewtypes    #-}
 
 module Math.Linear
   ( -- * Points and vectors

src/splines/Math/Linear/Dual.hs

@@ -1,4 +1,6 @@
-{-# LANGUAGE AllowAmbiguousTypes #-}
+{-# LANGUAGE AllowAmbiguousTypes   #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE UndecidableInstances  #-}
 
 module Math.Linear.Dual where
 

src/splines/Math/Module.hs

@@ -1,4 +1,6 @@
-{-# LANGUAGE AllowAmbiguousTypes #-}
+{-# LANGUAGE AllowAmbiguousTypes  #-}
+{-# LANGUAGE ScopedTypeVariables  #-}
+{-# LANGUAGE UndecidableInstances #-}
 
 module Math.Module
   ( Module(..), lerp

src/splines/Math/Orientation.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 module Math.Orientation
   ( Orientation(..), reverseOrientation

src/splines/Math/Roots.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE ScopedTypeVariables #-}
+
 module Math.Roots where
 
 -- base