lib: move custom parse errors to Text.Megaparsec.Custom
This commit is contained in:
		
							parent
							
								
									846a38139d
								
							
						
					
					
						commit
						0382bb5cd4
					
				| @ -114,10 +114,10 @@ import System.Time (getClockTime) | |||||||
| import Text.Megaparsec | import Text.Megaparsec | ||||||
| import Text.Megaparsec.Char | import Text.Megaparsec.Char | ||||||
| import Text.Megaparsec.Char.Lexer (decimal) | import Text.Megaparsec.Char.Lexer (decimal) | ||||||
|  | import Text.Megaparsec.Custom | ||||||
| 
 | 
 | ||||||
| import Hledger.Data | import Hledger.Data | ||||||
| import Hledger.Utils | import Hledger.Utils | ||||||
| import Hledger.Utils.ParseErrors |  | ||||||
| import qualified Hledger.Query as Q (Query(Any)) | import qualified Hledger.Query as Q (Query(Any)) | ||||||
| 
 | 
 | ||||||
| -- | A hledger journal reader is a triple of storage format name, a | -- | A hledger journal reader is a triple of storage format name, a | ||||||
|  | |||||||
| @ -90,6 +90,7 @@ import Text.Megaparsec.Error | |||||||
| #endif | #endif | ||||||
| import Text.Megaparsec hiding (parse) | import Text.Megaparsec hiding (parse) | ||||||
| import Text.Megaparsec.Char | import Text.Megaparsec.Char | ||||||
|  | import Text.Megaparsec.Custom | ||||||
| import Text.Printf | import Text.Printf | ||||||
| import System.FilePath | import System.FilePath | ||||||
| 
 | 
 | ||||||
| @ -98,7 +99,6 @@ import Hledger.Read.Common | |||||||
| import Hledger.Read.TimeclockReader (timeclockfilep) | import Hledger.Read.TimeclockReader (timeclockfilep) | ||||||
| import Hledger.Read.TimedotReader (timedotfilep) | import Hledger.Read.TimedotReader (timedotfilep) | ||||||
| import Hledger.Utils | import Hledger.Utils | ||||||
| import Hledger.Utils.ParseErrors |  | ||||||
| 
 | 
 | ||||||
| -- $setup | -- $setup | ||||||
| -- >>> :set -XOverloadedStrings | -- >>> :set -XOverloadedStrings | ||||||
|  | |||||||
| @ -34,10 +34,10 @@ import Data.List | |||||||
| import Data.Text (Text) | import Data.Text (Text) | ||||||
| import Text.Megaparsec | import Text.Megaparsec | ||||||
| import Text.Megaparsec.Char | import Text.Megaparsec.Char | ||||||
|  | import Text.Megaparsec.Custom | ||||||
| import Text.Printf | import Text.Printf | ||||||
| 
 | 
 | ||||||
| import Hledger.Data.Types | import Hledger.Data.Types | ||||||
| import Hledger.Utils.ParseErrors |  | ||||||
| import Hledger.Utils.UTF8IOCompat (error') | import Hledger.Utils.UTF8IOCompat (error') | ||||||
| 
 | 
 | ||||||
