ghc-lib-parser-ex 8.8.5.3 → 8.8.5.4

raw patch · 7 files changed

+79/−4 lines, 7 filesPVP: minor bump suggested

API additions: PVP suggests at least a minor version bump

API changes (from Hackage documentation)

Files

• ChangeLog.md +9/−0
• ghc-lib-parser-ex.cabal +1/−1
• src/Language/Haskell/GhclibParserEx/Config.hs +4/−0
• src/Language/Haskell/GhclibParserEx/DynFlags.hs +6/−1
• src/Language/Haskell/GhclibParserEx/Fixity.hs +46/−1
• src/Language/Haskell/GhclibParserEx/Parse.hs +8/−0
• test/Test.hs +5/−1

@@ -2,6 +2,15 @@  ## Unreleased changes +## 8.8.5.4 released 2020-03-11+- Expose from `Language.Haskell.GhclibParserEx.Fixity`:+   - `preludeFixities`+   - `baseFixities`+   - `lensFixities`+   - `otherFixities`++## 0.20200301 released 2020-03-01+ ## 8.8.5.3 released 2020-02-25 - New modules:   - `Language.Haskell.GhclibParserEx.Pat`

@@ -1,6 +1,6 @@ cabal-version: >= 1.18 name:           ghc-lib-parser-ex-version:        8.8.5.3+version:        8.8.5.4 description:    Please see the README on GitHub at <https://github.com/shayne-fletcher/ghc-lib-parser-ex#readme> homepage:       https://github.com/shayne-fletcher/ghc-lib-parser-ex#readme bug-reports:    https://github.com/shayne-fletcher/ghc-lib-parser-ex/issues

@@ -12,7 +12,11 @@   where  import Config+#if defined (GHCLIB_API_811)+import GHC.Driver.Session+#else import DynFlags+#endif import Fingerprint  #if defined (GHCLIB_API_811) || defined (GHCLIB_API_810)

@@ -14,12 +14,17 @@     , parsePragmasIntoDynFlags   ) where -import DynFlags import qualified GHC.LanguageExtensions as LangExt import Panic import HeaderInfo import StringBuffer+#if defined(GHCLIB_API_811)+import GHC.Driver.Session+import GHC.Driver.Types+#else+import DynFlags import HscTypes+#endif import GHC.LanguageExtensions.Type import Data.List import Data.List.Extra

@@ -9,7 +9,10 @@ {-# LANGUAGE TupleSections #-} #include "ghclib_api.h" -module Language.Haskell.GhclibParserEx.Fixity(applyFixities) where+module Language.Haskell.GhclibParserEx.Fixity(+    applyFixities+  , preludeFixities, baseFixities, lensFixities, otherFixities+  ) where  import BasicTypes #if defined (GHCLIB_API_811) || defined (GHCLIB_API_810)@@ -163,6 +166,48 @@     , infixl_ 0 ["on"]     , infixr_ 0 ["par","pseq"]     ]++lensFixities :: [(String, Fixity)]+lensFixities = concat+    -- List as provided at https://github.com/ndmitchell/hlint/issues/416+    [infixr_ 4 ["%%@~","<%@~","%%~","<+~","<*~","<-~","<//~","<^~","<^^~","<**~"]+    ,infix_ 4 ["%%@=","<%@=","%%=","<+=","<*=","<-=","<//=","<^=","<^^=","<**="]+    ,infixr_ 2 ["<<~"]+    ,infixr_ 9 ["#."]+    ,infixl_ 8 [".#"]+    ,infixr_ 8 ["^!","^@!"]+    ,infixl_ 1 ["&","<&>","??"]+    ,infixl_ 8 ["^.","^@."]+    ,infixr_ 9 ["<.>","<.",".>"]+    ,infixr_ 4 ["%@~",".~","+~","*~","-~","//~","^~","^^~","**~","&&~","<>~","||~","%~"]+    ,infix_ 4 ["%@=",".=","+=","*=","-=","//=","^=","^^=","**=","&&=","<>=","||=","%="]+    ,infixr_ 2 ["<~"]+    ,infixr_ 2 ["`zoom`","`magnify`"]+    ,infixl_ 8 ["^..","^?","^?!","^@..","^@?","^@?!"]+    ,infixl_ 8 ["^#"]+    ,infixr_ 4 ["<#~","#~","#%~","<#%~","#%%~"]+    ,infix_ 4 ["<#=","#=","#%=","<#%=","#%%="]+    ,infixl_ 9 [":>"]+    ,infixr_ 4 ["</>~","<</>~","<.>~","<<.>~"]+    ,infix_ 4 ["</>=","<</>=","<.>=","<<.>="]+    ,infixr_ 4 [".|.~",".&.~","<.|.~","<.&.~"]+    ,infix_ 4 [".|.=",".&.=","<.|.=","<.&.="]+    ]++otherFixities :: [(String, Fixity)]+otherFixities = concat+  -- hspec+  [ infix_ 1 ["`shouldBe`","`shouldSatisfy`","`shouldStartWith`","`shouldEndWith`","`shouldContain`","`shouldMatchList`"+             ,"`shouldReturn`","`shouldNotBe`","`shouldNotSatisfy`","`shouldNotContain`","`shouldNotReturn`","`shouldThrow`"]+  -- quickcheck+  , infixr_ 0 ["==>"]+  , infix_ 4 ["==="]+  -- esqueleto+  , infix_ 4 ["==."]+  -- lattices+  , infixr_ 5 ["\\/"]+  , infixr_ 6 ["/\\"]+  ]  infixr_, infixl_, infix_ :: Int -> [String] -> [(String,Fixity)] infixr_ = fixity InfixR

@@ -30,13 +30,21 @@ #else import HsSyn #endif+#if defined (GHCLIB_API_811)+import GHC.Driver.Session+#else import DynFlags+#endif import StringBuffer import Lexer import qualified Parser import FastString import SrcLoc+#if defined (GHCLIB_API_811)+import GHC.Driver.Backpack.Syntax+#else import BkpSyn+#endif #if defined (GHCLIB_API_811) import UnitInfo #else

@@ -32,7 +32,11 @@ import HsSyn #endif import SrcLoc+#if defined (GHCLIB_API_811)+import GHC.Driver.Session+#else import DynFlags+#endif import Lexer import Outputable import ErrUtils@@ -268,7 +272,7 @@     assert' = assertBool ""     test s = exprTest s flags     flags = foldl' xopt_set (defaultDynFlags fakeSettings fakeLlvmConfig)-              [ TemplateHaskell, QuasiQuotes, TypeApplications, LambdaCase ]+              [ TemplateHaskell, TemplateHaskellQuotes, QuasiQuotes, TypeApplications, LambdaCase ]  patternPredicateTests :: TestTree patternPredicateTests = testGroup "Pattern predicate tests"