From b0d71e3ccc675499f089d75eaaab6f7d07605141 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Tue, 7 Apr 2015 18:35:41 -0700 Subject: [PATCH] web: declare a bunch of language pragmas Makes the code more declarative, and makes building without cabal easier. --- hledger-web/Application.hs | 1 + hledger-web/Foundation.hs | 2 +- hledger-web/Handler/AddForm.hs | 2 +- hledger-web/Handler/Common.hs | 1 + hledger-web/Handler/JournalR.hs | 1 + hledger-web/Handler/RegisterR.hs | 1 + hledger-web/Handler/SidebarR.hs | 1 + hledger-web/Hledger/Web/Main.hs | 1 + hledger-web/Hledger/Web/Options.hs | 1 + hledger-web/Import.hs | 1 + hledger-web/Settings.hs | 1 + hledger-web/Settings/Development.hs | 1 + hledger-web/Settings/StaticFiles.hs | 1 + 13 files changed, 13 insertions(+), 2 deletions(-) diff --git a/hledger-web/Application.hs b/hledger-web/Application.hs index d49e888d2..10872e043 100644 --- a/hledger-web/Application.hs +++ b/hledger-web/Application.hs @@ -1,4 +1,5 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} +{-# LANGUAGE CPP, OverloadedStrings, TemplateHaskell #-} module Application ( makeApplication , getApplicationDev diff --git a/hledger-web/Foundation.hs b/hledger-web/Foundation.hs index 5201cc526..f5498ae0d 100644 --- a/hledger-web/Foundation.hs +++ b/hledger-web/Foundation.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE CPP, MultiParamTypeClasses, OverloadedStrings, RecordWildCards, QuasiQuotes, TemplateHaskell, TypeFamilies #-} {- Define the web application's foundation, in the usual Yesod style. diff --git a/hledger-web/Handler/AddForm.hs b/hledger-web/Handler/AddForm.hs index 84835967e..c64e10a7e 100644 --- a/hledger-web/Handler/AddForm.hs +++ b/hledger-web/Handler/AddForm.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE FlexibleContexts, OverloadedStrings, QuasiQuotes, RecordWildCards #-} -- | Add form data & handler. (The layout and js are defined in -- Foundation so that the add form can be in the default layout for -- all views.) diff --git a/hledger-web/Handler/Common.hs b/hledger-web/Handler/Common.hs index 9a1d06784..6d1172efc 100644 --- a/hledger-web/Handler/Common.hs +++ b/hledger-web/Handler/Common.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP, OverloadedStrings, QuasiQuotes, RecordWildCards #-} -- | Common page components and rendering helpers. -- For global page layout, see Application.hs. diff --git a/hledger-web/Handler/JournalR.hs b/hledger-web/Handler/JournalR.hs index 3284634c6..182e1e6fb 100644 --- a/hledger-web/Handler/JournalR.hs +++ b/hledger-web/Handler/JournalR.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE OverloadedStrings, QuasiQuotes, RecordWildCards #-} -- | /journal handlers. module Handler.JournalR where diff --git a/hledger-web/Handler/RegisterR.hs b/hledger-web/Handler/RegisterR.hs index 82d87b433..8fa081cd6 100644 --- a/hledger-web/Handler/RegisterR.hs +++ b/hledger-web/Handler/RegisterR.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE OverloadedStrings, QuasiQuotes, RecordWildCards #-} -- | /register handlers. module Handler.RegisterR where diff --git a/hledger-web/Handler/SidebarR.hs b/hledger-web/Handler/SidebarR.hs index 4bf97cebe..1791d9b04 100644 --- a/hledger-web/Handler/SidebarR.hs +++ b/hledger-web/Handler/SidebarR.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE OverloadedStrings, QuasiQuotes, RecordWildCards #-} -- | /sidebar module Handler.SidebarR where diff --git a/hledger-web/Hledger/Web/Main.hs b/hledger-web/Hledger/Web/Main.hs index 27a6f1ceb..222e0c893 100644 --- a/hledger-web/Hledger/Web/Main.hs +++ b/hledger-web/Hledger/Web/Main.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE OverloadedStrings #-} {-| hledger-web - a hledger add-on providing a web interface. diff --git a/hledger-web/Hledger/Web/Options.hs b/hledger-web/Hledger/Web/Options.hs index 602b89a5b..8727f217e 100644 --- a/hledger-web/Hledger/Web/Options.hs +++ b/hledger-web/Hledger/Web/Options.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} module Hledger.Web.Options where import Prelude diff --git a/hledger-web/Import.hs b/hledger-web/Import.hs index 82bbd3647..3496f6261 100644 --- a/hledger-web/Import.hs +++ b/hledger-web/Import.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} module Import ( module Import ) where diff --git a/hledger-web/Settings.hs b/hledger-web/Settings.hs index 9da7a5c4c..98bd53b92 100644 --- a/hledger-web/Settings.hs +++ b/hledger-web/Settings.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE OverloadedStrings, QuasiQuotes #-} -- | Settings are centralized, as much as possible, into this file. This -- includes database connection settings, static file locations, etc. -- In addition, you can configure a number of different aspects of Yesod diff --git a/hledger-web/Settings/Development.hs b/hledger-web/Settings/Development.hs index 73613f0b5..3d42292b5 100644 --- a/hledger-web/Settings/Development.hs +++ b/hledger-web/Settings/Development.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} module Settings.Development where import Prelude diff --git a/hledger-web/Settings/StaticFiles.hs b/hledger-web/Settings/StaticFiles.hs index 047eea8f9..505565c53 100644 --- a/hledger-web/Settings/StaticFiles.hs +++ b/hledger-web/Settings/StaticFiles.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE TemplateHaskell #-} module Settings.StaticFiles where import Prelude (IO, putStrLn, (++), (>>), return)