summaryrefslogtreecommitdiff
path: root/testsuite/tests
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2017-11-21 14:28:58 -0500
committerBen Gamari <ben@smart-cactus.org>2017-11-21 16:36:43 -0500
commit314bc31489f1f4cd69e913c3b1e33236b2bdf553 (patch)
treeb960f9b02ec06f9d61df019f53655b4e53847bd7 /testsuite/tests
parent0b20d9c51d627febab34b826fccf522ca8bac323 (diff)
downloadhaskell-314bc31489f1f4cd69e913c3b1e33236b2bdf553.tar.gz
Revert "trees that grow" work
As documented in #14490, the Data instances currently blow up compilation time by too much to stomach. Alan will continue working on this in a branch and we will perhaps merge to 8.2 before 8.2.1 to avoid having to perform painful cherry-picks in 8.2 minor releases. Reverts haddock submodule. This reverts commit 47ad6578ea460999b53eb4293c3a3b3017a56d65. This reverts commit e3ec2e7ae94524ebd111963faf34b84d942265b4. This reverts commit 438dd1cbba13d35f3452b4dcef3f94ce9a216905. This reverts commit 0ff152c9e633accca48815e26e59d1af1fe44ceb.
Diffstat (limited to 'testsuite/tests')
-rw-r--r--testsuite/tests/ghc-api/annotations/parseTree.hs6
-rw-r--r--testsuite/tests/ghc-api/annotations/stringSource.hs6
-rw-r--r--testsuite/tests/ghc-api/annotations/t11430.hs2
-rw-r--r--testsuite/tests/parser/should_compile/DumpParsedAst.stderr36
-rw-r--r--testsuite/tests/parser/should_compile/DumpRenamedAst.stderr142
-rw-r--r--testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr73
-rw-r--r--testsuite/tests/parser/should_compile/T14189.stderr13
-rw-r--r--testsuite/tests/perf/haddock/all.T5
-rw-r--r--testsuite/tests/quasiquotation/T7918.hs6
9 files changed, 61 insertions, 228 deletions
diff --git a/testsuite/tests/ghc-api/annotations/parseTree.hs b/testsuite/tests/ghc-api/annotations/parseTree.hs
index b04be775c3..3a8a29abd4 100644
--- a/testsuite/tests/ghc-api/annotations/parseTree.hs
+++ b/testsuite/tests/ghc-api/annotations/parseTree.hs
@@ -51,10 +51,8 @@ testOneFile libdir fileName = do
gq ast = everything (++) ([] `mkQ` doLHsTupArg) ast
doLHsTupArg :: LHsTupArg GhcPs -> [(SrcSpan,String,HsExpr GhcPs)]
- doLHsTupArg (L l arg@(Present {}))
- = [(l,"p",ExplicitTuple noExt [L l arg] Boxed)]
- doLHsTupArg (L l arg@(Missing {}))
- = [(l,"m",ExplicitTuple noExt [L l arg] Boxed)]
+ doLHsTupArg (L l arg@(Present _)) = [(l,"p",ExplicitTuple [L l arg] Boxed)]
+ doLHsTupArg (L l arg@(Missing _)) = [(l,"m",ExplicitTuple [L l arg] Boxed)]
showAnns anns = "[\n" ++ (intercalate "\n"
diff --git a/testsuite/tests/ghc-api/annotations/stringSource.hs b/testsuite/tests/ghc-api/annotations/stringSource.hs
index 4089d4a88a..b89911d6c7 100644
--- a/testsuite/tests/ghc-api/annotations/stringSource.hs
+++ b/testsuite/tests/ghc-api/annotations/stringSource.hs
@@ -80,9 +80,9 @@ testOneFile libdir fileName = do
doCCallTarget (StaticTarget s f _ _) = [("st",[(noLoc (s,f))])]
doHsExpr :: HsExpr GhcPs -> [(String,[Located (SourceText,FastString)])]
- doHsExpr (HsCoreAnn _ src ss _) = [("co",[conv (noLoc ss)])]
- doHsExpr (HsSCC _ src ss _) = [("sc",[conv (noLoc ss)])]
- doHsExpr (HsTickPragma _ src (ss,_,_) _ss2 _) = [("tp",[conv (noLoc ss)])]
+ doHsExpr (HsCoreAnn src ss _) = [("co",[conv (noLoc ss)])]
+ doHsExpr (HsSCC src ss _) = [("sc",[conv (noLoc ss)])]
+ doHsExpr (HsTickPragma src (ss,_,_) _ss2 _) = [("tp",[conv (noLoc ss)])]
doHsExpr _ = []
conv (GHC.L l (StringLiteral st fs)) = GHC.L l (st,fs)
diff --git a/testsuite/tests/ghc-api/annotations/t11430.hs b/testsuite/tests/ghc-api/annotations/t11430.hs
index 40d23b5712..4b8119459b 100644
--- a/testsuite/tests/ghc-api/annotations/t11430.hs
+++ b/testsuite/tests/ghc-api/annotations/t11430.hs
@@ -67,7 +67,7 @@ testOneFile libdir fileName = do
doRuleDecl (HsRule _ _ _ _ _ _ _) = []
doHsExpr :: HsExpr GhcPs -> [(String,[String])]
- doHsExpr (HsTickPragma _ src (_,_,_) ss _) = [("tp",[show ss])]
+ doHsExpr (HsTickPragma src (_,_,_) ss _) = [("tp",[show ss])]
doHsExpr _ = []
doInline (InlinePragma _ _ _ (ActiveBefore (SourceText ss) _) _)
diff --git a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
index b80ab62507..46ab21412e 100644
--- a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
@@ -49,7 +49,6 @@
(PrefixCon
[({ DumpParsedAst.hs:5:26-30 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpParsedAst.hs:5:26-30 }
(Unqual
@@ -74,32 +73,25 @@
{OccName: Length}))
[({ DumpParsedAst.hs:8:10-17 }
(HsParTy
- (PlaceHolder)
({ DumpParsedAst.hs:8:11-16 }
(HsAppsTy
- (PlaceHolder)
[({ DumpParsedAst.hs:8:11 }
(HsAppPrefix
- (PlaceHolder)
({ DumpParsedAst.hs:8:11 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpParsedAst.hs:8:11 }
(Unqual
{OccName: a}))))))
,({ DumpParsedAst.hs:8:13 }
(HsAppInfix
- (PlaceHolder)
({ DumpParsedAst.hs:8:13 }
(Exact
{Name: :}))))
,({ DumpParsedAst.hs:8:15-16 }
(HsAppPrefix
- (PlaceHolder)
({ DumpParsedAst.hs:8:15-16 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpParsedAst.hs:8:15-16 }
(Unqual
@@ -107,42 +99,32 @@
(Prefix)
({ DumpParsedAst.hs:8:21-36 }
(HsAppsTy
- (PlaceHolder)
[({ DumpParsedAst.hs:8:21-24 }
(HsAppPrefix
- (PlaceHolder)
({ DumpParsedAst.hs:8:21-24 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpParsedAst.hs:8:21-24 }
(Unqual
{OccName: Succ}))))))
,({ DumpParsedAst.hs:8:26-36 }
(HsAppPrefix
- (PlaceHolder)
({ DumpParsedAst.hs:8:26-36 }
(HsParTy
- (PlaceHolder)
({ DumpParsedAst.hs:8:27-35 }
(HsAppsTy
- (PlaceHolder)
[({ DumpParsedAst.hs:8:27-32 }
(HsAppPrefix
- (PlaceHolder)
({ DumpParsedAst.hs:8:27-32 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpParsedAst.hs:8:27-32 }
(Unqual
{OccName: Length}))))))
,({ DumpParsedAst.hs:8:34-35 }
(HsAppPrefix
- (PlaceHolder)
({ DumpParsedAst.hs:8:34-35 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpParsedAst.hs:8:34-35 }
(Unqual
@@ -157,19 +139,16 @@
{OccName: Length}))
[({ DumpParsedAst.hs:9:10-12 }
(HsExplicitListTy
- (PlaceHolder)
(Promoted)
+ (PlaceHolder)
[]))]
(Prefix)
({ DumpParsedAst.hs:9:21-24 }
(HsAppsTy
- (PlaceHolder)
[({ DumpParsedAst.hs:9:21-24 }
(HsAppPrefix
- (PlaceHolder)
({ DumpParsedAst.hs:9:21-24 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpParsedAst.hs:9:21-24 }
(Unqual
@@ -182,28 +161,21 @@
(PlaceHolder)
[({ DumpParsedAst.hs:7:20-30 }
(KindedTyVar
- (PlaceHolder)
({ DumpParsedAst.hs:7:21-22 }
(Unqual
{OccName: as}))
({ DumpParsedAst.hs:7:27-29 }
(HsAppsTy
- (PlaceHolder)
[({ DumpParsedAst.hs:7:27-29 }
(HsAppPrefix
- (PlaceHolder)
({ DumpParsedAst.hs:7:27-29 }
(HsListTy
- (PlaceHolder)
({ DumpParsedAst.hs:7:28 }
(HsAppsTy
- (PlaceHolder)
[({ DumpParsedAst.hs:7:28 }
(HsAppPrefix
- (PlaceHolder)
({ DumpParsedAst.hs:7:28 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpParsedAst.hs:7:28 }
(Unqual
@@ -214,13 +186,10 @@
(KindSig
({ DumpParsedAst.hs:7:35-39 }
(HsAppsTy
- (PlaceHolder)
[({ DumpParsedAst.hs:7:35-39 }
(HsAppPrefix
- (PlaceHolder)
({ DumpParsedAst.hs:7:35-39 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpParsedAst.hs:7:35-39 }
(Unqual
@@ -249,16 +218,13 @@
[]
({ DumpParsedAst.hs:11:8-23 }
(HsApp
- (PlaceHolder)
({ DumpParsedAst.hs:11:8-15 }
(HsVar
- (PlaceHolder)
({ DumpParsedAst.hs:11:8-15 }
(Unqual
{OccName: putStrLn}))))
({ DumpParsedAst.hs:11:17-23 }
(HsLit
- (PlaceHolder)
(HsString
(SourceText
"\"hello\"")
diff --git a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
index fbc30626fa..c7daf90ff0 100644
--- a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
@@ -4,54 +4,50 @@
(Just
((,,,)
(HsGroup
- (XValBindsLR
- (NValBinds
- [((,)
- (NonRecursive)
- {Bag(Located (HsBind Name)):
- [({ DumpRenamedAst.hs:18:1-23 }
- (FunBind
- ({ DumpRenamedAst.hs:18:1-4 }
- {Name: DumpRenamedAst.main})
- (MG
- ({ DumpRenamedAst.hs:18:1-23 }
- [({ DumpRenamedAst.hs:18:1-23 }
- (Match
- (FunRhs
- ({ DumpRenamedAst.hs:18:1-4 }
- {Name: DumpRenamedAst.main})
- (Prefix)
- (NoSrcStrict))
- []
- (GRHSs
- [({ DumpRenamedAst.hs:18:6-23 }
- (GRHS
- []
- ({ DumpRenamedAst.hs:18:8-23 }
- (HsApp
- (PlaceHolder)
- ({ DumpRenamedAst.hs:18:8-15 }
- (HsVar
- (PlaceHolder)
- ({ DumpRenamedAst.hs:18:8-15 }
- {Name: System.IO.putStrLn})))
- ({ DumpRenamedAst.hs:18:17-23 }
- (HsLit
- (PlaceHolder)
- (HsString
- (SourceText
- "\"hello\"")
- {FastString: "hello"})))))))]
- ({ <no location info> }
- (EmptyLocalBinds)))))])
- []
- (PlaceHolder)
- (FromSource))
- (WpHole)
- {NameSet:
- []}
- []))]})]
- []))
+ (ValBindsOut
+ [((,)
+ (NonRecursive)
+ {Bag(Located (HsBind Name)):
+ [({ DumpRenamedAst.hs:18:1-23 }
+ (FunBind
+ ({ DumpRenamedAst.hs:18:1-4 }
+ {Name: DumpRenamedAst.main})
+ (MG
+ ({ DumpRenamedAst.hs:18:1-23 }
+ [({ DumpRenamedAst.hs:18:1-23 }
+ (Match
+ (FunRhs
+ ({ DumpRenamedAst.hs:18:1-4 }
+ {Name: DumpRenamedAst.main})
+ (Prefix)
+ (NoSrcStrict))
+ []
+ (GRHSs
+ [({ DumpRenamedAst.hs:18:6-23 }
+ (GRHS
+ []
+ ({ DumpRenamedAst.hs:18:8-23 }
+ (HsApp
+ ({ DumpRenamedAst.hs:18:8-15 }
+ (HsVar
+ ({ DumpRenamedAst.hs:18:8-15 }
+ {Name: System.IO.putStrLn})))
+ ({ DumpRenamedAst.hs:18:17-23 }
+ (HsLit
+ (HsString
+ (SourceText
+ "\"hello\"")
+ {FastString: "hello"})))))))]
+ ({ <no location info> }
+ (EmptyLocalBinds)))))])
+ []
+ (PlaceHolder)
+ (FromSource))
+ (WpHole)
+ {NameSet:
+ []}
+ []))]})]
+ [])
[]
[(TyClGroup
[({ DumpRenamedAst.hs:6:1-30 }
@@ -92,7 +88,6 @@
(PrefixCon
[({ DumpRenamedAst.hs:6:26-30 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:6:26-30 }
{Name: DumpRenamedAst.Peano})))])
@@ -119,13 +114,10 @@
{Name: DumpRenamedAst.Length})
[({ DumpRenamedAst.hs:9:10-17 }
(HsParTy
- (PlaceHolder)
({ DumpRenamedAst.hs:9:11-16 }
(HsOpTy
- (PlaceHolder)
({ DumpRenamedAst.hs:9:11 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:9:11 }
{Name: a})))
@@ -133,35 +125,28 @@
{Name: :})
({ DumpRenamedAst.hs:9:15-16 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:9:15-16 }
{Name: as})))))))]
(Prefix)
({ DumpRenamedAst.hs:9:21-36 }
(HsAppTy
- (PlaceHolder)
({ DumpRenamedAst.hs:9:21-24 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:9:21-24 }
{Name: DumpRenamedAst.Succ})))
({ DumpRenamedAst.hs:9:26-36 }
(HsParTy
- (PlaceHolder)
({ DumpRenamedAst.hs:9:27-35 }
(HsAppTy
- (PlaceHolder)
({ DumpRenamedAst.hs:9:27-32 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:9:27-32 }
{Name: DumpRenamedAst.Length})))
({ DumpRenamedAst.hs:9:34-35 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:9:34-35 }
{Name: as}))))))))))
@@ -174,13 +159,12 @@
{Name: DumpRenamedAst.Length})
[({ DumpRenamedAst.hs:10:10-12 }
(HsExplicitListTy
- (PlaceHolder)
(Promoted)
+ (PlaceHolder)
[]))]
(Prefix)
({ DumpRenamedAst.hs:10:21-24 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:10:21-24 }
{Name: DumpRenamedAst.Zero}))))
@@ -191,15 +175,12 @@
[{Name: k}]
[({ DumpRenamedAst.hs:8:20-30 }
(KindedTyVar
- (PlaceHolder)
({ DumpRenamedAst.hs:8:21-22 }
{Name: as})
({ DumpRenamedAst.hs:8:27-29 }
(HsListTy
- (PlaceHolder)
({ DumpRenamedAst.hs:8:28 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:8:28 }
{Name: k})))))))]
@@ -210,7 +191,6 @@
(KindSig
({ DumpRenamedAst.hs:8:35-39 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:8:35-39 }
{Name: DumpRenamedAst.Peano})))))
@@ -234,25 +214,20 @@
(KindSig
({ DumpRenamedAst.hs:12:20-30 }
(HsFunTy
- (PlaceHolder)
({ DumpRenamedAst.hs:12:20 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:12:20 }
{Name: k})))
({ DumpRenamedAst.hs:12:25-30 }
(HsFunTy
- (PlaceHolder)
({ DumpRenamedAst.hs:12:25 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:12:25 }
{Name: k})))
({ DumpRenamedAst.hs:12:30 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:12:30 }
{Name: GHC.Types.*})))))))))
@@ -269,25 +244,20 @@
{Name: DumpRenamedAst.Nat})
[({ DumpRenamedAst.hs:15:22-34 }
(HsKindSig
- (PlaceHolder)
({ DumpRenamedAst.hs:15:23 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:15:23 }
{Name: a})))
({ DumpRenamedAst.hs:15:28-33 }
(HsFunTy
- (PlaceHolder)
({ DumpRenamedAst.hs:15:28 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:15:28 }
{Name: k})))
({ DumpRenamedAst.hs:15:33 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:15:33 }
{Name: GHC.Types.*})))))))]
@@ -300,28 +270,22 @@
(Just
({ DumpRenamedAst.hs:15:39-51 }
(HsFunTy
- (PlaceHolder)
({ DumpRenamedAst.hs:15:39-46 }
(HsParTy
- (PlaceHolder)
({ DumpRenamedAst.hs:15:40-45 }
(HsFunTy
- (PlaceHolder)
({ DumpRenamedAst.hs:15:40 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:15:40 }
{Name: k})))
({ DumpRenamedAst.hs:15:45 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:15:45 }
{Name: GHC.Types.*})))))))
({ DumpRenamedAst.hs:15:51 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:15:51 }
{Name: GHC.Types.*}))))))
@@ -334,72 +298,56 @@
,{Name: g}]
({ DumpRenamedAst.hs:16:10-45 }
(HsFunTy
- (PlaceHolder)
({ DumpRenamedAst.hs:16:10-34 }
(HsParTy
- (PlaceHolder)
({ DumpRenamedAst.hs:16:11-33 }
(HsForAllTy
- (PlaceHolder)
[({ DumpRenamedAst.hs:16:18-19 }
(UserTyVar
- (PlaceHolder)
({ DumpRenamedAst.hs:16:18-19 }
{Name: xx})))]
({ DumpRenamedAst.hs:16:22-33 }
(HsFunTy
- (PlaceHolder)
({ DumpRenamedAst.hs:16:22-25 }
(HsAppTy
- (PlaceHolder)
({ DumpRenamedAst.hs:16:22 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:16:22 }
{Name: f})))
({ DumpRenamedAst.hs:16:24-25 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:16:24-25 }
{Name: xx})))))
({ DumpRenamedAst.hs:16:30-33 }
(HsAppTy
- (PlaceHolder)
({ DumpRenamedAst.hs:16:30 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:16:30 }
{Name: g})))
({ DumpRenamedAst.hs:16:32-33 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:16:32-33 }
{Name: xx})))))))))))
({ DumpRenamedAst.hs:16:39-45 }
(HsAppTy
- (PlaceHolder)
({ DumpRenamedAst.hs:16:39-43 }
(HsAppTy
- (PlaceHolder)
({ DumpRenamedAst.hs:16:39-41 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:16:39-41 }
{Name: DumpRenamedAst.Nat})))
({ DumpRenamedAst.hs:16:43 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:16:43 }
{Name: f})))))
({ DumpRenamedAst.hs:16:45 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ DumpRenamedAst.hs:16:45 }
{Name: g})))))))
diff --git a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
index b888067af1..e0d810d4b4 100644
--- a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
@@ -7,63 +7,47 @@
{Var: DumpTypecheckedAst.$tcPeano}
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsConLikeOut
- (PlaceHolder)
({abstract:ConLike})))
({ <no location info> }
(HsLit
- (PlaceHolder)
{HsWord{64}Prim (14073232900889011755) (NoSourceText)}))))
({ <no location info> }
(HsLit
- (PlaceHolder)
{HsWord{64}Prim (2739668351064589274) (NoSourceText)}))))
({ <no location info> }
(HsVar
- (PlaceHolder)
({ <no location info> }
{Var: DumpTypecheckedAst.$trModule})))))
({ <no location info> }
(HsPar
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsConLikeOut
- (PlaceHolder)
({abstract:ConLike})))
({ <no location info> }
(HsLit
- (PlaceHolder)
(HsStringPrim
(NoSourceText)
"Peano")))))))))
({ <no location info> }
(HsLit
- (PlaceHolder)
{HsInt{64}Prim (0) (SourceText
"0")}))))
({ <no location info> }
(HsVar
- (PlaceHolder)
({ <no location info> }
{Var: GHC.Types.krep$*})))))
(False)))
@@ -72,63 +56,47 @@
{Var: DumpTypecheckedAst.$tc'Zero}
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsConLikeOut
- (PlaceHolder)
({abstract:ConLike})))
({ <no location info> }
(HsLit
- (PlaceHolder)
{HsWord{64}Prim (13760111476013868540) (NoSourceText)}))))
({ <no location info> }
(HsLit
- (PlaceHolder)
{HsWord{64}Prim (12314848029315386153) (NoSourceText)}))))
({ <no location info> }
(HsVar
- (PlaceHolder)
({ <no location info> }
{Var: DumpTypecheckedAst.$trModule})))))
({ <no location info> }
(HsPar
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsConLikeOut
- (PlaceHolder)
({abstract:ConLike})))
({ <no location info> }
(HsLit
- (PlaceHolder)
(HsStringPrim
(NoSourceText)
"'Zero")))))))))
({ <no location info> }
(HsLit
- (PlaceHolder)
{HsInt{64}Prim (0) (SourceText
"0")}))))
({ <no location info> }
(HsVar
- (PlaceHolder)
({ <no location info> }
{Var: $krep})))))
(False)))
@@ -137,63 +105,47 @@
{Var: DumpTypecheckedAst.$tc'Succ}
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsConLikeOut
- (PlaceHolder)
({abstract:ConLike})))
({ <no location info> }
(HsLit
- (PlaceHolder)
{HsWord{64}Prim (1143980031331647856) (NoSourceText)}))))
({ <no location info> }
(HsLit
- (PlaceHolder)
{HsWord{64}Prim (14802086722010293686) (NoSourceText)}))))
({ <no location info> }
(HsVar
- (PlaceHolder)
({ <no location info> }
{Var: DumpTypecheckedAst.$trModule})))))
({ <no location info> }
(HsPar
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsConLikeOut
- (PlaceHolder)
({abstract:ConLike})))
({ <no location info> }
(HsLit
- (PlaceHolder)
(HsStringPrim
(NoSourceText)
"'Succ")))))))))
({ <no location info> }
(HsLit
- (PlaceHolder)
{HsInt{64}Prim (0) (SourceText
"0")}))))
({ <no location info> }
(HsVar
- (PlaceHolder)
({ <no location info> }
{Var: $krep})))))
(False)))
@@ -202,22 +154,17 @@
{Var: $krep}
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsConLikeOut
- (PlaceHolder)
({abstract:ConLike})))
({ <no location info> }
(HsVar
- (PlaceHolder)
({ <no location info> }
{Var: $krep})))))
({ <no location info> }
(HsVar
- (PlaceHolder)
({ <no location info> }
{Var: $krep})))))
(False)))
@@ -226,28 +173,22 @@
{Var: $krep}
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsConLikeOut
- (PlaceHolder)
({abstract:ConLike})))
({ <no location info> }
(HsVar
- (PlaceHolder)
({ <no location info> }
{Var: DumpTypecheckedAst.$tcPeano})))))
({ <no location info> }
(HsWrap
- (PlaceHolder)
(WpTyApp
(TyConApp
({abstract:TyCon})
[]))
(HsConLikeOut
- (PlaceHolder)
({abstract:ConLike}))))))
(False)))
,({ <no location info> }
@@ -255,43 +196,32 @@
{Var: DumpTypecheckedAst.$trModule}
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsConLikeOut
- (PlaceHolder)
({abstract:ConLike})))
({ <no location info> }
(HsPar
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsConLikeOut
- (PlaceHolder)
({abstract:ConLike})))
({ <no location info> }
(HsLit
- (PlaceHolder)
(HsStringPrim
(NoSourceText)
"main")))))))))
({ <no location info> }
(HsPar
- (PlaceHolder)
({ <no location info> }
(HsApp
- (PlaceHolder)
({ <no location info> }
(HsConLikeOut
- (PlaceHolder)
({abstract:ConLike})))
({ <no location info> }
(HsLit
- (PlaceHolder)
(HsStringPrim
(NoSourceText)
"DumpTypecheckedAst")))))))))
@@ -328,15 +258,12 @@
[]
({ DumpTypecheckedAst.hs:11:8-23 }
(HsApp
- (PlaceHolder)
({ DumpTypecheckedAst.hs:11:8-15 }
(HsVar
- (PlaceHolder)
({ <no location info> }
{Var: putStrLn})))
({ DumpTypecheckedAst.hs:11:17-23 }
(HsLit
- (PlaceHolder)
(HsString
(SourceText
"\"hello\"")
diff --git a/testsuite/tests/parser/should_compile/T14189.stderr b/testsuite/tests/parser/should_compile/T14189.stderr
index 4965410e65..53e4a6f941 100644
--- a/testsuite/tests/parser/should_compile/T14189.stderr
+++ b/testsuite/tests/parser/should_compile/T14189.stderr
@@ -4,10 +4,9 @@
(Just
((,,,)
(HsGroup
- (XValBindsLR
- (NValBinds
- []
- []))
+ (ValBindsOut
+ []
+ [])
[]
[(TyClGroup
[({ T14189.hs:6:1-42 }
@@ -37,7 +36,6 @@
(PrefixCon
[({ T14189.hs:6:18-20 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ T14189.hs:6:18-20 }
{Name: GHC.Types.Int})))])
@@ -67,13 +65,12 @@
(ConDeclField
[({ T14189.hs:6:33 }
(FieldOcc
- {Name: T14189.f}
({ T14189.hs:6:33 }
(Unqual
- {OccName: f}))))]
+ {OccName: f}))
+ {Name: T14189.f}))]
({ T14189.hs:6:38-40 }
(HsTyVar
- (PlaceHolder)
(NotPromoted)
({ T14189.hs:6:38-40 }
{Name: GHC.Types.Int})))
diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T
index 4d7c171393..b7e6b215ca 100644
--- a/testsuite/tests/perf/haddock/all.T
+++ b/testsuite/tests/perf/haddock/all.T
@@ -144,7 +144,7 @@ test('haddock.compiler',
[extra_files(['../../../../compiler/stage2/haddock.t']),
unless(in_tree_compiler(), skip), req_haddock
,stats_num_field('bytes allocated',
- [(wordsize(64), 102142130576, 10)
+ [(wordsize(64), 51592019560, 10)
# 2012-08-14: 26070600504 (amd64/Linux)
# 2012-08-29: 26353100288 (amd64/Linux, new CG)
# 2012-09-18: 26882813032 (amd64/Linux)
@@ -166,9 +166,6 @@ test('haddock.compiler',
# 2017-06-05: 65378619232 (amd64/Linux) Desugar modules compiled with -fno-code
# 2017-06-06: 55990521024 (amd64/Linux) Don't pass on -dcore-lint in Haddock.mk
# 2017-07-12: 51592019560 (amd64/Linux) Use getNameToInstancesIndex
- # 2017-11-07: 65807004616 (amd64/Linux) Trees that grow
- # 2017-11-11: 89414230688 (amd64/Linux) Trees that grow HsExpr
- # 2017-11-12: 102142130576 (amd64/Linux) Trees that grow HsExpr #2
,(platform('i386-unknown-mingw32'), 367546388, 10)
# 2012-10-30: 13773051312 (x86/Windows)
diff --git a/testsuite/tests/quasiquotation/T7918.hs b/testsuite/tests/quasiquotation/T7918.hs
index 9cf060937e..42bb1b05c8 100644
--- a/testsuite/tests/quasiquotation/T7918.hs
+++ b/testsuite/tests/quasiquotation/T7918.hs
@@ -29,19 +29,19 @@ traverse a =
gmapM traverse a
where
showVar :: Maybe (HsExpr GhcTc) -> Traverse ()
- showVar (Just (HsVar _ (L _ v))) =
+ showVar (Just (HsVar (L _ v))) =
modify $ \(loc, ids) -> (loc, (varName v, loc) : ids)
showVar _ =
return ()
showTyVar :: Maybe (HsType GhcRn) -> Traverse ()
- showTyVar (Just (HsTyVar _ _ (L _ v))) =
+ showTyVar (Just (HsTyVar _ (L _ v))) =
modify $ \(loc, ids) -> (loc, (v, loc) : ids)
showTyVar _ =
return ()
showPatVar :: Maybe (Pat GhcTc) -> Traverse ()
- showPatVar (Just (VarPat _ (L _ v))) =
+ showPatVar (Just (VarPat (L _ v))) =
modify $ \(loc, ids) -> (loc, (varName v, loc) : ids)
showPatVar _
= return ()
View Lorry Controller Status