Skip to content

Implement tryAhead and fix docs #86

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 3 commits into from
Mar 7, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ New features:
Bugfixes:
- Do not export `chainl'` and `chainr'` helper functions (#84 by @chtenb)
- Issue #69: Fix regex parser to always wrap pattern inside `^(..)` (#80 by @chtenb)
- Issue #73: lookAhead consumes input on failure. Introduce `tryAhead` and correct documentation for `lookAhead` (#86 by @chtenb)

Other improvements:
- Added `purs-tidy` formatter (#76 by @thomashoneyman)
Expand Down
9 changes: 0 additions & 9 deletions src/Text/Parsing/StringParser.purs
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,6 @@ instance lazyParser :: Lazy (Parser a) where
fail :: forall a. String -> Parser a
fail error = Parser \{ position } -> Left { pos: position, error }

-- | In case of error, the default behavior is to backtrack if no input was consumed.
-- |
-- | `try p` backtracks even if input was consumed.
try :: forall a. Parser a -> Parser a
try (Parser p) = Parser \s ->
case p s of
Left { error } -> Left { pos: s.position, error }
right -> right

instance semigroupParser :: Semigroup a => Semigroup (Parser a) where
append = lift2 append

Expand Down
4 changes: 2 additions & 2 deletions src/Text/Parsing/StringParser/CodePoints.purs
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import Data.String.CodePoints as SCP
import Data.String.CodeUnits as SCU
import Data.String.Regex as Regex
import Data.String.Regex.Flags (noFlags)
import Text.Parsing.StringParser (Parser(..), try, fail)
import Text.Parsing.StringParser.Combinators (many, (<?>))
import Text.Parsing.StringParser (Parser(..), fail)
import Text.Parsing.StringParser.Combinators (try, many, (<?>))
import Text.Parsing.StringParser.CodeUnits as CodeUnitsParser

-- | Match the end of the file.
Expand Down
4 changes: 2 additions & 2 deletions src/Text/Parsing/StringParser/CodeUnits.purs
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import Data.String.CodeUnits (charAt, singleton)
import Data.String.CodeUnits as SCU
import Data.String.Regex as Regex
import Data.String.Regex.Flags (noFlags)
import Text.Parsing.StringParser (Parser(..), try, fail)
import Text.Parsing.StringParser.Combinators (many, (<?>))
import Text.Parsing.StringParser (Parser(..), fail)
import Text.Parsing.StringParser.Combinators (try, many, (<?>))

-- | Match the end of the file.
eof :: Parser Unit
Expand Down
21 changes: 18 additions & 3 deletions src/Text/Parsing/StringParser/Combinators.purs
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
-- | This module defines combinators for building string parsers.
module Text.Parsing.StringParser.Combinators
( many
( try
, lookAhead
, tryAhead
, many
, many1
, withError
, (<?>)
Expand All @@ -21,7 +24,6 @@ module Text.Parsing.StringParser.Combinators
, choice
, manyTill
, many1Till
, lookAhead
, module Control.Lazy
) where

Expand All @@ -39,13 +41,26 @@ import Data.Maybe (Maybe(..))
import Data.NonEmpty ((:|))
import Text.Parsing.StringParser (Parser(..), fail)

-- | Read ahead without consuming input.
-- | `try p` means: run `p` but do not consume input in case of failure.
try :: forall a. Parser a -> Parser a
try (Parser p) = Parser \s ->
case p s of
Left { error } -> Left { pos: s.position, error }
right -> right

-- | `lookAhead p` means: run `p` but do not consume input in case of success.
-- | In most cases you will probably want to use `tryAhead` instead.
lookAhead :: forall a. Parser a -> Parser a
lookAhead (Parser p) = Parser \s ->
case p s of
Right { result } -> Right { result, suffix: s }
left -> left

-- | Read ahead without consuming input.
-- | `tryAhead p` means: succeed if what comes next is of the form `p`; fail otherwise.
tryAhead :: forall a. Parser a -> Parser a
tryAhead = try <<< lookAhead

-- | Match zero or more times.
many :: forall a. Parser a -> Parser (List a)
many = manyRec
Expand Down
10 changes: 7 additions & 3 deletions test/BasicSpecs.purs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import Data.Traversable (traverse)
import Effect (Effect)
import Effect.Class.Console (log)
import Test.Assert (assert')
import Text.Parsing.StringParser (Parser, runParser, try)
import Text.Parsing.StringParser (Parser, runParser)
import Text.Parsing.StringParser.CodePoints (anyChar, anyDigit, anyLetter, char, eof, skipSpaces, string)
import Text.Parsing.StringParser.Combinators (between, chainl, chainl1, endBy, endBy1, lookAhead, many, many1, manyTill, sepBy, sepBy1, sepEndBy, sepEndBy1)
import Text.Parsing.StringParser.Combinators (try, tryAhead, between, chainl, chainl1, endBy, endBy1, lookAhead, many, many1, manyTill, sepBy, sepBy1, sepEndBy, sepEndBy1)

type TestInputs = { successes :: Array String, failures :: Array String }
type TestCase = { name :: String, parser :: AnyParser, inputs :: TestInputs }
Expand Down Expand Up @@ -57,7 +57,11 @@ testCases =
}
, { name: "lookAhead"
, parser: mkAnyParser $ lookAhead (char 'a') *> anyLetter
, inputs: { successes: [ "a" ], failures: [ "", "b" ] }
, inputs: { successes: [ "a" ], failures: [ "", "b", "ab" ] }
}
, { name: "tryAhead"
, parser: mkAnyParser $ tryAhead (char 'a' *> anyDigit) *> (anyChar *> anyChar) <|> (anyDigit *> anyDigit)
, inputs: { successes: [ "a6", "66" ], failures: [ "", "b", "-", "6", "aa", "a6aa", "aa66" ] }
}
, { name: "many"
, parser: mkAnyParser $ many (char 'a')
Expand Down
4 changes: 2 additions & 2 deletions test/CodePoints.purs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import Data.Unfoldable (replicate)
import Effect (Effect)
import Effect.Class.Console (log)
import Test.Assert (assert', assert)
import Text.Parsing.StringParser (ParseError, Parser(..), PosString, runParser, try)
import Text.Parsing.StringParser (ParseError, Parser(..), PosString, runParser)
import Text.Parsing.StringParser.CodePoints (anyDigit, char, eof, string, anyChar, regex)
import Text.Parsing.StringParser.Combinators (many1, endBy1, sepBy1, optionMaybe, many, manyTill, many1Till, chainl, fix, between)
import Text.Parsing.StringParser.Combinators (try, many1, endBy1, sepBy1, optionMaybe, many, manyTill, many1Till, chainl, fix, between)
import Text.Parsing.StringParser.Expr (Assoc(..), Operator(..), buildExprParser)

parens :: forall a. Parser a -> Parser a
Expand Down
4 changes: 2 additions & 2 deletions test/CodeUnits.purs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import Data.Unfoldable (replicate)
import Effect (Effect)
import Effect.Class.Console (log)
import Test.Assert (assert', assert)
import Text.Parsing.StringParser (Parser, runParser, try)
import Text.Parsing.StringParser (Parser, runParser)
import Text.Parsing.StringParser.CodeUnits (anyDigit, eof, string, anyChar, regex)
import Text.Parsing.StringParser.Combinators (many1, endBy1, sepBy1, optionMaybe, many, manyTill, many1Till, chainl, fix, between)
import Text.Parsing.StringParser.Combinators (try, many1, endBy1, sepBy1, optionMaybe, many, manyTill, many1Till, chainl, fix, between)
import Text.Parsing.StringParser.Expr (Assoc(..), Operator(..), buildExprParser)

parens :: forall a. Parser a -> Parser a
Expand Down