From 341ee99c5d3e9874322f50623587c9064d6867e7 Mon Sep 17 00:00:00 2001 From: Pascal Hof Date: Tue, 12 Dec 2017 10:37:34 +0100 Subject: [PATCH] Hide IORef in Reader monad #11 --- src/gui/Language/Astview/Gui/Init.hs | 5 +++++ src/gui/Language/Astview/Gui/Types.hs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gui/Language/Astview/Gui/Init.hs b/src/gui/Language/Astview/Gui/Init.hs index e4c6fb9..626b6e0 100644 --- a/src/gui/Language/Astview/Gui/Init.hs +++ b/src/gui/Language/Astview/Gui/Init.hs @@ -13,6 +13,11 @@ import Control.Monad.Reader import Control.Monad.Trans (liftIO) import Data.IORef +<<<<<<< 34651e0375c21059d8f26f0aea7afa4ce62f5f74 +======= + + +>>>>>>> Hide IORef in Reader monad #11 import Graphics.UI.Gtk hiding (Language) import Graphics.UI.Gtk.SourceView diff --git a/src/gui/Language/Astview/Gui/Types.hs b/src/gui/Language/Astview/Gui/Types.hs index 54f1eb0..cbfdeac 100644 --- a/src/gui/Language/Astview/Gui/Types.hs +++ b/src/gui/Language/Astview/Gui/Types.hs @@ -67,7 +67,7 @@ data GUI = GUI } --- * getter functions +-- * getAstStateter functions mkLabels [ ''AstState , ''Options