[Git][ghc/ghc][wip/romes/ttg-prune-2] Fixed tests

[Dominik Peteler (@mmhat)]

Dominik Peteler pushed to branch wip/romes/ttg-prune-2 at Glasgow Haskell Compiler / GHC


Commits:
ae314b77 by Dominik Peteler at 2022-08-20T23:51:53+02:00
Fixed tests

- - - - -


4 changed files:

- compiler/ghc.cabal.in
- testsuite/tests/count-deps/CountDepsAst.stdout
- testsuite/tests/count-deps/CountDepsParser.stdout
- utils/check-exact/ExactPrint.hs


Changes:

=====================================
compiler/ghc.cabal.in
=====================================
@@ -438,6 +438,7 @@ Library
         GHC.Driver.Ppr
         GHC.Driver.Session
         GHC.Hs
+        GHC.Hs.Basic
         GHC.Hs.Binds
         GHC.Hs.Decls
         GHC.Hs.Doc


=====================================
testsuite/tests/count-deps/CountDepsAst.stdout
=====================================
@@ -111,6 +111,7 @@ GHC.Driver.Plugins
 GHC.Driver.Ppr
 GHC.Driver.Session
 GHC.Hs
+GHC.Hs.Basic
 GHC.Hs.Binds
 GHC.Hs.Decls
 GHC.Hs.Doc


=====================================
testsuite/tests/count-deps/CountDepsParser.stdout
=====================================
@@ -112,6 +112,7 @@ GHC.Driver.Plugins
 GHC.Driver.Ppr
 GHC.Driver.Session
 GHC.Hs
+GHC.Hs.Basic
 GHC.Hs.Binds
 GHC.Hs.Decls
 GHC.Hs.Doc


=====================================
utils/check-exact/ExactPrint.hs
=====================================
@@ -28,7 +28,6 @@ import GHC.Data.Bag
 import qualified GHC.Data.BooleanFormula as BF
 import GHC.Data.FastString
 import GHC.Types.Basic hiding (EP)
-import GHC.Types.Fixity
 import GHC.Types.ForeignCall
 import GHC.Types.SourceText
 import GHC.Types.PkgQual
@@ -39,6 +38,8 @@ import GHC.Utils.Misc
 import GHC.Utils.Panic
 import GHC.TypeLits
 
+import Language.Haskell.Syntax.Basic
+
 import Control.Monad.Identity
 import Control.Monad.RWS
 import Data.Data ( Data )
@@ -2294,16 +2295,16 @@ instance ExactPrint (HsCmdTop GhcPs) where
 -- ---------------------------------------------------------------------
 
 instance ExactPrint (HsCmd GhcPs) where
-  getAnnotationEntry (HsCmdArrApp an _ _ _ _)   = fromAnn an
-  getAnnotationEntry (HsCmdArrForm an _ _ _ _ ) = fromAnn an
-  getAnnotationEntry (HsCmdApp an _ _ )         = fromAnn an
-  getAnnotationEntry (HsCmdLam {})              = NoEntryVal
-  getAnnotationEntry (HsCmdPar an _ _ _)        = fromAnn an
-  getAnnotationEntry (HsCmdCase an _ _)         = fromAnn an
-  getAnnotationEntry (HsCmdLamCase an _ _)      = fromAnn an
-  getAnnotationEntry (HsCmdIf an _ _ _ _)       = fromAnn an
-  getAnnotationEntry (HsCmdLet an _ _ _ _)      = fromAnn an
-  getAnnotationEntry (HsCmdDo an _)             = fromAnn an
+  getAnnotationEntry (HsCmdArrApp an _ _ _ _) = fromAnn an
+  getAnnotationEntry (HsCmdArrForm an _ _ _ ) = fromAnn an
+  getAnnotationEntry (HsCmdApp an _ _ )       = fromAnn an
+  getAnnotationEntry (HsCmdLam {})            = NoEntryVal
+  getAnnotationEntry (HsCmdPar an _ _ _)      = fromAnn an
+  getAnnotationEntry (HsCmdCase an _ _)       = fromAnn an
+  getAnnotationEntry (HsCmdLamCase an _ _)    = fromAnn an
+  getAnnotationEntry (HsCmdIf an _ _ _ _)     = fromAnn an
+  getAnnotationEntry (HsCmdLet an _ _ _ _)    = fromAnn an
+  getAnnotationEntry (HsCmdDo an _)           = fromAnn an
 
 
 
@@ -2318,7 +2319,7 @@ instance ExactPrint (HsCmd GhcPs) where
         markKw (anns an)
         markAnnotated arr
 
-  exact (HsCmdArrForm an e fixity _mf cs) = do
+  exact (HsCmdArrForm an e fixity cs) = do
     markLocatedMAA an al_open
     case (fixity, cs) of
       (Infix, (arg1:argrest)) -> do



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ae314b77a14dc3ee9e4859cfcd75083fe645f838

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ae314b77a14dc3ee9e4859cfcd75083fe645f838
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20220820/7d4dcfea/attachment-0001.html>