diff --git a/hledger-lib/Hledger/Read/Common.hs b/hledger-lib/Hledger/Read/Common.hs index a897d59f4..b680320cd 100644 --- a/hledger-lib/Hledger/Read/Common.hs +++ b/hledger-lib/Hledger/Read/Common.hs @@ -114,10 +114,10 @@ import System.Time (getClockTime) import Text.Megaparsec import Text.Megaparsec.Char import Text.Megaparsec.Char.Lexer (decimal) +import Text.Megaparsec.Custom import Hledger.Data import Hledger.Utils -import Hledger.Utils.ParseErrors import qualified Hledger.Query as Q (Query(Any)) -- | A hledger journal reader is a triple of storage format name, a diff --git a/hledger-lib/Hledger/Read/JournalReader.hs b/hledger-lib/Hledger/Read/JournalReader.hs index c961ad71b..3d09adeca 100644 --- a/hledger-lib/Hledger/Read/JournalReader.hs +++ b/hledger-lib/Hledger/Read/JournalReader.hs @@ -90,6 +90,7 @@ import Text.Megaparsec.Error #endif import Text.Megaparsec hiding (parse) import Text.Megaparsec.Char +import Text.Megaparsec.Custom import Text.Printf import System.FilePath @@ -98,7 +99,6 @@ import Hledger.Read.Common import Hledger.Read.TimeclockReader (timeclockfilep) import Hledger.Read.TimedotReader (timedotfilep) import Hledger.Utils -import Hledger.Utils.ParseErrors -- $setup -- >>> :set -XOverloadedStrings diff --git a/hledger-lib/Hledger/Utils/Parse.hs b/hledger-lib/Hledger/Utils/Parse.hs index 250b9f251..a60a3d44c 100644 --- a/hledger-lib/Hledger/Utils/Parse.hs +++ b/hledger-lib/Hledger/Utils/Parse.hs @@ -34,10 +34,10 @@ import Data.List import Data.Text (Text) import Text.Megaparsec import Text.Megaparsec.Char +import Text.Megaparsec.Custom import Text.Printf import Hledger.Data.Types -import Hledger.Utils.ParseErrors import Hledger.Utils.UTF8IOCompat (error') -- | A parser of string to some type. diff --git a/hledger-lib/Hledger/Utils/ParseErrors.hs b/hledger-lib/Text/Megaparsec/Custom.hs similarity index 99% rename from hledger-lib/Hledger/Utils/ParseErrors.hs rename to hledger-lib/Text/Megaparsec/Custom.hs index 86eb777a5..5dce6f785 100644 --- a/hledger-lib/Hledger/Utils/ParseErrors.hs +++ b/hledger-lib/Text/Megaparsec/Custom.hs @@ -5,7 +5,7 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE StandaloneDeriving #-} -module Hledger.Utils.ParseErrors ( +module Text.Megaparsec.Custom ( -- * Custom parse error type CustomErr, diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index 3171cf60a..b5c36be9c 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -2,7 +2,7 @@ -- -- see: https://github.com/sol/hpack -- --- hash: 86a93717a2fa0b215398b09da43e823e40cbf65bdd62a40ef0473549b2d5900c +-- hash: b808d840bfd7de5e860adb6ac41ec6bcee061cebcff87b4a1b87d2a46c58b0bf name: hledger-lib version: 1.9.99 @@ -95,7 +95,7 @@ library Hledger.Utils.UTF8IOCompat Text.Tabular.AsciiWide other-modules: - Hledger.Utils.ParseErrors + Text.Megaparsec.Custom Paths_hledger_lib hs-source-dirs: ./. @@ -182,13 +182,13 @@ test-suite doctests Hledger.Utils.Color Hledger.Utils.Debug Hledger.Utils.Parse - Hledger.Utils.ParseErrors Hledger.Utils.Regex Hledger.Utils.String Hledger.Utils.Test Hledger.Utils.Text Hledger.Utils.Tree Hledger.Utils.UTF8IOCompat + Text.Megaparsec.Custom Text.Tabular.AsciiWide Paths_hledger_lib hs-source-dirs: @@ -279,13 +279,13 @@ test-suite easytests Hledger.Utils.Color Hledger.Utils.Debug Hledger.Utils.Parse - Hledger.Utils.ParseErrors Hledger.Utils.Regex Hledger.Utils.String Hledger.Utils.Test Hledger.Utils.Text Hledger.Utils.Tree Hledger.Utils.UTF8IOCompat + Text.Megaparsec.Custom Text.Tabular.AsciiWide Paths_hledger_lib hs-source-dirs: @@ -376,13 +376,13 @@ test-suite hunittests Hledger.Utils.Color Hledger.Utils.Debug Hledger.Utils.Parse - Hledger.Utils.ParseErrors Hledger.Utils.Regex Hledger.Utils.String Hledger.Utils.Test Hledger.Utils.Text Hledger.Utils.Tree Hledger.Utils.UTF8IOCompat + Text.Megaparsec.Custom Text.Tabular.AsciiWide Paths_hledger_lib hs-source-dirs: