Skip to content

Fix other <|> breakage #164

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.

Sign up for GitHub

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 17 commits into from
Mar 24, 2022
Merged

Fix other <|> breakage #164

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
53365b7
Add test for all error variants
JordanMartinez Mar 24, 2022
005a89e
Make other variants infixr
JordanMartinez Mar 24, 2022
5ca65e8
Drop <?> prec back to 3
JordanMartinez Mar 24, 2022
4718120
Update changelog
JordanMartinez Mar 24, 2022
7ca3990
Bust CI cache
JordanMartinez Mar 24, 2022
f2c146f
Add combinator test for operators
JordanMartinez Mar 24, 2022
c586fe0
Fix conflicting prec issues
JordanMartinez Mar 24, 2022
92e772d
Update entry
JordanMartinez Mar 24, 2022
e812875
Deduplicate tests by using oneOf
JordanMartinez Mar 24, 2022
dfa0775
Operator combos galore!
JordanMartinez Mar 24, 2022
748c422
Fix last few tests
JordanMartinez Mar 24, 2022
d065674
Fix formatting... ew...
JordanMartinez Mar 24, 2022
8409f81
Add operators table for purs-tidy
JordanMartinez Mar 24, 2022
851dfea
Rerun formatter
JordanMartinez Mar 24, 2022
52e462b
Undo formatting changes
JordanMartinez Mar 24, 2022
10e4133
Fix tidy operators table
JordanMartinez Mar 24, 2022
5e81788
Rerun formatter
JordanMartinez Mar 24, 2022
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
27 changes: 15 additions & 12 deletions src/Text/Parsing/Parser/Token.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,9 +460,10 @@ makeTokenParser (LanguageDef languageDef) =
folder (Just c) chars = Cons c chars

stringChar :: ParserT String m (Maybe Char)
stringChar = (Just <$> stringLetter)
<|> stringEscape
<?> "string character"
stringChar =
(Just <$> stringLetter)
<|> stringEscape
<?> "string character"

stringLetter :: ParserT String m Char
stringLetter = satisfy (\c -> (c /= '"') && (c /= '\\') && (c > '\x1A'))
Expand Down Expand Up @@ -860,21 +861,23 @@ inComment langDef@(LanguageDef languageDef) =

inCommentMulti :: forall m. Monad m => GenLanguageDef String m -> ParserT String m Unit
inCommentMulti langDef@(LanguageDef languageDef) =
fix \p -> (void $ try (string languageDef.commentEnd))
<|> (multiLineComment langDef *> p)
<|> (skipMany1 (noneOf startEnd) *> p)
<|> (oneOf startEnd *> p)
<?> "end of comment"
fix \p ->
(void $ try (string languageDef.commentEnd))
<|> (multiLineComment langDef *> p)
<|> (skipMany1 (noneOf startEnd) *> p)
<|> (oneOf startEnd *> p)
<?> "end of comment"
where
startEnd :: Array Char
startEnd = SCU.toCharArray languageDef.commentEnd <> SCU.toCharArray languageDef.commentStart

inCommentSingle :: forall m. Monad m => GenLanguageDef String m -> ParserT String m Unit
inCommentSingle (LanguageDef languageDef) =
fix \p -> (void $ try (string languageDef.commentEnd))
<|> (skipMany1 (noneOf startEnd) *> p)
<|> (oneOf startEnd *> p)
<?> "end of comment"
fix \p ->
(void $ try (string languageDef.commentEnd))
<|> (skipMany1 (noneOf startEnd) *> p)
<|> (oneOf startEnd *> p)
<?> "end of comment"
where
startEnd :: Array Char
startEnd = SCU.toCharArray languageDef.commentEnd <> SCU.toCharArray languageDef.commentStart
Expand Down
78 changes: 49 additions & 29 deletions test/Main.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,17 +156,20 @@ stackSafeLoopsTest = do
""
(Position { line: 1, column: 1 })

parseTest "aaaabcd" "b" $
skipMany1Rec (string "a") *> string "b"
parseTest "aaaabcd" "b"
$ skipMany1Rec (string "a")
*> string "b"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happened here?

parseErrorTestPosition
(skipMany1Rec (string "a"))
"bcd"
(Position { line: 1, column: 1 })

