From c8fce1110efdc839c0c36a604271bc64797b432d Mon Sep 17 00:00:00 2001 From: Filip Gralinski Date: Sun, 23 Aug 2015 08:14:47 +0200 Subject: [PATCH] fix module names --- app/Main.hs | 6 +++--- geval.cabal | 4 ++-- src/{GEval.hs => GEval/Core.hs} | 2 +- src/{ => GEval}/OptionsParser.hs | 4 ++-- test/Spec.hs | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename src/{GEval.hs => GEval/Core.hs} (99%) rename src/{ => GEval}/OptionsParser.hs (98%) diff --git a/app/Main.hs b/app/Main.hs index e434705..ed4a6dc 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -1,10 +1,10 @@ module Main where -import GEval -import System.Environment +import GEval.Core +import GEval.OptionsParser +import System.Environment import Options.Applicative -import OptionsParser main :: IO () main = do diff --git a/geval.cabal b/geval.cabal index cb642f2..89a2cd0 100644 --- a/geval.cabal +++ b/geval.cabal @@ -15,8 +15,8 @@ cabal-version: >=1.10 library hs-source-dirs: src - exposed-modules: GEval - , OptionsParser + exposed-modules: GEval.Core + , GEval.OptionsParser build-depends: base >= 4.7 && < 5 , cond , conduit diff --git a/src/GEval.hs b/src/GEval/Core.hs similarity index 99% rename from src/GEval.hs rename to src/GEval/Core.hs index 5f53746..13d8218 100644 --- a/src/GEval.hs +++ b/src/GEval/Core.hs @@ -1,4 +1,4 @@ -module GEval +module GEval.Core ( geval, gevalCore, Metric(..), diff --git a/src/OptionsParser.hs b/src/GEval/OptionsParser.hs similarity index 98% rename from src/OptionsParser.hs rename to src/GEval/OptionsParser.hs index c154c78..e7befd9 100644 --- a/src/OptionsParser.hs +++ b/src/GEval/OptionsParser.hs @@ -1,4 +1,4 @@ -module OptionsParser +module GEval.OptionsParser (fullOptionsParser, runGEval) where @@ -8,7 +8,7 @@ import System.FilePath import Data.Maybe import System.IO -import GEval +import GEval.Core fullOptionsParser = info (helper <*> optionsParser) (fullDesc diff --git a/test/Spec.hs b/test/Spec.hs index cbb764c..5181e59 100644 --- a/test/Spec.hs +++ b/test/Spec.hs @@ -1,7 +1,7 @@ import Test.Hspec -import GEval -import OptionsParser +import GEval.Core +import GEval.OptionsParser import Options.Applicative import qualified Test.HUnit as HU