Move TH down to sort out scoping issues on 7.6.3

yi-editor · Oct 5, 2014 · 35f9c15 · 35f9c15
1 parent 4c1079d
commit 35f9c15
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/yi/src/library/Yi/Types.hs b/yi/src/library/Yi/Types.hs
@@ -204,14 +204,6 @@ type WinMarks = MarkSet Mark
 
 data MarkSet a = MarkSet { fromMark, insMark, selMark :: !a } deriving (Traversable, Foldable, Functor)
 
-#if __GLASGOW_HASKELL__ < 708
-$(derive makeBinary ''MarkSet)
-#else
-deriving instance Generic (MarkSet a)
-instance Binary a => Binary (MarkSet a)
-#endif
-
-
 data Attributes = Attributes
                 { ident :: !BufferId
                 , bkey__   :: !BufferRef          -- ^ immutable unique key
@@ -357,12 +349,6 @@ instance MonadEditor EditorM where
     askCfg = ask
     withEditor = id
 
-#if __GLASGOW_HASKELL__ < 708
-deriving instance Typeable1 EditorM
-#else
-deriving instance Typeable EditorM
-#endif
-
 class (Monad m, MonadState Editor m) => MonadEditor m where
   askCfg :: m Config
 
@@ -458,6 +444,19 @@ instance Default RegionStyle where
 
 instance YiVariable RegionStyle
 
+#if __GLASGOW_HASKELL__ < 708
+deriving instance Typeable1 EditorM
+#else
+deriving instance Typeable EditorM
+#endif
+
+#if __GLASGOW_HASKELL__ < 708
+$(derive makeBinary ''MarkSet)
+#else
+deriving instance Generic (MarkSet a)
+instance Binary a => Binary (MarkSet a)
+#endif
+
 #if __GLASGOW_HASKELL__ < 708
 $(derive makeBinary ''RegionStyle)
 #else