parseTest "aaaabcd" "b" $
skipManyRec (string "a") *> string "b"
parseTest "bcd" "b" $
skipManyRec (string "a") *> string "b"
parseTest "aaaabcd" "b"
$ skipManyRec (string "a")
*> string "b"
parseTest "bcd" "b"
$ skipManyRec (string "a")
*> string "b"

parseTest "aaa" (NE.cons' "a" $ toUnfoldable [ "a", "a" ]) $
many1Rec (string "a")
Expand All @@ -175,12 +178,15 @@ stackSafeLoopsTest = do
""
(Position { line: 1, column: 1 })

parseTest "a,a,ab" (toUnfoldable [ "a", "a", "a" ]) $
sepByRec (string "a") (string ",") <* string "b"
parseTest "b" Nil $
sepByRec (string "a") (string ",") <* string "b"
parseTest "a,a,ab" (NE.cons' "a" $ toUnfoldable [ "a", "a" ]) $
sepBy1Rec (string "a") (string ",") <* string "b"
parseTest "a,a,ab" (toUnfoldable [ "a", "a", "a" ])
$ sepByRec (string "a") (string ",")
<* string "b"
parseTest "b" Nil
$ sepByRec (string "a") (string ",")
<* string "b"
parseTest "a,a,ab" (NE.cons' "a" $ toUnfoldable [ "a", "a" ])
$ sepBy1Rec (string "a") (string ",")
<* string "b"
parseErrorTestPosition
(sepBy1Rec (string "a") (string ","))
""
Expand All @@ -190,12 +196,15 @@ stackSafeLoopsTest = do
"a,"
(Position { line: 1, column: 3 })

parseTest "a,a,a,b" (toUnfoldable [ "a", "a", "a" ]) $
endByRec (string "a") (string ",") <* string "b"
parseTest "b" Nil $
endByRec (string "a") (string ",") <* string "b"
parseTest "a,a,a,b" (NE.cons' "a" $ toUnfoldable [ "a", "a" ]) $
endBy1Rec (string "a") (string ",") <* string "b"
parseTest "a,a,a,b" (toUnfoldable [ "a", "a", "a" ])
$ endByRec (string "a") (string ",")
<* string "b"
parseTest "b" Nil
$ endByRec (string "a") (string ",")
<* string "b"
parseTest "a,a,a,b" (NE.cons' "a" $ toUnfoldable [ "a", "a" ])
$ endBy1Rec (string "a") (string ",")
<* string "b"
parseErrorTestPosition
(endBy1Rec (string "a") (string ","))
""
Expand Down Expand Up @@ -680,10 +689,13 @@ main = do
, string " " <?> "1"
, string " " <|> string " " <?> "2"
, string " " <?> "3" <|> string " " <?> "4"
, "" <$ string " " <?> "5"
<|> string " " $> ""
, "" <$ string " "
<?> "5"
<|> string " "
$> ""
<?> "6"
<|> const "" <$> string " "
<|> const ""
<$> string " "
<?> "7"
<* string " "
$> ""
Expand All @@ -695,21 +707,29 @@ main = do
, string " " <~?> \_ -> "21"
, string " " <|> string " " <~?> \_ -> "22"
, string " " <~?> (\_ -> "23") <|> string " " <~?> \_ -> "24"
, "" <$ string " " <~?> (\_ -> "25")
<|> string " " $> "" <~?> (\_ -> "26")
<|> const "" <$> string " " <~?> (\_ -> "27")
, "" <$ string " "
<~?> (\_ -> "25")
<|> string " "
$> ""
<~?> (\_ -> "26")
<|> const ""
<$> string " "
<~?> (\_ -> "27")
<* string " "
$> "" <~?> (\_ -> "28")
$> ""
<~?> (\_ -> "28")
*> string " "
$> "" <~?> \_ -> "29"
$> ""
<~?> \_ -> "29"
, fail "test <??>"
, "41" <??> string " "
, "42" <??> string " " <|> string " "
, "43" <??> string " " <|> "44" <??> string " "
, "45" <??> "" <$ string " "
<|> "46"
, "45"
<??> "" <$ string " "
<|> "46"
<??> string " " $> ""
<|> "47"
<|> "47"
<??> const "" <$> string " "
<* ("48" <??> string " ")
*> ("49" <??> string " ")
Expand Down