From 441f8ae16f08d1f7af11f0a1d29335481e34a004 Mon Sep 17 00:00:00 2001 From: Nathan Faubion Date: Sat, 2 Apr 2022 18:03:45 -0700 Subject: [PATCH] Fix tidyoperators precedence --- .tidyoperators | 26 +++++++++++++------------- src/Parsing/Token.purs | 2 +- test/Main.purs | 16 ++++++++-------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.tidyoperators b/.tidyoperators index 778d286..cb29eb3 100644 --- a/.tidyoperators +++ b/.tidyoperators @@ -186,6 +186,19 @@ Data.Semiring.(+) 6 Data.Tuple.Nested.(/\) type 6 Data.Tuple.Nested.(/\) 6 Math.(%) 7 +Parsing.Indent.(<*/>) 11 +Parsing.Indent.(<+/>) 9 +Parsing.Indent.(<-/>) 10 +Parsing.Indent.() 12 +Parsing.Combinators.($>) 4 +Parsing.Combinators.(<#>) 1 +Parsing.Combinators.(<$) 4 +Parsing.Combinators.(<$>) 4 +Parsing.Combinators.() 4 +Parsing.Combinators.() 3 +Parsing.Combinators.(<@>) 4 +Parsing.Combinators.(<|>) 3 +Parsing.Combinators.(<~?>) 4 Prelude.(~>) type 4 Prelude.(#) 1 Prelude.($) 0 @@ -216,16 +229,3 @@ Prelude.(>=>) 1 Prelude.(>>=) 1 Prelude.(>>>) 9 Prelude.(||) 2 -Text.Parsing.Indent.(<*/>) 11 -Text.Parsing.Indent.(<+/>) 9 -Text.Parsing.Indent.(<-/>) 10 -Text.Parsing.Indent.() 12 -Text.Parsing.Parser.Combinators.($>) 4 -Text.Parsing.Parser.Combinators.(<#>) 1 -Text.Parsing.Parser.Combinators.(<$) 4 -Text.Parsing.Parser.Combinators.(<$>) 4 -Text.Parsing.Parser.Combinators.() 4 -Text.Parsing.Parser.Combinators.() 3 -Text.Parsing.Parser.Combinators.(<@>) 4 -Text.Parsing.Parser.Combinators.(<|>) 3 -Text.Parsing.Parser.Combinators.(<~?>) 4 diff --git a/src/Parsing/Token.purs b/src/Parsing/Token.purs index 6d92497..3cde359 100644 --- a/src/Parsing/Token.purs +++ b/src/Parsing/Token.purs @@ -688,7 +688,7 @@ makeTokenParser (LanguageDef languageDef) = zeroNumber = char '0' *> (hexadecimal <|> octal <|> decimal <|> pure 0) - "" + "" decimal :: ParserT String m Int decimal = number 10 Basic.digit diff --git a/test/Main.purs b/test/Main.purs index f3c7738..cd1ca41 100644 --- a/test/Main.purs +++ b/test/Main.purs @@ -694,10 +694,10 @@ main = do <|> const "" <$> string " " "7" <* string " " $> "" - "8" + "8" *> string " " $> "" - "9" + "9" , fail "test <~?>" , string " " <~?> \_ -> "21" , string " " <|> string " " <~?> \_ -> "22" @@ -707,10 +707,10 @@ main = do <|> const "" <$> string " " <~?> (\_ -> "27") <* string " " $> "" - <~?> (\_ -> "28") + <~?> (\_ -> "28") *> string " " $> "" - <~?> \_ -> "29" + <~?> \_ -> "29" , fail "test " , "41" string " " , "42" string " " <|> string " " @@ -718,12 +718,12 @@ main = do , "45" "" <$ string " " <|> "46" - string " " $> "" + string " " $> "" <|> "47" - const "" <$> string " " - <* ("48" string " ") - *> ("49" string " ") + const "" <$> string " " + <* ("48" string " ") + *> ("49" string " ") ] ) "no"