diff --git a/app/MimaRun/Main.hs b/app/MimaRun/Main.hs index 6894481..f178c56 100644 --- a/app/MimaRun/Main.hs +++ b/app/MimaRun/Main.hs @@ -9,7 +9,7 @@ import System.FilePath import Mima.Flag import Mima.IO import Mima.Load -import Mima.Parser.FlagFile +import Mima.Parse.FlagFile import Mima.State import Mima.Util import Mima.Word diff --git a/src/Mima/IO.hs b/src/Mima/IO.hs index 6ddde71..6aa0482 100644 --- a/src/Mima/IO.hs +++ b/src/Mima/IO.hs @@ -16,7 +16,7 @@ import qualified Data.Text.IO as T import System.IO.Error import Text.Megaparsec -import Mima.Parser.Common +import Mima.Parse.Common type Run a = ExceptT String IO a diff --git a/src/Mima/Parser/Common.hs b/src/Mima/Parse/Common.hs similarity index 99% rename from src/Mima/Parser/Common.hs rename to src/Mima/Parse/Common.hs index 1aadef0..a782bff 100644 --- a/src/Mima/Parser/Common.hs +++ b/src/Mima/Parse/Common.hs @@ -1,4 +1,4 @@ -module Mima.Parser.Common +module Mima.Parse.Common ( Parser -- * Basic parsers , whitespace @@ -17,10 +17,10 @@ module Mima.Parser.Common ) where import Data.Char +import qualified Data.Set as Set import qualified Data.Text as T import Data.Void import Text.Megaparsec -import qualified Data.Set as Set import Mima.Word diff --git a/src/Mima/Parser/FlagFile.hs b/src/Mima/Parse/FlagFile.hs similarity index 93% rename from src/Mima/Parser/FlagFile.hs rename to src/Mima/Parse/FlagFile.hs index 2cb14d0..05dd1c7 100644 --- a/src/Mima/Parser/FlagFile.hs +++ b/src/Mima/Parse/FlagFile.hs @@ -1,6 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} -module Mima.Parser.FlagFile +module Mima.Parse.FlagFile ( parseFlagFile ) where @@ -11,8 +11,8 @@ import qualified Data.Set as Set import Text.Megaparsec import Mima.Flag -import Mima.Parser.Common -import Mima.Parser.Lexeme +import Mima.Parse.Common +import Mima.Parse.Lexeme import Mima.Word lAddress :: Parser MimaAddress diff --git a/src/Mima/Parser/Lexeme.hs b/src/Mima/Parse/Lexeme.hs similarity index 90% rename from src/Mima/Parser/Lexeme.hs rename to src/Mima/Parse/Lexeme.hs index edd11c8..aee8fc2 100644 --- a/src/Mima/Parser/Lexeme.hs +++ b/src/Mima/Parse/Lexeme.hs @@ -1,4 +1,4 @@ -module Mima.Parser.Lexeme +module Mima.Parse.Lexeme ( space , lexeme , symbol @@ -12,7 +12,7 @@ import Text.Megaparsec import qualified Text.Megaparsec.Char as C import qualified Text.Megaparsec.Char.Lexer as L -import Mima.Parser.Common +import Mima.Parse.Common space :: Parser () space = L.space (void whitespace) empty empty