[Git][ghc/ghc][wip/ttg/types/basic] The ast has shifted around a little but this should be fine.
Hassan Al-Awwadi (@hassan.awwadi)
gitlab at gitlab.haskell.org
Tue Oct 29 18:02:15 UTC 2024
Hassan Al-Awwadi pushed to branch wip/ttg/types/basic at Glasgow Haskell Compiler / GHC
Commits:
de0fe228 by Hassan Al-Awwadi at 2024-10-29T19:00:17+01:00
The ast has shifted around a little but this should be fine.
- - - - -
6 changed files:
- testsuite/tests/count-deps/CountDepsAst.stdout
- testsuite/tests/count-deps/CountDepsParser.stdout
- testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
- testsuite/tests/parser/should_compile/DumpParsedAst.stderr
- testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
- testsuite/tests/parser/should_compile/KindSigs.stderr
Changes:
=====================================
testsuite/tests/count-deps/CountDepsAst.stdout
=====================================
@@ -100,8 +100,10 @@ GHC.Hs.DocString
GHC.Hs.Expr
GHC.Hs.Extension
GHC.Hs.ImpExp
+GHC.Hs.InlinePragma
GHC.Hs.Instances
GHC.Hs.Lit
+GHC.Hs.OverlapPragma
GHC.Hs.Pat
GHC.Hs.Specificity
GHC.Hs.Type
@@ -238,8 +240,10 @@ Language.Haskell.Syntax.Decls
Language.Haskell.Syntax.Expr
Language.Haskell.Syntax.Extension
Language.Haskell.Syntax.ImpExp
+Language.Haskell.Syntax.InlinePragma
Language.Haskell.Syntax.Lit
Language.Haskell.Syntax.Module.Name
+Language.Haskell.Syntax.OverlapPragma
Language.Haskell.Syntax.Pat
Language.Haskell.Syntax.Specificity
Language.Haskell.Syntax.Type
=====================================
testsuite/tests/count-deps/CountDepsParser.stdout
=====================================
@@ -103,8 +103,10 @@ GHC.Hs.DocString
GHC.Hs.Expr
GHC.Hs.Extension
GHC.Hs.ImpExp
+GHC.Hs.InlinePragma
GHC.Hs.Instances
GHC.Hs.Lit
+GHC.Hs.OverlapPragma
GHC.Hs.Pat
GHC.Hs.Specificity
GHC.Hs.Type
@@ -262,8 +264,10 @@ Language.Haskell.Syntax.Decls
Language.Haskell.Syntax.Expr
Language.Haskell.Syntax.Extension
Language.Haskell.Syntax.ImpExp
+Language.Haskell.Syntax.InlinePragma
Language.Haskell.Syntax.Lit
Language.Haskell.Syntax.Module.Name
+Language.Haskell.Syntax.OverlapPragma
Language.Haskell.Syntax.Pat
Language.Haskell.Syntax.Specificity
Language.Haskell.Syntax.Type
=====================================
testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
=====================================
@@ -891,22 +891,23 @@
(EpaComments
[]))
(FamilyDecl
- (AnnFamilyDecl
- []
- []
- (NoEpTok)
- (EpTok
- (EpaSpan { T17544.hs:22:20-23 }))
- (NoEpTok)
- (NoEpUniTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok))
+ ((,)
+ (AnnFamilyDecl
+ []
+ []
+ (NoEpTok)
+ (EpTok
+ (EpaSpan { T17544.hs:22:20-23 }))
+ (NoEpTok)
+ (NoEpUniTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok))
+ (NotTopLevel))
(DataFamily)
- (NotTopLevel)
(L
(EpAnn
(EpaSpan { T17544.hs:22:25-26 })
@@ -1273,22 +1274,23 @@
(EpaComments
[]))
(FamilyDecl
- (AnnFamilyDecl
- []
- []
- (NoEpTok)
- (EpTok
- (EpaSpan { T17544.hs:28:20-23 }))
- (NoEpTok)
- (NoEpUniTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok))
+ ((,)
+ (AnnFamilyDecl
+ []
+ []
+ (NoEpTok)
+ (EpTok
+ (EpaSpan { T17544.hs:28:20-23 }))
+ (NoEpTok)
+ (NoEpUniTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok))
+ (NotTopLevel))
(DataFamily)
- (NotTopLevel)
(L
(EpAnn
(EpaSpan { T17544.hs:28:25-26 })
@@ -1655,22 +1657,23 @@
(EpaComments
[]))
(FamilyDecl
- (AnnFamilyDecl
- []
- []
- (NoEpTok)
- (EpTok
- (EpaSpan { T17544.hs:34:20-23 }))
- (NoEpTok)
- (NoEpUniTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok))
+ ((,)
+ (AnnFamilyDecl
+ []
+ []
+ (NoEpTok)
+ (EpTok
+ (EpaSpan { T17544.hs:34:20-23 }))
+ (NoEpTok)
+ (NoEpUniTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok))
+ (NotTopLevel))
(DataFamily)
- (NotTopLevel)
(L
(EpAnn
(EpaSpan { T17544.hs:34:25-26 })
@@ -2037,22 +2040,23 @@
(EpaComments
[]))
(FamilyDecl
- (AnnFamilyDecl
- []
- []
- (NoEpTok)
- (EpTok
- (EpaSpan { T17544.hs:40:20-23 }))
- (NoEpTok)
- (NoEpUniTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok))
+ ((,)
+ (AnnFamilyDecl
+ []
+ []
+ (NoEpTok)
+ (EpTok
+ (EpaSpan { T17544.hs:40:20-23 }))
+ (NoEpTok)
+ (NoEpUniTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok))
+ (NotTopLevel))
(DataFamily)
- (NotTopLevel)
(L
(EpAnn
(EpaSpan { T17544.hs:40:25-26 })
@@ -2419,22 +2423,23 @@
(EpaComments
[]))
(FamilyDecl
- (AnnFamilyDecl
- []
- []
- (NoEpTok)
- (EpTok
- (EpaSpan { T17544.hs:46:20-23 }))
- (NoEpTok)
- (NoEpUniTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok))
+ ((,)
+ (AnnFamilyDecl
+ []
+ []
+ (NoEpTok)
+ (EpTok
+ (EpaSpan { T17544.hs:46:20-23 }))
+ (NoEpTok)
+ (NoEpUniTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok))
+ (NotTopLevel))
(DataFamily)
- (NotTopLevel)
(L
(EpAnn
(EpaSpan { T17544.hs:46:25-26 })
@@ -2801,22 +2806,23 @@
(EpaComments
[]))
(FamilyDecl
- (AnnFamilyDecl
- []
- []
- (NoEpTok)
- (EpTok
- (EpaSpan { T17544.hs:52:21-24 }))
- (NoEpTok)
- (NoEpUniTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok))
+ ((,)
+ (AnnFamilyDecl
+ []
+ []
+ (NoEpTok)
+ (EpTok
+ (EpaSpan { T17544.hs:52:21-24 }))
+ (NoEpTok)
+ (NoEpUniTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok))
+ (NotTopLevel))
(DataFamily)
- (NotTopLevel)
(L
(EpAnn
(EpaSpan { T17544.hs:52:26-28 })
=====================================
testsuite/tests/parser/should_compile/DumpParsedAst.stderr
=====================================
@@ -308,24 +308,26 @@
(FamDecl
(NoExtField)
(FamilyDecl
- (AnnFamilyDecl
- []
- []
- (EpTok
- (EpaSpan { DumpParsedAst.hs:10:1-4 }))
- (NoEpTok)
- (EpTok
- (EpaSpan { DumpParsedAst.hs:10:6-11 }))
- (EpUniTok
- (EpaSpan { DumpParsedAst.hs:10:32-33 })
- (NormalSyntax))
- (NoEpTok)
- (NoEpTok)
- (EpTok
- (EpaSpan { DumpParsedAst.hs:10:41-45 }))
- (NoEpTok)
- (NoEpTok)
- (NoEpTok))
+ ((,)
+ (AnnFamilyDecl
+ []
+ []
+ (EpTok
+ (EpaSpan { DumpParsedAst.hs:10:1-4 }))
+ (NoEpTok)
+ (EpTok
+ (EpaSpan { DumpParsedAst.hs:10:6-11 }))
+ (EpUniTok
+ (EpaSpan { DumpParsedAst.hs:10:32-33 })
+ (NormalSyntax))
+ (NoEpTok)
+ (NoEpTok)
+ (EpTok
+ (EpaSpan { DumpParsedAst.hs:10:41-45 }))
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok))
+ (TopLevel))
(ClosedTypeFamily
(Just
[(L
@@ -576,7 +578,6 @@
[]))
(Unqual
{OccName: Zero}))))))]))
- (TopLevel)
(L
(EpAnn
(EpaSpan { DumpParsedAst.hs:10:13-18 })
@@ -1067,24 +1068,26 @@
(FamDecl
(NoExtField)
(FamilyDecl
- (AnnFamilyDecl
- []
- []
- (EpTok
- (EpaSpan { DumpParsedAst.hs:18:1-4 }))
- (NoEpTok)
- (EpTok
- (EpaSpan { DumpParsedAst.hs:18:6-11 }))
- (EpUniTok
- (EpaSpan { DumpParsedAst.hs:18:42-43 })
- (NormalSyntax))
- (NoEpTok)
- (NoEpTok)
- (EpTok
- (EpaSpan { DumpParsedAst.hs:18:50-54 }))
- (NoEpTok)
- (NoEpTok)
- (NoEpTok))
+ ((,)
+ (AnnFamilyDecl
+ []
+ []
+ (EpTok
+ (EpaSpan { DumpParsedAst.hs:18:1-4 }))
+ (NoEpTok)
+ (EpTok
+ (EpaSpan { DumpParsedAst.hs:18:6-11 }))
+ (EpUniTok
+ (EpaSpan { DumpParsedAst.hs:18:42-43 })
+ (NormalSyntax))
+ (NoEpTok)
+ (NoEpTok)
+ (EpTok
+ (EpaSpan { DumpParsedAst.hs:18:50-54 }))
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok))
+ (TopLevel))
(ClosedTypeFamily
(Just
[(L
@@ -1280,7 +1283,6 @@
[]))
(Unqual
{OccName: a}))))))))]))
- (TopLevel)
(L
(EpAnn
(EpaSpan { DumpParsedAst.hs:18:13-14 })
@@ -1463,25 +1465,26 @@
(FamDecl
(NoExtField)
(FamilyDecl
- (AnnFamilyDecl
- []
- []
- (NoEpTok)
- (EpTok
- (EpaSpan { DumpParsedAst.hs:21:1-4 }))
- (EpTok
- (EpaSpan { DumpParsedAst.hs:21:6-11 }))
- (EpUniTok
- (EpaSpan { DumpParsedAst.hs:21:17-18 })
- (NormalSyntax))
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok))
+ ((,)
+ (AnnFamilyDecl
+ []
+ []
+ (NoEpTok)
+ (EpTok
+ (EpaSpan { DumpParsedAst.hs:21:1-4 }))
+ (EpTok
+ (EpaSpan { DumpParsedAst.hs:21:6-11 }))
+ (EpUniTok
+ (EpaSpan { DumpParsedAst.hs:21:17-18 })
+ (NormalSyntax))
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok))
+ (TopLevel))
(DataFamily)
- (TopLevel)
(L
(EpAnn
(EpaSpan { DumpParsedAst.hs:21:13-15 })
=====================================
testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
=====================================
@@ -257,19 +257,21 @@
(FamDecl
(NoExtField)
(FamilyDecl
- (AnnFamilyDecl
- []
- []
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpUniTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok))
+ ((,)
+ (AnnFamilyDecl
+ []
+ []
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpUniTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok))
+ (TopLevel))
(ClosedTypeFamily
(Just
[(L
@@ -500,7 +502,6 @@
(EpaComments
[]))
{Name: DumpRenamedAst.Zero})))))]))
- (TopLevel)
(L
(EpAnn
(EpaSpan { DumpRenamedAst.hs:12:13-18 })
@@ -699,21 +700,22 @@
(FamDecl
(NoExtField)
(FamilyDecl
- (AnnFamilyDecl
- []
- []
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpUniTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok))
+ ((,)
+ (AnnFamilyDecl
+ []
+ []
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpUniTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok))
+ (TopLevel))
(DataFamily)
- (TopLevel)
(L
(EpAnn
(EpaSpan { DumpRenamedAst.hs:16:13-15 })
@@ -1513,19 +1515,21 @@
(FamDecl
(NoExtField)
(FamilyDecl
- (AnnFamilyDecl
- []
- []
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpUniTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok))
+ ((,)
+ (AnnFamilyDecl
+ []
+ []
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpUniTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok))
+ (TopLevel))
(ClosedTypeFamily
(Just
[(L
@@ -1711,7 +1715,6 @@
(EpaComments
[]))
{Name: a})))))))]))
- (TopLevel)
(L
(EpAnn
(EpaSpan { DumpRenamedAst.hs:25:13-14 })
@@ -2081,21 +2084,22 @@
(EpaComments
[]))
(FamilyDecl
- (AnnFamilyDecl
- []
- []
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpUniTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok)
- (NoEpTok))
+ ((,)
+ (AnnFamilyDecl
+ []
+ []
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpUniTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok))
+ (NotTopLevel))
(OpenTypeFamily)
- (NotTopLevel)
(L
(EpAnn
(EpaSpan { DumpRenamedAst.hs:29:8 })
=====================================
testsuite/tests/parser/should_compile/KindSigs.stderr
=====================================
@@ -84,22 +84,24 @@
(FamDecl
(NoExtField)
(FamilyDecl
- (AnnFamilyDecl
- []
- []
- (EpTok
- (EpaSpan { KindSigs.hs:11:1-4 }))
- (NoEpTok)
- (EpTok
- (EpaSpan { KindSigs.hs:11:6-11 }))
- (NoEpUniTok)
- (NoEpTok)
- (NoEpTok)
- (EpTok
- (EpaSpan { KindSigs.hs:11:19-23 }))
- (NoEpTok)
- (NoEpTok)
- (NoEpTok))
+ ((,)
+ (AnnFamilyDecl
+ []
+ []
+ (EpTok
+ (EpaSpan { KindSigs.hs:11:1-4 }))
+ (NoEpTok)
+ (EpTok
+ (EpaSpan { KindSigs.hs:11:6-11 }))
+ (NoEpUniTok)
+ (NoEpTok)
+ (NoEpTok)
+ (EpTok
+ (EpaSpan { KindSigs.hs:11:19-23 }))
+ (NoEpTok)
+ (NoEpTok)
+ (NoEpTok))
+ (TopLevel))
(ClosedTypeFamily
(Just
[(L
@@ -197,7 +199,6 @@
[]))
(Unqual
{OccName: Type}))))))))]))
- (TopLevel)
(L
(EpAnn
(EpaSpan { KindSigs.hs:11:13-15 })
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/de0fe2285f14335d710273a2e441672a00430d30
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/de0fe2285f14335d710273a2e441672a00430d30
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/20241029/0843daa6/attachment-0001.html>
More information about the ghc-commits
mailing list