diff --git a/MetaBrush.cabal b/MetaBrush.cabal index b2262e3..507f118 100644 --- a/MetaBrush.cabal +++ b/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 diff --git a/src/app/MetaBrush/Application.hs b/src/app/MetaBrush/Application.hs index 1646236..0611719 100644 --- a/src/app/MetaBrush/Application.hs +++ b/src/app/MetaBrush/Application.hs @@ -1,5 +1,6 @@ {-# LANGUAGE OverloadedLabels #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE RecursiveDo #-} module MetaBrush.Application ( runApplication ) diff --git a/src/app/MetaBrush/Document/Selection.hs b/src/app/MetaBrush/Document/Selection.hs index 7cb9ee5..8ea89ca 100644 --- a/src/app/MetaBrush/Document/Selection.hs +++ b/src/app/MetaBrush/Document/Selection.hs @@ -1,4 +1,5 @@ {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE ScopedTypeVariables #-} module MetaBrush.Document.Selection ( SelectionMode(..), selectionMode diff --git a/src/app/MetaBrush/Event.hs b/src/app/MetaBrush/Event.hs index eece440..604d101 100644 --- a/src/app/MetaBrush/Event.hs +++ b/src/app/MetaBrush/Event.hs @@ -1,3 +1,6 @@ +{-# LANGUAGE ImplicitParams #-} +{-# LANGUAGE ScopedTypeVariables #-} + module MetaBrush.Event ( handleEvents ) where diff --git a/src/app/MetaBrush/GTK/Util.hs b/src/app/MetaBrush/GTK/Util.hs index 42bed51..41ee886 100644 --- a/src/app/MetaBrush/GTK/Util.hs +++ b/src/app/MetaBrush/GTK/Util.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE ScopedTypeVariables #-} + module MetaBrush.GTK.Util ( withRGBA, showRGBA , widgetAddClasses, widgetAddClass diff --git a/src/app/MetaBrush/Render/Document.hs b/src/app/MetaBrush/Render/Document.hs index 108af4e..79aacd0 100644 --- a/src/app/MetaBrush/Render/Document.hs +++ b/src/app/MetaBrush/Render/Document.hs @@ -1,5 +1,6 @@ -{-# LANGUAGE AllowAmbiguousTypes #-} -{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE AllowAmbiguousTypes #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE ScopedTypeVariables #-} module MetaBrush.Render.Document ( getDocumentRender, blankRender ) diff --git a/src/app/MetaBrush/Render/Rulers.hs b/src/app/MetaBrush/Render/Rulers.hs index 7a1bb3e..fc7a497 100644 --- a/src/app/MetaBrush/Render/Rulers.hs +++ b/src/app/MetaBrush/Render/Rulers.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE ScopedTypeVariables #-} + module MetaBrush.Render.Rulers ( renderRuler ) where diff --git a/src/metabrushes/MetaBrush/Brush.hs b/src/metabrushes/MetaBrush/Brush.hs index 5959d3c..7269687 100644 --- a/src/metabrushes/MetaBrush/Brush.hs +++ b/src/metabrushes/MetaBrush/Brush.hs @@ -1,4 +1,6 @@ -{-# LANGUAGE AllowAmbiguousTypes #-} +{-# LANGUAGE AllowAmbiguousTypes #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE UndecidableInstances #-} module MetaBrush.Brush ( Brush(..), SomeBrush(..), BrushFunction diff --git a/src/metabrushes/MetaBrush/Document.hs b/src/metabrushes/MetaBrush/Document.hs index dd41264..1b33a11 100644 --- a/src/metabrushes/MetaBrush/Document.hs +++ b/src/metabrushes/MetaBrush/Document.hs @@ -1,6 +1,5 @@ -{-# LANGUAGE OverloadedStrings #-} - -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE UndecidableInstances #-} module MetaBrush.Document ( AABB(..), mkAABB diff --git a/src/metabrushes/MetaBrush/Document/Draw.hs b/src/metabrushes/MetaBrush/Document/Draw.hs index 5feb8aa..cc74331 100644 --- a/src/metabrushes/MetaBrush/Document/Draw.hs +++ b/src/metabrushes/MetaBrush/Document/Draw.hs @@ -1,4 +1,5 @@ -{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE ScopedTypeVariables #-} module MetaBrush.Document.Draw ( DrawAnchor(..), anchorsAreComplementary diff --git a/src/metabrushes/MetaBrush/Document/Serialise.hs b/src/metabrushes/MetaBrush/Document/Serialise.hs index 7420c36..b9e8585 100644 --- a/src/metabrushes/MetaBrush/Document/Serialise.hs +++ b/src/metabrushes/MetaBrush/Document/Serialise.hs @@ -1,5 +1,6 @@ {-# LANGUAGE AllowAmbiguousTypes #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE ScopedTypeVariables #-} module MetaBrush.Document.Serialise ( documentToJSON, documentFromJSON diff --git a/src/metabrushes/MetaBrush/Document/SubdivideStroke.hs b/src/metabrushes/MetaBrush/Document/SubdivideStroke.hs index c4db874..99f2b2a 100644 --- a/src/metabrushes/MetaBrush/Document/SubdivideStroke.hs +++ b/src/metabrushes/MetaBrush/Document/SubdivideStroke.hs @@ -1,4 +1,5 @@ -{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE ScopedTypeVariables #-} module MetaBrush.Document.SubdivideStroke ( subdivide ) diff --git a/src/metabrushes/MetaBrush/Records.hs b/src/metabrushes/MetaBrush/Records.hs index 1a197c1..4f09691 100644 --- a/src/metabrushes/MetaBrush/Records.hs +++ b/src/metabrushes/MetaBrush/Records.hs @@ -1,5 +1,7 @@ -{-# LANGUAGE AllowAmbiguousTypes #-} -{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE AllowAmbiguousTypes #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE UndecidableInstances #-} module MetaBrush.Records where diff --git a/src/metabrushes/MetaBrush/Serialisable.hs b/src/metabrushes/MetaBrush/Serialisable.hs index 90fd5a9..f4fa221 100644 --- a/src/metabrushes/MetaBrush/Serialisable.hs +++ b/src/metabrushes/MetaBrush/Serialisable.hs @@ -1,4 +1,6 @@ -{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE UndecidableInstances #-} module MetaBrush.Serialisable ( Serialisable(..) diff --git a/src/metabrushes/MetaBrush/Unique.hs b/src/metabrushes/MetaBrush/Unique.hs index 3651b0f..5d5bf48 100644 --- a/src/metabrushes/MetaBrush/Unique.hs +++ b/src/metabrushes/MetaBrush/Unique.hs @@ -1,4 +1,5 @@ -{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE UndecidableInstances #-} module MetaBrush.Unique ( MonadUnique(freshUnique) diff --git a/src/splines/Math/Bezier/Cubic.hs b/src/splines/Math/Bezier/Cubic.hs index 05ebe73..d3b0e3f 100644 --- a/src/splines/Math/Bezier/Cubic.hs +++ b/src/splines/Math/Bezier/Cubic.hs @@ -1,4 +1,6 @@ -{-# LANGUAGE AllowAmbiguousTypes #-} +{-# LANGUAGE AllowAmbiguousTypes #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE UndecidableInstances #-} module Math.Bezier.Cubic ( Bezier(..) diff --git a/src/splines/Math/Bezier/Cubic/Fit.hs b/src/splines/Math/Bezier/Cubic/Fit.hs index 08cc3a5..5f0b91a 100644 --- a/src/splines/Math/Bezier/Cubic/Fit.hs +++ b/src/splines/Math/Bezier/Cubic/Fit.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE ScopedTypeVariables #-} + module Math.Bezier.Cubic.Fit ( FitParameters(..), FitPoint(..) , fitSpline, fitPiece diff --git a/src/splines/Math/Bezier/Envelope.hs b/src/splines/Math/Bezier/Envelope.hs index 1137fa8..9629c74 100644 --- a/src/splines/Math/Bezier/Envelope.hs +++ b/src/splines/Math/Bezier/Envelope.hs @@ -1,3 +1,6 @@ +{-# LANGUAGE ScopedTypeVariables #-} + +-- TODO: unused module. module Math.Bezier.Envelope where -- acts diff --git a/src/splines/Math/Bezier/Quadratic.hs b/src/splines/Math/Bezier/Quadratic.hs index dfe1680..9b6729a 100644 --- a/src/splines/Math/Bezier/Quadratic.hs +++ b/src/splines/Math/Bezier/Quadratic.hs @@ -1,4 +1,6 @@ -{-# LANGUAGE AllowAmbiguousTypes #-} +{-# LANGUAGE AllowAmbiguousTypes #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE UndecidableInstances #-} module Math.Bezier.Quadratic ( Bezier(..) diff --git a/src/splines/Math/Bezier/Spline.hs b/src/splines/Math/Bezier/Spline.hs index eca3096..fb70a1c 100644 --- a/src/splines/Math/Bezier/Spline.hs +++ b/src/splines/Math/Bezier/Spline.hs @@ -1,3 +1,7 @@ +{-# LANGUAGE QuantifiedConstraints #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE UndecidableInstances #-} + module Math.Bezier.Spline where -- base diff --git a/src/splines/Math/Bezier/Stroke.hs b/src/splines/Math/Bezier/Stroke.hs index c68b01d..2016810 100644 --- a/src/splines/Math/Bezier/Stroke.hs +++ b/src/splines/Math/Bezier/Stroke.hs @@ -1,6 +1,5 @@ {-# LANGUAGE AllowAmbiguousTypes #-} - -{-# OPTIONS_GHC -Wno-type-defaults #-} +{-# LANGUAGE ScopedTypeVariables #-} module Math.Bezier.Stroke ( Offset(..) diff --git a/src/splines/Math/Epsilon.hs b/src/splines/Math/Epsilon.hs index 51413fc..918725c 100644 --- a/src/splines/Math/Epsilon.hs +++ b/src/splines/Math/Epsilon.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE ScopedTypeVariables #-} + module Math.Epsilon ( epsilon, nearZero ) where diff --git a/src/splines/Math/Linear.hs b/src/splines/Math/Linear.hs index dc4bf82..7266485 100644 --- a/src/splines/Math/Linear.hs +++ b/src/splines/Math/Linear.hs @@ -1,6 +1,7 @@ {-# LANGUAGE AllowAmbiguousTypes #-} -{-# LANGUAGE PolyKinds #-} -{-# LANGUAGE UnliftedNewtypes #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE UnliftedNewtypes #-} module Math.Linear ( -- * Points and vectors diff --git a/src/splines/Math/Linear/Dual.hs b/src/splines/Math/Linear/Dual.hs index 902eeb4..efda6dc 100644 --- a/src/splines/Math/Linear/Dual.hs +++ b/src/splines/Math/Linear/Dual.hs @@ -1,4 +1,6 @@ -{-# LANGUAGE AllowAmbiguousTypes #-} +{-# LANGUAGE AllowAmbiguousTypes #-} +{-# LANGUAGE DuplicateRecordFields #-} +{-# LANGUAGE UndecidableInstances #-} module Math.Linear.Dual where diff --git a/src/splines/Math/Module.hs b/src/splines/Math/Module.hs index 05a4a14..eb2e98d 100644 --- a/src/splines/Math/Module.hs +++ b/src/splines/Math/Module.hs @@ -1,4 +1,6 @@ -{-# LANGUAGE AllowAmbiguousTypes #-} +{-# LANGUAGE AllowAmbiguousTypes #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE UndecidableInstances #-} module Math.Module ( Module(..), lerp diff --git a/src/splines/Math/Orientation.hs b/src/splines/Math/Orientation.hs index 035575d..2acf7ff 100644 --- a/src/splines/Math/Orientation.hs +++ b/src/splines/Math/Orientation.hs @@ -1,4 +1,5 @@ {-# LANGUAGE AllowAmbiguousTypes #-} +{-# LANGUAGE ScopedTypeVariables #-} module Math.Orientation ( Orientation(..), reverseOrientation diff --git a/src/splines/Math/Roots.hs b/src/splines/Math/Roots.hs index 102b174..10f0ac5 100644 --- a/src/splines/Math/Roots.hs +++ b/src/splines/Math/Roots.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE ScopedTypeVariables #-} + module Math.Roots where -- base