| -- | A parser of string to some type. | -- | A parser of string to some type. | ||||||
|  | |||||||
| @ -5,7 +5,7 @@ | |||||||
| {-# LANGUAGE ScopedTypeVariables #-} | {-# LANGUAGE ScopedTypeVariables #-} | ||||||
| {-# LANGUAGE StandaloneDeriving #-} | {-# LANGUAGE StandaloneDeriving #-} | ||||||
| 
 | 
 | ||||||
| module Hledger.Utils.ParseErrors ( | module Text.Megaparsec.Custom ( | ||||||
|   -- * Custom parse error type |   -- * Custom parse error type | ||||||
|   CustomErr, |   CustomErr, | ||||||
| 
 | 
 | ||||||
| @ -2,7 +2,7 @@ | |||||||
| -- | -- | ||||||
| -- see: https://github.com/sol/hpack | -- see: https://github.com/sol/hpack | ||||||
| -- | -- | ||||||
| -- hash: 86a93717a2fa0b215398b09da43e823e40cbf65bdd62a40ef0473549b2d5900c | -- hash: b808d840bfd7de5e860adb6ac41ec6bcee061cebcff87b4a1b87d2a46c58b0bf | ||||||
| 
 | 
 | ||||||
| name:           hledger-lib | name:           hledger-lib | ||||||
| version:        1.9.99 | version:        1.9.99 | ||||||
| @ -95,7 +95,7 @@ library | |||||||
|       Hledger.Utils.UTF8IOCompat |       Hledger.Utils.UTF8IOCompat | ||||||
|       Text.Tabular.AsciiWide |       Text.Tabular.AsciiWide | ||||||
|   other-modules: |   other-modules: | ||||||
|       Hledger.Utils.ParseErrors |       Text.Megaparsec.Custom | ||||||
|       Paths_hledger_lib |       Paths_hledger_lib | ||||||
|   hs-source-dirs: |   hs-source-dirs: | ||||||
|       ./. |       ./. | ||||||
| @ -182,13 +182,13 @@ test-suite doctests | |||||||
|       Hledger.Utils.Color |       Hledger.Utils.Color | ||||||
|       Hledger.Utils.Debug |       Hledger.Utils.Debug | ||||||
|       Hledger.Utils.Parse |       Hledger.Utils.Parse | ||||||
|       Hledger.Utils.ParseErrors |  | ||||||
|       Hledger.Utils.Regex |       Hledger.Utils.Regex | ||||||
|       Hledger.Utils.String |       Hledger.Utils.String | ||||||
|       Hledger.Utils.Test |       Hledger.Utils.Test | ||||||
|       Hledger.Utils.Text |       Hledger.Utils.Text | ||||||
|       Hledger.Utils.Tree |       Hledger.Utils.Tree | ||||||
|       Hledger.Utils.UTF8IOCompat |       Hledger.Utils.UTF8IOCompat | ||||||
|  |       Text.Megaparsec.Custom | ||||||
|       Text.Tabular.AsciiWide |       Text.Tabular.AsciiWide | ||||||
|       Paths_hledger_lib |       Paths_hledger_lib | ||||||
|   hs-source-dirs: |   hs-source-dirs: | ||||||
| @ -279,13 +279,13 @@ test-suite easytests | |||||||
|       Hledger.Utils.Color |       Hledger.Utils.Color | ||||||
|       Hledger.Utils.Debug |       Hledger.Utils.Debug | ||||||
|       Hledger.Utils.Parse |       Hledger.Utils.Parse | ||||||
|       Hledger.Utils.ParseErrors |  | ||||||
|       Hledger.Utils.Regex |       Hledger.Utils.Regex | ||||||
|       Hledger.Utils.String |       Hledger.Utils.String | ||||||
|       Hledger.Utils.Test |       Hledger.Utils.Test | ||||||
|       Hledger.Utils.Text |       Hledger.Utils.Text | ||||||
|       Hledger.Utils.Tree |       Hledger.Utils.Tree | ||||||
|       Hledger.Utils.UTF8IOCompat |       Hledger.Utils.UTF8IOCompat | ||||||
|  |       Text.Megaparsec.Custom | ||||||
|       Text.Tabular.AsciiWide |       Text.Tabular.AsciiWide | ||||||
|       Paths_hledger_lib |       Paths_hledger_lib | ||||||
|   hs-source-dirs: |   hs-source-dirs: | ||||||
| @ -376,13 +376,13 @@ test-suite hunittests | |||||||
|       Hledger.Utils.Color |       Hledger.Utils.Color | ||||||
|       Hledger.Utils.Debug |       Hledger.Utils.Debug | ||||||
|       Hledger.Utils.Parse |       Hledger.Utils.Parse | ||||||
|       Hledger.Utils.ParseErrors |  | ||||||
|       Hledger.Utils.Regex |       Hledger.Utils.Regex | ||||||
|       Hledger.Utils.String |       Hledger.Utils.String | ||||||
|       Hledger.Utils.Test |       Hledger.Utils.Test | ||||||
|       Hledger.Utils.Text |       Hledger.Utils.Text | ||||||
|       Hledger.Utils.Tree |       Hledger.Utils.Tree | ||||||
|       Hledger.Utils.UTF8IOCompat |       Hledger.Utils.UTF8IOCompat | ||||||
|  |       Text.Megaparsec.Custom | ||||||
|       Text.Tabular.AsciiWide |       Text.Tabular.AsciiWide | ||||||
|       Paths_hledger_lib |       Paths_hledger_lib | ||||||
|   hs-source-dirs: |   hs-source-dirs: | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user