Skip to content

Fix warnings revealed by v0.14.1 PS release #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ New features:
Bugfixes:

Other improvements:
- Removed unused names found by v0.14.1 PureScript release (#112 by @JordanMartinez)
- Installed dependencies directly imported into source code that were previously installed transitively (#112 by @JordanMartinez)

## [v6.0.0](https://github.com/purescript-contrib/purescript-parsing/releases/tag/v6.0.0) - 2021-02-26

Expand Down
5 changes: 5 additions & 0 deletions spago.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,22 @@
[ "arrays"
, "assert"
, "console"
, "control"
, "effect"
, "either"
, "foldable-traversable"
, "identity"
, "integers"
, "lists"
, "math"
, "maybe"
, "newtype"
, "prelude"
, "psci-support"
, "strings"
, "tailrec"
, "transformers"
, "tuples"
, "unicode"
]
, packages = ./packages.dhall
Expand Down
4 changes: 2 additions & 2 deletions src/Text/Parsing/Parser.purs
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ derive newtype instance monadErrorParserT :: Monad m => MonadError ParseError (P

instance altParserT :: Monad m => Alt (ParserT s m) where
alt p1 p2 = (ParserT <<< ExceptT <<< StateT) \(s@(ParseState i p _)) -> do
Tuple e s'@(ParseState i' p' c') <- runStateT (runExceptT (unwrap p1)) (ParseState i p false)
Tuple e s'@(ParseState _ _ c') <- runStateT (runExceptT (unwrap p1)) (ParseState i p false)
case e of
Left err
Left _
| not c' -> runStateT (runExceptT (unwrap p2)) s
_ -> pure (Tuple e s')

Expand Down
4 changes: 2 additions & 2 deletions src/Text/Parsing/Parser/Combinators.purs
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ skipMany p = skipMany1 p <|> pure unit
-- | Skip at least one instance of a phrase.
skipMany1 :: forall s a m. Monad m => ParserT s m a -> ParserT s m Unit
skipMany1 p = do
x <- p
xs <- skipMany p
_ <- p
_ <- skipMany p
pure unit

-- | Fail if the specified parser matches.
Expand Down
4 changes: 4 additions & 0 deletions src/Text/Parsing/Parser/Indent.purs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ module Text.Parsing.Indent
, (<*/>)
, indentOp
, (<?/>)
, indentBrackets
, indentAngles
, indentBraces
, indentParens
, Optional(..)
) where

Expand Down
2 changes: 1 addition & 1 deletion src/Text/Parsing/Parser/Token.purs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ token tokpos = do
case List.uncons input of
Nothing -> fail "Unexpected EOF"
Just { head, tail } -> do
modify_ \(ParseState _ position _) ->
modify_ \(ParseState _ _ _) ->
ParseState tail (tokpos head) true
pure head

Expand Down
2 changes: 1 addition & 1 deletion test/Main.purs
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ main = do

case runParser "aa" p of
Right _ -> assert' "error: ParseError expected!" false
Left (ParseError message pos) -> do
Left (ParseError message _) -> do
let messageExpected = "context1 context2 Expected \"b\""
assert' ("expected message: " <> messageExpected <> ", message: " <> message) (message == messageExpected)
logShow messageExpected
Expand Down