From 15fc8ec3327e07b74f582d62d5c326014f9dfc99 Mon Sep 17 00:00:00 2001 From: Lennart Spitzner Date: Mon, 28 Aug 2023 16:28:36 +0200 Subject: [PATCH] Add hardcoded fixity for aeson, Removing one clashing --- .../Brittany/Internal/Components/OpTree.hs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/source/library/Language/Haskell/Brittany/Internal/Components/OpTree.hs b/source/library/Language/Haskell/Brittany/Internal/Components/OpTree.hs index 9cd1edd..c87489e 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Components/OpTree.hs +++ b/source/library/Language/Haskell/Brittany/Internal/Components/OpTree.hs @@ -323,10 +323,19 @@ hardcodedFixity allowUnqualify = \case ".>" -> Just $ Fixity NoSourceText 9 InfixL ":?" -> Just $ Fixity NoSourceText 7 InfixN ":-" -> Just $ Fixity NoSourceText 9 InfixR - ".:" -> Just $ Fixity NoSourceText 9 InfixR "$!!" -> fixity InfixR 0 "<$!!>" -> fixity InfixL 4 + -- aeson + -- ".=" -> fixity InfixR 8 -- this clashes with lens :( + ".?=" -> fixity InfixR 8 + ".:" -> fixity InfixL 9 + ".:!" -> fixity InfixL 9 + ".:?" -> fixity InfixL 9 + ".!=" -> fixity InfixL 9 + ".:?=" -> fixity InfixL 9 + ".:!=" -> fixity InfixL 9 + -- lens, not complete! "<|" -> fixity InfixR 5 "|>" -> fixity InfixL 5 @@ -344,7 +353,7 @@ hardcodedFixity allowUnqualify = \case "**~" -> fixity InfixR 4 "||~" -> fixity InfixR 4 "&&~" -> fixity InfixR 4 - ".=" -> fixity InfixN 4 + -- ".=" -> fixity InfixN 4 -- this clashes with aeson :( "%=" -> fixity InfixN 4 "?=" -> fixity InfixN 4 "+=" -> fixity InfixN 4 @@ -395,8 +404,6 @@ hardcodedFixity allowUnqualify = \case "==>" -> fixity InfixR 0 "=/=" -> fixity InfixN 4 "===" -> fixity InfixN 4 - ".:!" -> fixity InfixL 9 - ".:?" -> fixity InfixL 9 -- ".:>" -> fixity _ _ -- ".:>?" -> fixity _ _ "<.>" -> fixity InfixR 7