Rodrigo Mesquita pushed to branch wip/romes/hsmodulename at Glasgow Haskell Compiler / GHC Commits: af28db5e by Rodrigo Mesquita at 2026-09-18T17:16:33+01:00 test fixes - - - - - 26 changed files: - compiler/GHC/Hs/Dump.hs - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - testsuite/tests/ghc-api/exactprint/T22919.stderr - testsuite/tests/ghc-api/exactprint/Test20239.stderr - testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T24221.stderr - testsuite/tests/module/mod185.stderr - testsuite/tests/parser/should_compile/DumpParsedAst.stderr - testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr - testsuite/tests/parser/should_compile/DumpRenamedAst.stderr - testsuite/tests/parser/should_compile/DumpSemis.stderr - testsuite/tests/parser/should_compile/KindSigs.stderr - testsuite/tests/parser/should_compile/T14189.stderr - testsuite/tests/parser/should_compile/T15323.stderr - testsuite/tests/parser/should_compile/T20452.stderr - testsuite/tests/parser/should_compile/T20718.stderr - testsuite/tests/parser/should_compile/T20718b.stderr - testsuite/tests/parser/should_compile/T20846.stderr - testsuite/tests/parser/should_compile/T23315/T23315.stderr - testsuite/tests/printer/AnnotationNoListTuplePuns.stdout - testsuite/tests/printer/T18791.stderr - testsuite/tests/printer/Test20297.stdout - testsuite/tests/printer/Test24533.stdout Changes: ===================================== compiler/GHC/Hs/Dump.hs ===================================== @@ -23,6 +23,7 @@ import GHC.Prelude import GHC.Hs import GHC.Unit.Module.Name (ModuleName) +import Language.Haskell.Syntax.Text (HsModuleName) import GHC.Core.DataCon @@ -92,7 +93,8 @@ showAstData bs ba a0 = blankLine $$ showAstData' a0 `extQ` maybe_epaLocation `extQ` shortText `extQ` bytestring - `extQ` name `extQ` occName `extQ` moduleName `extQ` var + `extQ` name `extQ` occName `extQ` moduleName `extQ` hsModuleName + `extQ` var `extQ` dataCon `extQ` bagName `extQ` bagRdrName `extQ` bagVar `extQ` nameSet `ext2Q` located @@ -205,6 +207,9 @@ showAstData bs ba a0 = blankLine $$ showAstData' a0 moduleName :: ModuleName -> SDoc moduleName m = braces $ text "ModuleName:" <+> ppr m + hsModuleName :: HsModuleName -> SDoc + hsModuleName m = braces $ text "HsModuleName:" <+> ppr m + srcSpan :: SrcSpan -> SDoc srcSpan ss = case bs of BlankSrcSpan -> text "{ ss }" ===================================== testsuite/tests/count-deps/CountDepsAst.stdout ===================================== @@ -1,16 +1,4 @@ Found Language.Haskell.Syntax module dependencies -GHC.Data.FastMutInt -GHC.Data.FastString -GHC.Data.List -GHC.Data.List.NonEmpty -GHC.Prelude.Basic -GHC.Settings.Config -GHC.Utils.Constants -GHC.Utils.Exception -GHC.Utils.Fingerprint -GHC.Utils.IO.Unsafe -GHC.Utils.Misc -GHC.Utils.Panic.Plain Language.Haskell.Syntax Language.Haskell.Syntax.Basic Language.Haskell.Syntax.Binds @@ -25,7 +13,6 @@ Language.Haskell.Syntax.Extension Language.Haskell.Syntax.ImpExp Language.Haskell.Syntax.ImpExp.IsBoot Language.Haskell.Syntax.Lit -Language.Haskell.Syntax.Module.Name Language.Haskell.Syntax.Pat Language.Haskell.Syntax.Specificity Language.Haskell.Syntax.Text ===================================== testsuite/tests/count-deps/CountDepsParser.stdout ===================================== @@ -253,6 +253,7 @@ GHC.Unit.Module.Location GHC.Unit.Module.ModIface GHC.Unit.Module.ModNodeKey GHC.Unit.Module.ModSummary +GHC.Unit.Module.Name GHC.Unit.Module.Stage GHC.Unit.Module.Warnings GHC.Unit.Module.WholeCoreBindings @@ -300,7 +301,6 @@ Language.Haskell.Syntax.Extension Language.Haskell.Syntax.ImpExp Language.Haskell.Syntax.ImpExp.IsBoot Language.Haskell.Syntax.Lit -Language.Haskell.Syntax.Module.Name Language.Haskell.Syntax.Pat Language.Haskell.Syntax.Specificity Language.Haskell.Syntax.Text ===================================== testsuite/tests/ghc-api/exactprint/T22919.stderr ===================================== @@ -44,7 +44,7 @@ [] (EpaComments [])) - {ModuleName: T22919})) + {HsModuleName: T22919})) (Nothing) [] [(L ===================================== testsuite/tests/ghc-api/exactprint/Test20239.stderr ===================================== @@ -44,7 +44,7 @@ [] (EpaComments [])) - {ModuleName: Test20239})) + {HsModuleName: Test20239})) (Nothing) [] [(L ===================================== testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.stderr ===================================== @@ -50,7 +50,7 @@ [] (EpaComments [])) - {ModuleName: ZeroWidthSemi})) + {HsModuleName: ZeroWidthSemi})) (Nothing) [] [(L ===================================== testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr ===================================== @@ -38,7 +38,7 @@ [] (EpaComments [])) - {ModuleName: T17544})) + {HsModuleName: T17544})) (Nothing) [] [(L ===================================== testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr ===================================== @@ -38,7 +38,7 @@ [] (EpaComments [])) - {ModuleName: T17544_kw})) + {HsModuleName: T17544_kw})) (Just [(L (EpAnn ===================================== testsuite/tests/haddock/should_compile_flag_haddock/T24221.stderr ===================================== @@ -38,7 +38,7 @@ [] (EpaComments [])) - {ModuleName: T24221})) + {HsModuleName: T24221})) (Nothing) [] [(L ===================================== testsuite/tests/module/mod185.stderr ===================================== @@ -66,7 +66,7 @@ [] (EpaComments [])) - {ModuleName: Prelude}) + {HsModuleName: Prelude}) (NoRawPkgQual) (NotBoot) (NotLevelled) ===================================== testsuite/tests/parser/should_compile/DumpParsedAst.stderr ===================================== @@ -38,7 +38,7 @@ [] (EpaComments [])) - {ModuleName: DumpParsedAst})) + {HsModuleName: DumpParsedAst})) (Nothing) [(L (EpAnn @@ -71,7 +71,7 @@ [] (EpaComments [])) - {ModuleName: Data.Kind}) + {HsModuleName: Data.Kind}) (NoRawPkgQual) (NotBoot) (NotLevelled) ===================================== testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr ===================================== @@ -51,7 +51,7 @@ [] (EpaComments [])) - {ModuleName: DumpParsedAstComments})) + {HsModuleName: DumpParsedAstComments})) (Nothing) [] [(L ===================================== testsuite/tests/parser/should_compile/DumpRenamedAst.stderr ===================================== @@ -2750,7 +2750,7 @@ [] (EpaComments [])) - {ModuleName: Prelude}) + {HsModuleName: Prelude}) (NoPkgQual) (NotBoot) (NotLevelled) @@ -2789,7 +2789,7 @@ [] (EpaComments [])) - {ModuleName: GHC.Essentials}) + {HsModuleName: GHC.Essentials}) (NoPkgQual) (NotBoot) (NotLevelled) @@ -2828,7 +2828,7 @@ [] (EpaComments [])) - {ModuleName: Data.Kind}) + {HsModuleName: Data.Kind}) (NoPkgQual) (NotBoot) (NotLevelled) @@ -2867,7 +2867,7 @@ [] (EpaComments [])) - {ModuleName: Data.Kind}) + {HsModuleName: Data.Kind}) (NoPkgQual) (NotBoot) (NotLevelled) ===================================== testsuite/tests/parser/should_compile/DumpSemis.stderr ===================================== @@ -55,7 +55,7 @@ [] (EpaComments [])) - {ModuleName: DumpSemis})) + {HsModuleName: DumpSemis})) (Nothing) [(L (EpAnn @@ -96,7 +96,7 @@ [] (EpaComments [])) - {ModuleName: Data.List}) + {HsModuleName: Data.List}) (NoRawPkgQual) (NotBoot) (NotLevelled) @@ -146,7 +146,7 @@ [] (EpaComments [])) - {ModuleName: Data.Kind}) + {HsModuleName: Data.Kind}) (NoRawPkgQual) (NotBoot) (NotLevelled) ===================================== testsuite/tests/parser/should_compile/KindSigs.stderr ===================================== @@ -38,7 +38,7 @@ [] (EpaComments [])) - {ModuleName: KindSigs})) + {HsModuleName: KindSigs})) (Nothing) [(L (EpAnn @@ -71,7 +71,7 @@ [] (EpaComments [])) - {ModuleName: Data.Kind}) + {HsModuleName: Data.Kind}) (NoRawPkgQual) (NotBoot) (NotLevelled) ===================================== testsuite/tests/parser/should_compile/T14189.stderr ===================================== @@ -286,7 +286,7 @@ [] (EpaComments [])) - {ModuleName: Prelude}) + {HsModuleName: Prelude}) (NoPkgQual) (NotBoot) (NotLevelled) @@ -325,7 +325,7 @@ [] (EpaComments [])) - {ModuleName: GHC.Essentials}) + {HsModuleName: GHC.Essentials}) (NoPkgQual) (NotBoot) (NotLevelled) ===================================== testsuite/tests/parser/should_compile/T15323.stderr ===================================== @@ -38,7 +38,7 @@ [] (EpaComments [])) - {ModuleName: T15323})) + {HsModuleName: T15323})) (Nothing) [] [(L ===================================== testsuite/tests/parser/should_compile/T20452.stderr ===================================== @@ -38,7 +38,7 @@ [] (EpaComments [])) - {ModuleName: T20452})) + {HsModuleName: T20452})) (Nothing) [] [(L ===================================== testsuite/tests/parser/should_compile/T20718.stderr ===================================== @@ -78,7 +78,7 @@ [] (EpaComments [])) - {ModuleName: T20718})) + {HsModuleName: T20718})) (Nothing) [] [(L ===================================== testsuite/tests/parser/should_compile/T20718b.stderr ===================================== @@ -65,7 +65,7 @@ [] (EpaComments [])) - {ModuleName: T20718b})) + {HsModuleName: T20718b})) (Nothing) [] [])) ===================================== testsuite/tests/parser/should_compile/T20846.stderr ===================================== @@ -38,7 +38,7 @@ [] (EpaComments [])) - {ModuleName: T20846})) + {HsModuleName: T20846})) (Nothing) [] [(L ===================================== testsuite/tests/parser/should_compile/T23315/T23315.stderr ===================================== @@ -34,7 +34,7 @@ [] (EpaComments [])) - {ModuleName: T23315})) + {HsModuleName: T23315})) (Nothing) [] [(L ===================================== testsuite/tests/printer/AnnotationNoListTuplePuns.stdout ===================================== @@ -57,7 +57,7 @@ [] (EpaComments [])) - {ModuleName: AnnotationNoListTuplePuns})) + {HsModuleName: AnnotationNoListTuplePuns})) (Nothing) [] [(L @@ -254,7 +254,7 @@ [] (EpaComments [])) - {ModuleName: AnnotationNoListTuplePuns})) + {HsModuleName: AnnotationNoListTuplePuns})) (Nothing) [] [(L ===================================== testsuite/tests/printer/T18791.stderr ===================================== @@ -38,7 +38,7 @@ [] (EpaComments [])) - {ModuleName: T18791})) + {HsModuleName: T18791})) (Nothing) [] [(L ===================================== testsuite/tests/printer/Test20297.stdout ===================================== @@ -44,7 +44,7 @@ [] (EpaComments [])) - {ModuleName: Test20297})) + {HsModuleName: Test20297})) (Nothing) [] [(L @@ -487,7 +487,7 @@ [] (EpaComments [])) - {ModuleName: Test20297})) + {HsModuleName: Test20297})) (Nothing) [] [(L ===================================== testsuite/tests/printer/Test24533.stdout ===================================== @@ -44,7 +44,7 @@ [] (EpaComments [])) - {ModuleName: Test24533})) + {HsModuleName: Test24533})) (Nothing) [] [(L @@ -704,7 +704,7 @@ [] (EpaComments [])) - {ModuleName: Test24533})) + {HsModuleName: Test24533})) (Nothing) [] [(L View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/af28db5e57a7afcef7e7831309c8bf13... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/af28db5e57a7afcef7e7831309c8bf13... You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help