Rodrigo Mesquita pushed to branch wip/romes/hsmodulename at Glasgow Haskell Compiler / GHC

Commits:

26 changed files:

Changes:

  • compiler/GHC/Hs/Dump.hs
    ... ... @@ -23,6 +23,7 @@ import GHC.Prelude
    23 23
    24 24 
     import GHC.Hs
    25 25 
     import GHC.Unit.Module.Name (ModuleName)
    26 
    +import Language.Haskell.Syntax.Text (HsModuleName)
    26 27
    27 28 
     import GHC.Core.DataCon
    28 29
    ... ... @@ -92,7 +93,8 @@ showAstData bs ba a0 = blankLine $$ showAstData' a0
    92 93 
                   `extQ` maybe_epaLocation
    93 94 
                   `extQ` shortText
    94 95 
                   `extQ` bytestring
    95 
    -              `extQ` name `extQ` occName `extQ` moduleName `extQ` var
    96 
    +              `extQ` name `extQ` occName `extQ` moduleName `extQ` hsModuleName
    97 
    +              `extQ` var
    96 98 
                   `extQ` dataCon
    97 99 
                   `extQ` bagName `extQ` bagRdrName `extQ` bagVar `extQ` nameSet
    98 100 
                   `ext2Q` located
    ... ... @@ -205,6 +207,9 @@ showAstData bs ba a0 = blankLine $$ showAstData' a0
    205 207 
                 moduleName :: ModuleName -> SDoc
    206 208 
                 moduleName m = braces $ text "ModuleName:" <+> ppr m
    207 209
    210 
    +            hsModuleName :: HsModuleName -> SDoc
    211 
    +            hsModuleName m = braces $ text "HsModuleName:" <+> ppr m
    212 
    +
    208 213 
                 srcSpan :: SrcSpan -> SDoc
    209 214 
                 srcSpan ss = case bs of
    210 215 
                  BlankSrcSpan -> text "{ ss }"

  • testsuite/tests/count-deps/CountDepsAst.stdout
    1 1 
     Found Language.Haskell.Syntax module dependencies
    2 
    -GHC.Data.FastMutInt
    3 
    -GHC.Data.FastString
    4 
    -GHC.Data.List
    5 
    -GHC.Data.List.NonEmpty
    6 
    -GHC.Prelude.Basic
    7 
    -GHC.Settings.Config
    8 
    -GHC.Utils.Constants
    9 
    -GHC.Utils.Exception
    10 
    -GHC.Utils.Fingerprint
    11 
    -GHC.Utils.IO.Unsafe
    12 
    -GHC.Utils.Misc
    13 
    -GHC.Utils.Panic.Plain
    14 2 
     Language.Haskell.Syntax
    15 3 
     Language.Haskell.Syntax.Basic
    16 4 
     Language.Haskell.Syntax.Binds
    ... ... @@ -25,7 +13,6 @@ Language.Haskell.Syntax.Extension
    25 13 
     Language.Haskell.Syntax.ImpExp
    26 14 
     Language.Haskell.Syntax.ImpExp.IsBoot
    27 15 
     Language.Haskell.Syntax.Lit
    28 
    -Language.Haskell.Syntax.Module.Name
    29 16 
     Language.Haskell.Syntax.Pat
    30 17 
     Language.Haskell.Syntax.Specificity
    31 18 
     Language.Haskell.Syntax.Text

  • testsuite/tests/count-deps/CountDepsParser.stdout
    ... ... @@ -253,6 +253,7 @@ GHC.Unit.Module.Location
    253 253 
     GHC.Unit.Module.ModIface
    254 254 
     GHC.Unit.Module.ModNodeKey
    255 255 
     GHC.Unit.Module.ModSummary
    256 
    +GHC.Unit.Module.Name
    256 257 
     GHC.Unit.Module.Stage
    257 258 
     GHC.Unit.Module.Warnings
    258 259 
     GHC.Unit.Module.WholeCoreBindings
    ... ... @@ -300,7 +301,6 @@ Language.Haskell.Syntax.Extension
    300 301 
     Language.Haskell.Syntax.ImpExp
    301 302 
     Language.Haskell.Syntax.ImpExp.IsBoot
    302 303 
     Language.Haskell.Syntax.Lit
    303 
    -Language.Haskell.Syntax.Module.Name
    304 304 
     Language.Haskell.Syntax.Pat
    305 305 
     Language.Haskell.Syntax.Specificity
    306 306 
     Language.Haskell.Syntax.Text

  • testsuite/tests/ghc-api/exactprint/T22919.stderr
    ... ... @@ -44,7 +44,7 @@
    44 44 
          []
    45 45 
          (EpaComments
    46 46 
           []))
    47 
    -    {ModuleName: T22919}))
    47 
    +    {HsModuleName: T22919}))
    48 48 
       (Nothing)
    49 49 
       []
    50 50 
       [(L

  • testsuite/tests/ghc-api/exactprint/Test20239.stderr
    ... ... @@ -44,7 +44,7 @@
    44 44 
          []
    45 45 
          (EpaComments
    46 46 
           []))
    47 
    -    {ModuleName: Test20239}))
    47 
    +    {HsModuleName: Test20239}))
    48 48 
       (Nothing)
    49 49 
       []
    50 50 
       [(L

  • testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.stderr
    ... ... @@ -50,7 +50,7 @@
    50 50 
          []
    51 51 
          (EpaComments
    52 52 
           []))
    53 
    -    {ModuleName: ZeroWidthSemi}))
    53 
    +    {HsModuleName: ZeroWidthSemi}))
    54 54 
       (Nothing)
    55 55 
       []
    56 56 
       [(L

  • testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
    ... ... @@ -38,7 +38,7 @@
    38 38 
          []
    39 39 
          (EpaComments
    40 40 
           []))
    41 
    -    {ModuleName: T17544}))
    41 
    +    {HsModuleName: T17544}))
    42 42 
       (Nothing)
    43 43 
       []
    44 44 
       [(L

  • testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
    ... ... @@ -38,7 +38,7 @@
    38 38 
          []
    39 39 
          (EpaComments
    40 40 
           []))
    41 
    -    {ModuleName: T17544_kw}))
    41 
    +    {HsModuleName: T17544_kw}))
    42 42 
       (Just
    43 43 
        [(L
    44 44 
          (EpAnn

  • testsuite/tests/haddock/should_compile_flag_haddock/T24221.stderr
    ... ... @@ -38,7 +38,7 @@
    38 38 
          []
    39 39 
          (EpaComments
    40 40 
           []))
    41 
    -    {ModuleName: T24221}))
    41 
    +    {HsModuleName: T24221}))
    42 42 
       (Nothing)
    43 43 
       []
    44 44 
       [(L

  • testsuite/tests/module/mod185.stderr
    ... ... @@ -66,7 +66,7 @@
    66 66 
            []
    67 67 
            (EpaComments
    68 68 
             []))
    69 
    -      {ModuleName: Prelude})
    69 
    +      {HsModuleName: Prelude})
    70 70 
          (NoRawPkgQual)
    71 71 
          (NotBoot)
    72 72 
          (NotLevelled)

  • testsuite/tests/parser/should_compile/DumpParsedAst.stderr
    ... ... @@ -38,7 +38,7 @@
    38 38 
          []
    39 39 
          (EpaComments
    40 40 
           []))
    41 
    -    {ModuleName: DumpParsedAst}))
    41 
    +    {HsModuleName: DumpParsedAst}))
    42 42 
       (Nothing)
    43 43 
       [(L
    44 44 
         (EpAnn
    ... ... @@ -71,7 +71,7 @@
    71 71 
            []
    72 72 
            (EpaComments
    73 73 
             []))
    74 
    -      {ModuleName: Data.Kind})
    74 
    +      {HsModuleName: Data.Kind})
    75 75 
          (NoRawPkgQual)
    76 76 
          (NotBoot)
    77 77 
          (NotLevelled)

  • testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr
    ... ... @@ -51,7 +51,7 @@
    51 51 
          []
    52 52 
          (EpaComments
    53 53 
           []))
    54 
    -    {ModuleName: DumpParsedAstComments}))
    54 
    +    {HsModuleName: DumpParsedAstComments}))
    55 55 
       (Nothing)
    56 56 
       []
    57 57 
       [(L

  • testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
    ... ... @@ -2750,7 +2750,7 @@
    2750 2750 
            []
    2751 2751 
            (EpaComments
    2752 2752 
             []))
    2753 
    -      {ModuleName: Prelude})
    2753 
    +      {HsModuleName: Prelude})
    2754 2754 
          (NoPkgQual)
    2755 2755 
          (NotBoot)
    2756 2756 
          (NotLevelled)
    ... ... @@ -2789,7 +2789,7 @@
    2789 2789 
            []
    2790 2790 
            (EpaComments
    2791 2791 
             []))
    2792 
    -      {ModuleName: GHC.Essentials})
    2792 
    +      {HsModuleName: GHC.Essentials})
    2793 2793 
          (NoPkgQual)
    2794 2794 
          (NotBoot)
    2795 2795 
          (NotLevelled)
    ... ... @@ -2828,7 +2828,7 @@
    2828 2828 
            []
    2829 2829 
            (EpaComments
    2830 2830 
             []))
    2831 
    -      {ModuleName: Data.Kind})
    2831 
    +      {HsModuleName: Data.Kind})
    2832 2832 
          (NoPkgQual)
    2833 2833 
          (NotBoot)
    2834 2834 
          (NotLevelled)
    ... ... @@ -2867,7 +2867,7 @@
    2867 2867 
            []
    2868 2868 
            (EpaComments
    2869 2869 
             []))
    2870 
    -      {ModuleName: Data.Kind})
    2870 
    +      {HsModuleName: Data.Kind})
    2871 2871 
          (NoPkgQual)
    2872 2872 
          (NotBoot)
    2873 2873 
          (NotLevelled)

  • testsuite/tests/parser/should_compile/DumpSemis.stderr
    ... ... @@ -55,7 +55,7 @@
    55 55 
          []
    56 56 
          (EpaComments
    57 57 
           []))
    58 
    -    {ModuleName: DumpSemis}))
    58 
    +    {HsModuleName: DumpSemis}))
    59 59 
       (Nothing)
    60 60 
       [(L
    61 61 
         (EpAnn
    ... ... @@ -96,7 +96,7 @@
    96 96 
            []
    97 97 
            (EpaComments
    98 98 
             []))
    99 
    -      {ModuleName: Data.List})
    99 
    +      {HsModuleName: Data.List})
    100 100 
          (NoRawPkgQual)
    101 101 
          (NotBoot)
    102 102 
          (NotLevelled)
    ... ... @@ -146,7 +146,7 @@
    146 146 
            []
    147 147 
            (EpaComments
    148 148 
             []))
    149 
    -      {ModuleName: Data.Kind})
    149 
    +      {HsModuleName: Data.Kind})
    150 150 
          (NoRawPkgQual)
    151 151 
          (NotBoot)
    152 152 
          (NotLevelled)

  • testsuite/tests/parser/should_compile/KindSigs.stderr
    ... ... @@ -38,7 +38,7 @@
    38 38 
          []
    39 39 
          (EpaComments
    40 40 
           []))
    41 
    -    {ModuleName: KindSigs}))
    41 
    +    {HsModuleName: KindSigs}))
    42 42 
       (Nothing)
    43 43 
       [(L
    44 44 
         (EpAnn
    ... ... @@ -71,7 +71,7 @@
    71 71 
            []
    72 72 
            (EpaComments
    73 73 
             []))
    74 
    -      {ModuleName: Data.Kind})
    74 
    +      {HsModuleName: Data.Kind})
    75 75 
          (NoRawPkgQual)
    76 76 
          (NotBoot)
    77 77 
          (NotLevelled)

  • testsuite/tests/parser/should_compile/T14189.stderr
    ... ... @@ -286,7 +286,7 @@
    286 286 
            []
    287 287 
            (EpaComments
    288 288 
             []))
    289 
    -      {ModuleName: Prelude})
    289 
    +      {HsModuleName: Prelude})
    290 290 
          (NoPkgQual)
    291 291 
          (NotBoot)
    292 292 
          (NotLevelled)
    ... ... @@ -325,7 +325,7 @@
    325 325 
            []
    326 326 
            (EpaComments
    327 327 
             []))
    328 
    -      {ModuleName: GHC.Essentials})
    328 
    +      {HsModuleName: GHC.Essentials})
    329 329 
          (NoPkgQual)
    330 330 
          (NotBoot)
    331 331 
          (NotLevelled)

  • testsuite/tests/parser/should_compile/T15323.stderr
    ... ... @@ -38,7 +38,7 @@
    38 38 
          []
    39 39 
          (EpaComments
    40 40 
           []))
    41 
    -    {ModuleName: T15323}))
    41 
    +    {HsModuleName: T15323}))
    42 42 
       (Nothing)
    43 43 
       []
    44 44 
       [(L

  • testsuite/tests/parser/should_compile/T20452.stderr
    ... ... @@ -38,7 +38,7 @@
    38 38 
          []
    39 39 
          (EpaComments
    40 40 
           []))
    41 
    -    {ModuleName: T20452}))
    41 
    +    {HsModuleName: T20452}))
    42 42 
       (Nothing)
    43 43 
       []
    44 44 
       [(L

  • testsuite/tests/parser/should_compile/T20718.stderr
    ... ... @@ -78,7 +78,7 @@
    78 78 
          []
    79 79 
          (EpaComments
    80 80 
           []))
    81 
    -    {ModuleName: T20718}))
    81 
    +    {HsModuleName: T20718}))
    82 82 
       (Nothing)
    83 83 
       []
    84 84 
       [(L

  • testsuite/tests/parser/should_compile/T20718b.stderr
    ... ... @@ -65,7 +65,7 @@
    65 65 
          []
    66 66 
          (EpaComments
    67 67 
           []))
    68 
    -    {ModuleName: T20718b}))
    68 
    +    {HsModuleName: T20718b}))
    69 69 
       (Nothing)
    70 70 
       []
    71 71 
       []))

  • testsuite/tests/parser/should_compile/T20846.stderr
    ... ... @@ -38,7 +38,7 @@
    38 38 
          []
    39 39 
          (EpaComments
    40 40 
           []))
    41 
    -    {ModuleName: T20846}))
    41 
    +    {HsModuleName: T20846}))
    42 42 
       (Nothing)
    43 43 
       []
    44 44 
       [(L

  • testsuite/tests/parser/should_compile/T23315/T23315.stderr
    ... ... @@ -34,7 +34,7 @@
    34 34 
          []
    35 35 
          (EpaComments
    36 36 
           []))
    37 
    -    {ModuleName: T23315}))
    37 
    +    {HsModuleName: T23315}))
    38 38 
       (Nothing)
    39 39 
       []
    40 40 
       [(L

  • testsuite/tests/printer/AnnotationNoListTuplePuns.stdout
    ... ... @@ -57,7 +57,7 @@
    57 57 
          []
    58 58 
          (EpaComments
    59 59 
           []))
    60 
    -    {ModuleName: AnnotationNoListTuplePuns}))
    60 
    +    {HsModuleName: AnnotationNoListTuplePuns}))
    61 61 
       (Nothing)
    62 62 
       []
    63 63 
       [(L
    ... ... @@ -254,7 +254,7 @@
    254 254 
          []
    255 255 
          (EpaComments
    256 256 
           []))
    257 
    -    {ModuleName: AnnotationNoListTuplePuns}))
    257 
    +    {HsModuleName: AnnotationNoListTuplePuns}))
    258 258 
       (Nothing)
    259 259 
       []
    260 260 
       [(L

  • testsuite/tests/printer/T18791.stderr
    ... ... @@ -38,7 +38,7 @@
    38 38 
          []
    39 39 
          (EpaComments
    40 40 
           []))
    41 
    -    {ModuleName: T18791}))
    41 
    +    {HsModuleName: T18791}))
    42 42 
       (Nothing)
    43 43 
       []
    44 44 
       [(L

  • testsuite/tests/printer/Test20297.stdout
    ... ... @@ -44,7 +44,7 @@
    44 44 
          []
    45 45 
          (EpaComments
    46 46 
           []))
    47 
    -    {ModuleName: Test20297}))
    47 
    +    {HsModuleName: Test20297}))
    48 48 
       (Nothing)
    49 49 
       []
    50 50 
       [(L
    ... ... @@ -487,7 +487,7 @@
    487 487 
          []
    488 488 
          (EpaComments
    489 489 
           []))
    490 
    -    {ModuleName: Test20297}))
    490 
    +    {HsModuleName: Test20297}))
    491 491 
       (Nothing)
    492 492 
       []
    493 493 
       [(L

  • testsuite/tests/printer/Test24533.stdout
    ... ... @@ -44,7 +44,7 @@
    44 44 
          []
    45 45 
          (EpaComments
    46 46 
           []))
    47 
    -    {ModuleName: Test24533}))
    47 
    +    {HsModuleName: Test24533}))
    48 48 
       (Nothing)
    49 49 
       []
    50 50 
       [(L
    ... ... @@ -704,7 +704,7 @@
    704 704 
          []
    705 705 
          (EpaComments
    706 706 
           []))
    707 
    -    {ModuleName: Test24533}))
    707 
    +    {HsModuleName: Test24533}))
    708 708 
       (Nothing)
    709 709 
       []
    710 710 
       [(L

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications · Help Notification message regarding https://gitlab.haskell.org/ghc/ghc/-/commit/af28db5e57a7afcef7e7831309c8bf1353696a36 at 1789748213