Skip to content

Commit aec1c90

Browse files
Account for parsing breaking changes (#82)
* Account for parsing breaking changes
1 parent 260dbed commit aec1c90

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

src/Data/Formatter/DateTime.purs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import Data.Tuple (Tuple(..))
4646
import Parsing as P
4747
import Parsing.Combinators as PC
4848
import Parsing.String as PS
49+
import Parsing.String.Basic as PSB
4950

5051
data FormatterCommand
5152
= YearFull
@@ -115,7 +116,7 @@ parseFormatString = runP formatParser
115116
placeholderContent :: P.Parser String String
116117
placeholderContent =
117118
CU.toCharArray "YMDEHhamsS"
118-
# PS.noneOf
119+
# PSB.noneOf
119120
# Array.some
120121
<#> CU.fromCharArray
121122

src/Data/Formatter/Number.purs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import Data.Traversable (for)
3333
import Parsing as P
3434
import Parsing.Combinators as PC
3535
import Parsing.String as PS
36+
import Parsing.String.Basic as PSB
3637

3738
newtype Formatter = Formatter
3839
{ comma :: Boolean
@@ -191,7 +192,7 @@ unformatParser (Formatter f) = do
191192
when (Arr.length ds /= 3) do
192193
P.fail "Wrong number of digits between thousand separators"
193194

194-
sep <- PS.oneOf [ ',', '.' ]
195+
sep <- PSB.oneOf [ ',', '.' ]
195196
case sep of
196197
'.' -> pure $ accum <> ds
197198
',' -> digitsWithCommas' $ accum <> ds
@@ -213,7 +214,7 @@ unformatParser (Formatter f) = do
213214

214215
abbr <-
215216
if f.abbreviations then do
216-
letter <- PC.optionMaybe $ PC.try $ PS.oneOf [ 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y' ]
217+
letter <- PC.optionMaybe $ PC.try $ PSB.oneOf [ 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y' ]
217218
case letter of
218219
Nothing -> do
219220
e <- PC.optionMaybe $ PS.string "10e+"

src/Data/Formatter/Parser/Number.purs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import Parsing as P
1515
import Parsing.Combinators as PC
1616
import Data.Formatter.Parser.Utils (oneOfAs)
1717
import Parsing.String as PS
18+
import Parsing.String.Basic as PSB
1819
import Data.Maybe (Maybe(..))
1920
import Data.Number (fromString)
2021
import Data.Foldable (foldMap)
@@ -35,7 +36,7 @@ parseFractional = do
3536
parseNumber :: forall m. Monad m => P.ParserT String m Number
3637
parseNumber = (+)
3738
<$> (parseInteger <#> toNumber)
38-
<*> (PC.option 0.0 $ PC.try $ PS.oneOf [ '.', ',' ] *> parseFractional)
39+
<*> (PC.option 0.0 $ PC.try $ PSB.oneOf [ '.', ',' ] *> parseFractional)
3940

4041
parseDigit :: forall m. Monad m => P.ParserT String m Int
4142
parseDigit = PC.try $ PS.char `oneOfAs`

src/Data/Formatter/Parser/Utils.purs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ module Data.Formatter.Parser.Utils
66
import Prelude
77

88
import Data.Tuple (Tuple(..))
9-
import Parsing (ParserT, Parser, runParser, ParseError, parseErrorMessage, parseErrorPosition)
10-
import Parsing.Pos (Position(..))
9+
import Parsing (ParserT, Parser, Position(..), runParser, ParseError, parseErrorMessage, parseErrorPosition)
1110
import Parsing.Combinators as PC
1211
import Parsing.String as PS
1312
import Data.Bifunctor (lmap)

0 commit comments

Comments
 (0)