diff options
| author | Alan Zimmerman <alan.zimm@gmail.com> | 2021-02-21 21:23:40 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-03-20 07:48:38 -0400 |
| commit | 95275a5f25a2e70b71240d4756109180486af1b1 (patch) | |
| tree | eb4801bb0e00098b8b9d513479de4fbbd779ddac /testsuite/tests/ghc-api | |
| parent | f940fd466a86c2f8e93237b36835797be3f3c898 (diff) | |
| download | haskell-95275a5f25a2e70b71240d4756109180486af1b1.tar.gz | |
GHC Exactprint main commit
Metric Increase:
T10370
parsing001
Updates haddock submodule
Diffstat (limited to 'testsuite/tests/ghc-api')
84 files changed, 552 insertions, 3811 deletions
diff --git a/testsuite/tests/ghc-api/T6145.hs b/testsuite/tests/ghc-api/T6145.hs index 7c56320ff3..ae0bca225d 100644 --- a/testsuite/tests/ghc-api/T6145.hs +++ b/testsuite/tests/ghc-api/T6145.hs @@ -41,6 +41,6 @@ main = do | (MG _ (L _ (m:_)) _) <- fun_matches f, ((L _ (c@ConPat{})):_)<-hsLMatchPats m, (L l _)<-pat_con c - = isGoodSrcSpan l -- Check that the source location is a good one + = isGoodSrcSpan (locA l) -- Check that the source location is a good one isDataCon _ = False diff --git a/testsuite/tests/ghc-api/annotations-literals/literals.stdout b/testsuite/tests/ghc-api/annotations-literals/literals.stdout index 501a5af5f3..eb87a80162 100644 --- a/testsuite/tests/ghc-api/annotations-literals/literals.stdout +++ b/testsuite/tests/ghc-api/annotations-literals/literals.stdout @@ -1,4 +1,4 @@ -(LiteralsTest.hs:1:1-26,ITblockComment "{-# LANGUAGE MagicHash #-}",[{-# LANGUAGE MagicHash #-}]), +(LiteralsTest.hs:1:1-26,ITblockComment "{-# LANGUAGE MagicHash #-}" (PsSpan {psRealSpan = SrcSpanPoint "./LiteralsTest.hs" 1 1, psBufSpan = BufSpan {bufSpanStart = BufPos {bufPos = 0}, bufSpanEnd = BufPos {bufPos = 0}}}),[{-# LANGUAGE MagicHash #-}]), (LiteralsTest.hs:2:1-6,ITmodule,[module]), diff --git a/testsuite/tests/ghc-api/annotations/AnnotationLet.hs b/testsuite/tests/ghc-api/annotations/AnnotationLet.hs deleted file mode 100644 index ad67b927f4..0000000000 --- a/testsuite/tests/ghc-api/annotations/AnnotationLet.hs +++ /dev/null @@ -1,17 +0,0 @@ -{-# LANGUAGE TypeOperators #-} -module AnnotationLet (foo) where - -{ -import qualified Data.List as DL -; -foo = let - a 0 = 1 - a _ = 2 - b = 2 - in a b -; -infixr 8 + -; -data ((f + g)) a = InL (f a) | InR (g a) -; -} diff --git a/testsuite/tests/ghc-api/annotations/AnnotationTuple.hs b/testsuite/tests/ghc-api/annotations/AnnotationTuple.hs deleted file mode 100644 index 73015a6bc5..0000000000 --- a/testsuite/tests/ghc-api/annotations/AnnotationTuple.hs +++ /dev/null @@ -1,31 +0,0 @@ -{-# LANGUAGE TupleSections,TypeFamilies #-} -{-# LANGUAGE PatternGuards,ScopedTypeVariables #-} -module AnnotationTuple (foo) where - -{ -import qualified Data.List as DL -; -foo = let - a = 1 - b = 2 - in a + b - -; -bar = print $ map (1, "hello" , 6.5,, [5, 5, 6, 7]) [Just (), Nothing] -; -baz = (1, "hello", 6.5,,,,) 'a' (Just ()) -; -data family GMap k :: * -> * -; -match n - | Just 5 <- Just n - , Just 6 <- Nothing - , Just 7 <- Just 9 - = Just 8 -; -boo :: Int = 3 -} --- Note: the trailing whitespace in this file is used to check that we --- have an annotation for it. - - diff --git a/testsuite/tests/ghc-api/annotations/BundleExport.hs b/testsuite/tests/ghc-api/annotations/BundleExport.hs deleted file mode 100644 index 31d00601a8..0000000000 --- a/testsuite/tests/ghc-api/annotations/BundleExport.hs +++ /dev/null @@ -1,9 +0,0 @@ -{-# LANGUAGE PatternSynonyms #-} -module BundleExport(P(.., A), Q(B)) where - -data P = P - -data Q = Q - -pattern A = P -pattern B = Q diff --git a/testsuite/tests/ghc-api/annotations/InTreeAnnotations1.hs b/testsuite/tests/ghc-api/annotations/InTreeAnnotations1.hs new file mode 100644 index 0000000000..c454b0a237 --- /dev/null +++ b/testsuite/tests/ghc-api/annotations/InTreeAnnotations1.hs @@ -0,0 +1,8 @@ +{-# LANGUAGE ViewPatterns, BangPatterns #-} +module InTreeAnnotations1 where + +foo a@(_,_) !"a" ~x = undefined + +data T = MkT { x,y :: Int } + +f (MkT { x = !v, y = negate -> w }) = v + w diff --git a/testsuite/tests/ghc-api/annotations/InTreeAnnotations1.stderr b/testsuite/tests/ghc-api/annotations/InTreeAnnotations1.stderr new file mode 100644 index 0000000000..42e3143635 --- /dev/null +++ b/testsuite/tests/ghc-api/annotations/InTreeAnnotations1.stderr @@ -0,0 +1,521 @@ + +==================== Parser AST ==================== + +(L + { InTreeAnnotations1.hs:1:1 } + (HsModule + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:1:1 } + (UnchangedAnchor)) + (AnnsModule + [(AddApiAnn AnnModule (AR { InTreeAnnotations1.hs:2:1-6 })) + ,(AddApiAnn AnnWhere (AR { InTreeAnnotations1.hs:2:27-31 }))] + (AnnList + (Nothing) + (Nothing) + (Nothing) + [] + [])) + (AnnCommentsBalanced + [] + [(L + (Anchor + { InTreeAnnotations1.hs:9:1 } + (UnchangedAnchor)) + (AnnComment + (AnnEofComment) + { InTreeAnnotations1.hs:9:1 }))])) + (VirtualBraces + (1)) + (Just + (L + { InTreeAnnotations1.hs:2:8-25 } + {ModuleName: InTreeAnnotations1})) + (Nothing) + [] + [(L + (SrcSpanAnn (ApiAnn + (Anchor + { InTreeAnnotations1.hs:4:1-31 } + (UnchangedAnchor)) + (AnnListItem + []) + (AnnComments + [])) { InTreeAnnotations1.hs:4:1-31 }) + (ValD + (NoExtField) + (FunBind + (NoExtField) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:4:1-3 }) + (Unqual + {OccName: foo})) + (MG + (NoExtField) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:4:1-31 }) + [(L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:4:1-31 }) + (Match + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:4:1-31 } + (UnchangedAnchor)) + [] + (AnnComments + [])) + (FunRhs + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:4:1-3 }) + (Unqual + {OccName: foo})) + (Prefix) + (NoSrcStrict)) + [(L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:4:5-11 }) + (AsPat + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:4:5-11 } + (UnchangedAnchor)) + [(AddApiAnn AnnAt (AR { InTreeAnnotations1.hs:4:6 }))] + (AnnComments + [])) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:4:5 }) + (Unqual + {OccName: a})) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:4:7-11 }) + (TuplePat + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:4:7-11 } + (UnchangedAnchor)) + [(AddApiAnn AnnOpenP (AR { InTreeAnnotations1.hs:4:7 })) + ,(AddApiAnn AnnCloseP (AR { InTreeAnnotations1.hs:4:11 }))] + (AnnComments + [])) + [(L + (SrcSpanAnn (ApiAnn + (Anchor + { InTreeAnnotations1.hs:4:8 } + (UnchangedAnchor)) + (AnnListItem + [(AddCommaAnn + (AR { InTreeAnnotations1.hs:4:9 }))]) + (AnnComments + [])) { InTreeAnnotations1.hs:4:8 }) + (WildPat + (NoExtField))) + ,(L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:4:10 }) + (WildPat + (NoExtField)))] + (Boxed))))) + ,(L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:4:13-16 }) + (BangPat + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:4:13-16 } + (UnchangedAnchor)) + [(AddApiAnn AnnBang (AR { InTreeAnnotations1.hs:4:13 }))] + (AnnComments + [])) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:4:14-16 }) + (LitPat + (NoExtField) + (HsString + (SourceText "a") + {FastString: "a"}))))) + ,(L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:4:18-19 }) + (LazyPat + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:4:18-19 } + (UnchangedAnchor)) + [(AddApiAnn AnnTilde (AR { InTreeAnnotations1.hs:4:18 }))] + (AnnComments + [])) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:4:19 }) + (VarPat + (NoExtField) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:4:19 }) + (Unqual + {OccName: x}))))))] + (GRHSs + (NoExtField) + [(L + { InTreeAnnotations1.hs:4:21-31 } + (GRHS + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:4:21-31 } + (UnchangedAnchor)) + (GrhsAnn + (Nothing) + (AddApiAnn AnnEqual (AR { InTreeAnnotations1.hs:4:21 }))) + (AnnComments + [])) + [] + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:4:23-31 }) + (HsVar + (NoExtField) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:4:23-31 }) + (Unqual + {OccName: undefined}))))))] + (EmptyLocalBinds + (NoExtField)))))]) + (FromSource)) + []))) + ,(L + (SrcSpanAnn (ApiAnn + (Anchor + { InTreeAnnotations1.hs:6:1-27 } + (UnchangedAnchor)) + (AnnListItem + []) + (AnnComments + [])) { InTreeAnnotations1.hs:6:1-27 }) + (TyClD + (NoExtField) + (DataDecl + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:6:1-27 } + (UnchangedAnchor)) + [(AddApiAnn AnnData (AR { InTreeAnnotations1.hs:6:1-4 })) + ,(AddApiAnn AnnEqual (AR { InTreeAnnotations1.hs:6:8 }))] + (AnnComments + [])) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:6:6 }) + (Unqual + {OccName: T})) + (HsQTvs + (NoExtField) + []) + (Prefix) + (HsDataDefn + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:6:1-27 } + (UnchangedAnchor)) + [(AddApiAnn AnnData (AR { InTreeAnnotations1.hs:6:1-4 })) + ,(AddApiAnn AnnEqual (AR { InTreeAnnotations1.hs:6:8 }))] + (AnnComments + [])) + (DataType) + (Nothing) + (Nothing) + (Nothing) + [(L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:6:10-27 }) + (ConDeclH98 + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:6:10-27 } + (UnchangedAnchor)) + [] + (AnnComments + [])) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:6:10-12 }) + (Unqual + {OccName: MkT})) + (False) + [] + (Nothing) + (RecCon + (L + (SrcSpanAnn (ApiAnn + (Anchor + { InTreeAnnotations1.hs:6:14 } + (UnchangedAnchor)) + (AnnList + (Just + (Anchor + { InTreeAnnotations1.hs:6:16-25 } + (UnchangedAnchor))) + (Just + (AddApiAnn AnnOpenC (AR { InTreeAnnotations1.hs:6:14 }))) + (Just + (AddApiAnn AnnCloseC (AR { InTreeAnnotations1.hs:6:27 }))) + [] + []) + (AnnComments + [])) { InTreeAnnotations1.hs:6:14-27 }) + [(L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:6:16-25 }) + (ConDeclField + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:6:16-18 } + (UnchangedAnchor)) + [(AddApiAnn AnnDcolon (AR { InTreeAnnotations1.hs:6:20-21 }))] + (AnnComments + [])) + [(L + { InTreeAnnotations1.hs:6:16 } + (FieldOcc + (NoExtField) + (L + (SrcSpanAnn (ApiAnn + (Anchor + { InTreeAnnotations1.hs:6:16 } + (UnchangedAnchor)) + (NameAnnTrailing + [(AddCommaAnn + (AR { InTreeAnnotations1.hs:6:17 }))]) + (AnnComments + [])) { InTreeAnnotations1.hs:6:16 }) + (Unqual + {OccName: x})))) + ,(L + { InTreeAnnotations1.hs:6:18 } + (FieldOcc + (NoExtField) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:6:18 }) + (Unqual + {OccName: y}))))] + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:6:23-25 }) + (HsTyVar + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:6:23-25 } + (UnchangedAnchor)) + [] + (AnnComments + [])) + (NotPromoted) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:6:23-25 }) + (Unqual + {OccName: Int})))) + (Nothing)))])) + (Nothing)))] + [])))) + ,(L + (SrcSpanAnn (ApiAnn + (Anchor + { InTreeAnnotations1.hs:8:1-43 } + (UnchangedAnchor)) + (AnnListItem + []) + (AnnComments + [])) { InTreeAnnotations1.hs:8:1-43 }) + (ValD + (NoExtField) + (FunBind + (NoExtField) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:1 }) + (Unqual + {OccName: f})) + (MG + (NoExtField) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:1-43 }) + [(L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:1-43 }) + (Match + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:8:1-43 } + (UnchangedAnchor)) + [] + (AnnComments + [])) + (FunRhs + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:1 }) + (Unqual + {OccName: f})) + (Prefix) + (NoSrcStrict)) + [(L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:3-35 }) + (ParPat + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:8:3-35 } + (UnchangedAnchor)) + (AnnParen + (AnnParens) + (AR { InTreeAnnotations1.hs:8:3 }) + (AR { InTreeAnnotations1.hs:8:35 })) + (AnnComments + [])) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:4-34 }) + (ConPat + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:8:4-34 } + (UnchangedAnchor)) + [(AddApiAnn AnnOpenC (AR { InTreeAnnotations1.hs:8:8 })) + ,(AddApiAnn AnnCloseC (AR { InTreeAnnotations1.hs:8:34 }))] + (AnnComments + [])) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:4-6 }) + (Unqual + {OccName: MkT})) + (RecCon + (HsRecFields + [(L + (SrcSpanAnn (ApiAnn + (Anchor + { InTreeAnnotations1.hs:8:10-15 } + (UnchangedAnchor)) + (AnnListItem + [(AddCommaAnn + (AR { InTreeAnnotations1.hs:8:16 }))]) + (AnnComments + [])) { InTreeAnnotations1.hs:8:10-15 }) + (HsRecField + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:8:10 } + (UnchangedAnchor)) + [(AddApiAnn AnnEqual (AR { InTreeAnnotations1.hs:8:12 }))] + (AnnComments + [])) + (L + { InTreeAnnotations1.hs:8:10 } + (FieldOcc + (NoExtField) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:10 }) + (Unqual + {OccName: x})))) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:14-15 }) + (BangPat + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:8:14-15 } + (UnchangedAnchor)) + [(AddApiAnn AnnBang (AR { InTreeAnnotations1.hs:8:14 }))] + (AnnComments + [])) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:15 }) + (VarPat + (NoExtField) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:15 }) + (Unqual + {OccName: v})))))) + (False))) + ,(L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:18-32 }) + (HsRecField + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:8:18 } + (UnchangedAnchor)) + [(AddApiAnn AnnEqual (AR { InTreeAnnotations1.hs:8:20 }))] + (AnnComments + [])) + (L + { InTreeAnnotations1.hs:8:18 } + (FieldOcc + (NoExtField) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:18 }) + (Unqual + {OccName: y})))) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:22-32 }) + (ViewPat + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:8:22-32 } + (UnchangedAnchor)) + [(AddApiAnn AnnRarrow (AR { InTreeAnnotations1.hs:8:29-30 }))] + (AnnComments + [])) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:22-27 }) + (HsVar + (NoExtField) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:22-27 }) + (Unqual + {OccName: negate})))) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:32 }) + (VarPat + (NoExtField) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:32 }) + (Unqual + {OccName: w})))))) + (False)))] + (Nothing)))))))] + (GRHSs + (NoExtField) + [(L + { InTreeAnnotations1.hs:8:37-43 } + (GRHS + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:8:37-43 } + (UnchangedAnchor)) + (GrhsAnn + (Nothing) + (AddApiAnn AnnEqual (AR { InTreeAnnotations1.hs:8:37 }))) + (AnnComments + [])) + [] + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:39-43 }) + (OpApp + (ApiAnn + (Anchor + { InTreeAnnotations1.hs:8:39-43 } + (UnchangedAnchor)) + [] + (AnnComments + [])) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:39 }) + (HsVar + (NoExtField) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:39 }) + (Unqual + {OccName: v})))) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:41 }) + (HsVar + (NoExtField) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:41 }) + (Unqual + {OccName: +})))) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:43 }) + (HsVar + (NoExtField) + (L + (SrcSpanAnn (ApiAnnNotUsed) { InTreeAnnotations1.hs:8:43 }) + (Unqual + {OccName: w}))))))))] + (EmptyLocalBinds + (NoExtField)))))]) + (FromSource)) + [])))] + (Nothing) + (Nothing))) diff --git a/testsuite/tests/ghc-api/annotations/ListComprehensions.hs b/testsuite/tests/ghc-api/annotations/ListComprehensions.hs deleted file mode 100644 index 0738da5173..0000000000 --- a/testsuite/tests/ghc-api/annotations/ListComprehensions.hs +++ /dev/null @@ -1,28 +0,0 @@ -{-# LANGUAGE ParallelListComp, - TransformListComp, - RecordWildCards #-} --- MonadComprehensions, - -module ListComprehensions where - - - -import GHC.Exts -import qualified Data.Map as M -import Data.Ord (comparing) -import Data.List (sortBy) - --- Let’s look at a simple, normal list comprehension to start: - -parallelListComp :: [Int] -parallelListComp = [ x + y * z - | x <- [0..10] - | y <- [10..20] - | z <- [20..30] - ] - -oldest :: [Int] -> [String] -oldest tbl = [ "str" - | n <- tbl - , then id - ] diff --git a/testsuite/tests/ghc-api/annotations/Makefile b/testsuite/tests/ghc-api/annotations/Makefile index a9bd5b36da..23151ea43a 100644 --- a/testsuite/tests/ghc-api/annotations/Makefile +++ b/testsuite/tests/ghc-api/annotations/Makefile @@ -4,10 +4,8 @@ include $(TOP)/mk/test.mk clean: rm -f *.o *.hi - rm -f annotations comments parseTree - rm -f listcomps + rm -f annotations comments rm -f stringSource - rm -f t11430 .PHONY: annotations annotations: @@ -15,162 +13,20 @@ annotations: '$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 -package ghc annotations ./annotations "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" -.PHONY: parseTree -parseTree: - rm -f parseTree.o parseTree.hi - '$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 -package ghc parseTree - ./parseTree "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" - .PHONY: comments comments: rm -f comments.o comments.hi '$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 -package ghc comments ./comments "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" -.PHONY: exampleTest -exampleTest: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" AnnotationTuple.hs - -.PHONY: listcomps -listcomps: - rm -f listcomps.o listcomps.hi - '$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 -package ghc listcomps - ./listcomps "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" - -.PHONY: T10358 -T10358: - # Ignore result code, we have an unattached (superfluous) AnnBang - - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test10358.hs - -.PHONY: T10396 -T10396: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test10396.hs - -.PHONY: T10255 -T10255: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test10255.hs - -.PHONY: T10357 -T10357: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test10357.hs - -.PHONY: T10268 -T10268: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test10268.hs - -.PHONY: T10280 -T10280: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test10280.hs - -.PHONY: T10269 -T10269: - # Ignore result code, we have an unattached (superfluous) AnnVal - - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test10269.hs - -.PHONY: T10312 -T10312: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test10312.hs - -.PHONY: T10307 -T10307: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test10307.hs - -.PHONY: T10309 -T10309: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test10309.hs - -.PHONY: boolFormula -boolFormula: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" TestBoolFormula.hs - -.PHONY: T10278 -T10278: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test10278.hs - -.PHONY: T10354 -T10354: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test10354.hs - -.PHONY: T10399 -T10399: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test10399.hs - -.PHONY: bundle-export -bundle-export: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" BundleExport.hs - -.PHONY: T10313 -T10313: - rm -f stringSource.o stringSource.hi - '$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 -package ghc stringSource - ./stringSource "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test10313 - -.PHONY: T11018 -T11018: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test11018.hs - -.PHONY: T10276 -T10276: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test10276.hs - -.PHONY: T10598 -T10598: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test10598.hs - -.PHONY: T11321 -T11321: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test11321.hs - -.PHONY: T11332 -T11332: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test11332.hs - -.PHONY: T11430 -T11430: - rm -f t11430.o t11430.hi t11430 - '$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 -package ghc t11430 - ./t11430 "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test11430 - -.PHONY: load-main -load-main: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" load-main.hs - -.PHONY: T12417 -T12417: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test12417.hs - -.PHONY: T13163 -T13163: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test13163.hs - -.PHONY: T15303 -T15303: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test15303.hs - -.PHONY: T16212 -T16212: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test16212.hs - -.PHONY: T16230 -T16230: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test16230.hs - -.PHONY: T16236 -T16236: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test16236.hs - -.PHONY: StarBinderAnns -StarBinderAnns: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" StarBinderAnns.hs - -.PHONY: T16279 -T16279: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test16279.hs - -.PHONY: T17388 -T17388: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test17388.hs - -.PHONY: T17519 -T17519: - $(CHECK_API_ANNOTATIONS) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test17519.hs +# .PHONY: T10313 +# T10313: +# rm -f stringSource.o stringSource.hi +# '$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 -package ghc stringSource +# ./stringSource "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test10313 + +# .PHONY: T11430 +# T11430: +# rm -f t11430.o t11430.hi t11430 +# '$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 -package ghc t11430 +# ./t11430 "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Test11430 diff --git a/testsuite/tests/ghc-api/annotations/StarBinderAnns.hs b/testsuite/tests/ghc-api/annotations/StarBinderAnns.hs deleted file mode 100644 index 4b69f44d66..0000000000 --- a/testsuite/tests/ghc-api/annotations/StarBinderAnns.hs +++ /dev/null @@ -1,6 +0,0 @@ -{-# LANGUAGE TypeOperators, TypeFamilies #-} -{-# OPTIONS -Wno-star-is-type #-} - -module X (type (X.*)) where - -type family (*) a b where { (*) a b = Either b a } diff --git a/testsuite/tests/ghc-api/annotations/StarBinderAnns.stdout b/testsuite/tests/ghc-api/annotations/StarBinderAnns.stdout deleted file mode 100644 index 9d063f0934..0000000000 --- a/testsuite/tests/ghc-api/annotations/StarBinderAnns.stdout +++ /dev/null @@ -1,38 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((StarBinderAnns.hs:1:1,AnnModule), [StarBinderAnns.hs:4:1-6]), -((StarBinderAnns.hs:1:1,AnnWhere), [StarBinderAnns.hs:4:23-27]), -((StarBinderAnns.hs:4:10-21,AnnCloseP), [StarBinderAnns.hs:4:21]), -((StarBinderAnns.hs:4:10-21,AnnOpenP), [StarBinderAnns.hs:4:10]), -((StarBinderAnns.hs:4:11-20,AnnType), [StarBinderAnns.hs:4:11-14]), -((StarBinderAnns.hs:4:16-20,AnnCloseP), [StarBinderAnns.hs:4:20]), -((StarBinderAnns.hs:4:16-20,AnnOpenP), [StarBinderAnns.hs:4:16]), -((StarBinderAnns.hs:4:16-20,AnnVal), [StarBinderAnns.hs:4:17-19]), -((StarBinderAnns.hs:6:1-19,AnnCloseC), [StarBinderAnns.hs:6:50]), -((StarBinderAnns.hs:6:1-19,AnnCloseP), [StarBinderAnns.hs:6:15]), -((StarBinderAnns.hs:6:1-19,AnnFamily), [StarBinderAnns.hs:6:6-11]), -((StarBinderAnns.hs:6:1-19,AnnOpenC), [StarBinderAnns.hs:6:27]), -((StarBinderAnns.hs:6:1-19,AnnOpenP), [StarBinderAnns.hs:6:13]), -((StarBinderAnns.hs:6:1-19,AnnSemi), [StarBinderAnns.hs:7:1]), -((StarBinderAnns.hs:6:1-19,AnnType), [StarBinderAnns.hs:6:1-4]), -((StarBinderAnns.hs:6:1-19,AnnWhere), [StarBinderAnns.hs:6:21-25]), -((StarBinderAnns.hs:6:13-15,AnnCloseP), [StarBinderAnns.hs:6:15]), -((StarBinderAnns.hs:6:13-15,AnnOpenP), [StarBinderAnns.hs:6:13]), -((StarBinderAnns.hs:6:29-31,AnnCloseP), [StarBinderAnns.hs:6:31]), -((StarBinderAnns.hs:6:29-31,AnnOpenP), [StarBinderAnns.hs:6:29]), -((StarBinderAnns.hs:6:29-48,AnnCloseP), [StarBinderAnns.hs:6:31]), -((StarBinderAnns.hs:6:29-48,AnnEqual), [StarBinderAnns.hs:6:37]), -((StarBinderAnns.hs:6:29-48,AnnOpenP), [StarBinderAnns.hs:6:29]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "StarBinderAnns.hs" 7 1 diff --git a/testsuite/tests/ghc-api/annotations/T10255.stdout b/testsuite/tests/ghc-api/annotations/T10255.stdout deleted file mode 100644 index 15df1b7f44..0000000000 --- a/testsuite/tests/ghc-api/annotations/T10255.stdout +++ /dev/null @@ -1,29 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test10255.hs:1:1,AnnModule), [Test10255.hs:2:1-6]), -((Test10255.hs:1:1,AnnWhere), [Test10255.hs:2:18-22]), -((Test10255.hs:4:1-17,AnnImport), [Test10255.hs:4:1-6]), -((Test10255.hs:4:1-17,AnnSemi), [Test10255.hs:6:1]), -((Test10255.hs:(6,1)-(7,11),AnnEqual), [Test10255.hs:6:29]), -((Test10255.hs:(6,1)-(7,11),AnnFunId), [Test10255.hs:6:1-3]), -((Test10255.hs:(6,1)-(7,11),AnnSemi), [Test10255.hs:8:1]), -((Test10255.hs:6:5-27,AnnCloseP), [Test10255.hs:6:27]), -((Test10255.hs:6:5-27,AnnOpenP), [Test10255.hs:6:5]), -((Test10255.hs:6:6-26,AnnDcolon), [Test10255.hs:6:8-9]), -((Test10255.hs:6:11-26,AnnCloseP), [Test10255.hs:6:26]), -((Test10255.hs:6:11-26,AnnOpenP), [Test10255.hs:6:11]), -((Test10255.hs:6:12-18,AnnRarrow), [Test10255.hs:6:20-21]), -((Test10255.hs:6:12-25,AnnRarrow), [Test10255.hs:6:20-21]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test10255.hs" 8 1 diff --git a/testsuite/tests/ghc-api/annotations/T10268.stdout b/testsuite/tests/ghc-api/annotations/T10268.stdout deleted file mode 100644 index 906632a59b..0000000000 --- a/testsuite/tests/ghc-api/annotations/T10268.stdout +++ /dev/null @@ -1,39 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test10268.hs:1:1,AnnModule), [Test10268.hs:3:1-6]), -((Test10268.hs:1:1,AnnWhere), [Test10268.hs:3:18-22]), -((Test10268.hs:5:1-17,AnnEqual), [Test10268.hs:5:4]), -((Test10268.hs:5:1-17,AnnFunId), [Test10268.hs:5:1-2]), -((Test10268.hs:5:1-17,AnnSemi), [Test10268.hs:7:1]), -((Test10268.hs:5:6-17,AnnDollar), [Test10268.hs:5:6]), -((Test10268.hs:7:1-27,AnnDcolon), [Test10268.hs:7:6-7]), -((Test10268.hs:7:1-27,AnnSemi), [Test10268.hs:8:1]), -((Test10268.hs:7:9,AnnRarrow), [Test10268.hs:7:11-12]), -((Test10268.hs:7:9-27,AnnRarrow), [Test10268.hs:7:11-12]), -((Test10268.hs:7:22-25,AnnCloseS), [Test10268.hs:7:25]), -((Test10268.hs:7:22-25,AnnOpenS), [Test10268.hs:7:23]), -((Test10268.hs:7:22-25,AnnSimpleQuote), [Test10268.hs:7:22]), -((Test10268.hs:8:1-16,AnnEqual), [Test10268.hs:8:6]), -((Test10268.hs:8:1-16,AnnFunId), [Test10268.hs:8:1-4]), -((Test10268.hs:8:1-16,AnnSemi), [Test10268.hs:10:1]), -((Test10268.hs:10:1-22,AnnDcolon), [Test10268.hs:10:7-8]), -((Test10268.hs:10:1-22,AnnSemi), [Test10268.hs:11:1]), -((Test10268.hs:10:18-20,AnnCloseS), [Test10268.hs:10:20]), -((Test10268.hs:10:18-20,AnnOpenS), [Test10268.hs:10:19]), -((Test10268.hs:10:18-20,AnnSimpleQuote), [Test10268.hs:10:18]), -((Test10268.hs:11:1-17,AnnEqual), [Test10268.hs:11:7]), -((Test10268.hs:11:1-17,AnnFunId), [Test10268.hs:11:1-5]), -((Test10268.hs:11:1-17,AnnSemi), [Test10268.hs:12:1]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test10268.hs" 12 1 diff --git a/testsuite/tests/ghc-api/annotations/T10269.stdout b/testsuite/tests/ghc-api/annotations/T10269.stdout deleted file mode 100644 index b0946e1812..0000000000 --- a/testsuite/tests/ghc-api/annotations/T10269.stdout +++ /dev/null @@ -1,25 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[(AnnVal, Test10269.hs:4:4-6)] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test10269.hs:1:1,AnnModule), [Test10269.hs:1:1-6]), -((Test10269.hs:1:1,AnnWhere), [Test10269.hs:1:18-22]), -((Test10269.hs:4:1-9,AnnCloseP), [Test10269.hs:4:9]), -((Test10269.hs:4:1-9,AnnOpenP), [Test10269.hs:4:1]), -((Test10269.hs:4:1-26,AnnCloseP), [Test10269.hs:4:9]), -((Test10269.hs:4:1-26,AnnEqual), [Test10269.hs:4:16]), -((Test10269.hs:4:1-26,AnnFunId), [Test10269.hs:4:4-6]), -((Test10269.hs:4:1-26,AnnOpenP), [Test10269.hs:4:1]), -((Test10269.hs:4:1-26,AnnSemi), [Test10269.hs:5:1]), -((Test10269.hs:4:2-8,AnnVal), [Test10269.hs:4:4-6]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test10269.hs" 5 1 diff --git a/testsuite/tests/ghc-api/annotations/T10276.stdout b/testsuite/tests/ghc-api/annotations/T10276.stdout deleted file mode 100644 index 4c53170e2c..0000000000 --- a/testsuite/tests/ghc-api/annotations/T10276.stdout +++ /dev/null @@ -1,71 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test10276.hs:1:1,AnnModule), [Test10276.hs:4:1-6]), -((Test10276.hs:1:1,AnnWhere), [Test10276.hs:4:18-22]), -((Test10276.hs:6:1-14,AnnEqual), [Test10276.hs:6:4]), -((Test10276.hs:6:1-14,AnnFunId), [Test10276.hs:6:1-2]), -((Test10276.hs:6:1-14,AnnSemi), [Test10276.hs:7:1]), -((Test10276.hs:6:6-14,AnnCloseQ), [Test10276.hs:6:13-14]), -((Test10276.hs:6:6-14,AnnOpenEQ), [Test10276.hs:6:6-7]), -((Test10276.hs:7:1-15,AnnEqual), [Test10276.hs:7:4]), -((Test10276.hs:7:1-15,AnnFunId), [Test10276.hs:7:1-2]), -((Test10276.hs:7:1-15,AnnSemi), [Test10276.hs:9:1]), -((Test10276.hs:7:6-15,AnnCloseQ), [Test10276.hs:7:14-15]), -((Test10276.hs:7:6-15,AnnOpenE), [Test10276.hs:7:6-8]), -((Test10276.hs:(9,1)-(11,74),AnnClass), [Test10276.hs:9:1-5]), -((Test10276.hs:(9,1)-(11,74),AnnSemi), [Test10276.hs:13:1]), -((Test10276.hs:(9,1)-(11,74),AnnWhere), [Test10276.hs:9:17-21]), -((Test10276.hs:(10,3)-(11,74),AnnEqual), [Test10276.hs:10:11]), -((Test10276.hs:(10,3)-(11,74),AnnFunId), [Test10276.hs:10:3-7]), -((Test10276.hs:(10,13)-(11,74),AnnClose), [Test10276.hs:11:72-74]), -((Test10276.hs:(10,13)-(11,74),AnnOpen), [Test10276.hs:10:13-15]), -((Test10276.hs:(10,16)-(11,71),AnnVal), [Test10276.hs:10:20]), -((Test10276.hs:10:31-42,AnnDollarDollar), [Test10276.hs:10:31-32]), -((Test10276.hs:10:33-42,AnnCloseP), [Test10276.hs:10:42]), -((Test10276.hs:10:33-42,AnnOpenP), [Test10276.hs:10:33]), -((Test10276.hs:11:25-71,AnnCloseP), [Test10276.hs:11:71]), -((Test10276.hs:11:25-71,AnnOpenP), [Test10276.hs:11:25]), -((Test10276.hs:11:26-36,AnnCloseP), [Test10276.hs:11:36]), -((Test10276.hs:11:26-36,AnnOpenP), [Test10276.hs:11:26]), -((Test10276.hs:11:26-70,AnnDcolon), [Test10276.hs:11:38-39]), -((Test10276.hs:11:27,AnnComma), [Test10276.hs:11:28]), -((Test10276.hs:11:41-70,AnnCloseP), [Test10276.hs:11:70]), -((Test10276.hs:11:41-70,AnnOpenP), [Test10276.hs:11:41]), -((Test10276.hs:11:42-44,AnnComma), [Test10276.hs:11:45]), -((Test10276.hs:11:59-69,AnnCloseS), [Test10276.hs:11:69]), -((Test10276.hs:11:59-69,AnnOpenS), [Test10276.hs:11:59]), -((Test10276.hs:(13,1)-(15,74),AnnClass), [Test10276.hs:13:1-5]), -((Test10276.hs:(13,1)-(15,74),AnnSemi), [Test10276.hs:16:1]), -((Test10276.hs:(13,1)-(15,74),AnnWhere), [Test10276.hs:13:18-22]), -((Test10276.hs:(14,3)-(15,74),AnnEqual), [Test10276.hs:14:11]), -((Test10276.hs:(14,3)-(15,74),AnnFunId), [Test10276.hs:14:3-7]), -((Test10276.hs:(14,13)-(15,74),AnnClose), [Test10276.hs:15:72-74]), -((Test10276.hs:(14,13)-(15,74),AnnOpenE), [Test10276.hs:14:13-16]), -((Test10276.hs:(14,17)-(15,71),AnnVal), [Test10276.hs:14:21]), -((Test10276.hs:14:32-43,AnnDollarDollar), [Test10276.hs:14:32-33]), -((Test10276.hs:14:34-43,AnnCloseP), [Test10276.hs:14:43]), -((Test10276.hs:14:34-43,AnnOpenP), [Test10276.hs:14:34]), -((Test10276.hs:15:25-71,AnnCloseP), [Test10276.hs:15:71]), -((Test10276.hs:15:25-71,AnnOpenP), [Test10276.hs:15:25]), -((Test10276.hs:15:26-36,AnnCloseP), [Test10276.hs:15:36]), -((Test10276.hs:15:26-36,AnnOpenP), [Test10276.hs:15:26]), -((Test10276.hs:15:26-70,AnnDcolon), [Test10276.hs:15:38-39]), -((Test10276.hs:15:27,AnnComma), [Test10276.hs:15:28]), -((Test10276.hs:15:41-70,AnnCloseP), [Test10276.hs:15:70]), -((Test10276.hs:15:41-70,AnnOpenP), [Test10276.hs:15:41]), -((Test10276.hs:15:42-44,AnnComma), [Test10276.hs:15:45]), -((Test10276.hs:15:59-69,AnnCloseS), [Test10276.hs:15:69]), -((Test10276.hs:15:59-69,AnnOpenS), [Test10276.hs:15:59]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test10276.hs" 16 1 diff --git a/testsuite/tests/ghc-api/annotations/T10278.stdout b/testsuite/tests/ghc-api/annotations/T10278.stdout deleted file mode 100644 index 7c029c6c06..0000000000 --- a/testsuite/tests/ghc-api/annotations/T10278.stdout +++ /dev/null @@ -1,99 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test10278.hs:1:1,AnnModule), [Test10278.hs:2:1-6]), -((Test10278.hs:1:1,AnnWhere), [Test10278.hs:2:18-22]), -((Test10278.hs:4:1-61,AnnDcolon), [Test10278.hs:4:16-17]), -((Test10278.hs:4:1-61,AnnSemi), [Test10278.hs:5:1]), -((Test10278.hs:4:19-61,AnnDot), [Test10278.hs:4:29]), -((Test10278.hs:4:19-61,AnnForall), [Test10278.hs:4:19-24]), -((Test10278.hs:4:31-61,AnnDot), [Test10278.hs:4:42]), -((Test10278.hs:4:31-61,AnnForall), [Test10278.hs:4:31-36]), -((Test10278.hs:4:44-46,AnnRarrow), [Test10278.hs:4:48-49]), -((Test10278.hs:4:44-61,AnnRarrow), [Test10278.hs:4:48-49]), -((Test10278.hs:4:51-54,AnnRarrow), [Test10278.hs:4:56-57]), -((Test10278.hs:4:51-61,AnnRarrow), [Test10278.hs:4:56-57]), -((Test10278.hs:5:1-26,AnnEqual), [Test10278.hs:5:16]), -((Test10278.hs:5:1-26,AnnFunId), [Test10278.hs:5:1-14]), -((Test10278.hs:5:1-26,AnnSemi), [Test10278.hs:7:1]), -((Test10278.hs:(7,1)-(11,33),AnnDcolon), [Test10278.hs:7:17-18]), -((Test10278.hs:(7,1)-(11,33),AnnSemi), [Test10278.hs:12:1]), -((Test10278.hs:7:20-39,AnnCloseP), [Test10278.hs:7:39, Test10278.hs:7:39]), -((Test10278.hs:7:20-39,AnnDarrow), [Test10278.hs:7:41-42]), -((Test10278.hs:7:20-39,AnnOpenP), [Test10278.hs:7:20, Test10278.hs:7:20]), -((Test10278.hs:7:21-24,AnnComma), [Test10278.hs:7:25]), -((Test10278.hs:(8,19)-(10,58),AnnCloseP), [Test10278.hs:10:58]), -((Test10278.hs:(8,19)-(10,58),AnnOpenP), [Test10278.hs:8:19]), -((Test10278.hs:(8,19)-(10,58),AnnRarrow), [Test10278.hs:11:23-24]), -((Test10278.hs:(8,19)-(11,33),AnnRarrow), [Test10278.hs:11:23-24]), -((Test10278.hs:(8,20)-(10,57),AnnDot), [Test10278.hs:8:30]), -((Test10278.hs:(8,20)-(10,57),AnnForall), [Test10278.hs:8:20-25]), -((Test10278.hs:(8,32)-(10,57),AnnDot), [Test10278.hs:8:43]), -((Test10278.hs:(8,32)-(10,57),AnnForall), [Test10278.hs:8:32-37]), -((Test10278.hs:9:27-50,AnnRarrow), [Test10278.hs:10:31-32]), -((Test10278.hs:(9,27)-(10,57),AnnRarrow), [Test10278.hs:10:31-32]), -((Test10278.hs:9:38-50,AnnCloseP), [Test10278.hs:9:50]), -((Test10278.hs:9:38-50,AnnOpenP), [Test10278.hs:9:38]), -((Test10278.hs:10:45-57,AnnCloseP), [Test10278.hs:10:57]), -((Test10278.hs:10:45-57,AnnOpenP), [Test10278.hs:10:45]), -((Test10278.hs:11:26,AnnRarrow), [Test10278.hs:11:28-29]), -((Test10278.hs:11:26-33,AnnRarrow), [Test10278.hs:11:28-29]), -((Test10278.hs:11:31-33,AnnCloseS), [Test10278.hs:11:33]), -((Test10278.hs:11:31-33,AnnOpenS), [Test10278.hs:11:31]), -((Test10278.hs:12:1-47,AnnEqual), [Test10278.hs:12:22]), -((Test10278.hs:12:1-47,AnnFunId), [Test10278.hs:12:1-15]), -((Test10278.hs:12:1-47,AnnSemi), [Test10278.hs:14:1]), -((Test10278.hs:12:35-44,AnnCloseP), [Test10278.hs:12:44]), -((Test10278.hs:12:35-44,AnnOpenP), [Test10278.hs:12:35]), -((Test10278.hs:(14,1)-(17,80),AnnData), [Test10278.hs:14:1-4]), -((Test10278.hs:(14,1)-(17,80),AnnSemi), [Test10278.hs:21:1]), -((Test10278.hs:(14,1)-(17,80),AnnWhere), [Test10278.hs:14:21-25]), -((Test10278.hs:15:5-64,AnnDcolon), [Test10278.hs:15:11-12]), -((Test10278.hs:15:5-64,AnnSemi), [Test10278.hs:16:5]), -((Test10278.hs:15:14-64,AnnDot), [Test10278.hs:15:23]), -((Test10278.hs:15:14-64,AnnForall), [Test10278.hs:15:14-19]), -((Test10278.hs:15:25-40,AnnCloseP), [Test10278.hs:15:40, Test10278.hs:15:40]), -((Test10278.hs:15:25-40,AnnDarrow), [Test10278.hs:15:42-43]), -((Test10278.hs:15:25-40,AnnOpenP), [Test10278.hs:15:25, Test10278.hs:15:25]), -((Test10278.hs:15:27-30,AnnComma), [Test10278.hs:15:31]), -((Test10278.hs:15:45-46,AnnBang), [Test10278.hs:15:45]), -((Test10278.hs:15:45-46,AnnRarrow), [Test10278.hs:15:48-49]), -((Test10278.hs:15:45-64,AnnRarrow), [Test10278.hs:15:48-49]), -((Test10278.hs:16:5-64,AnnDcolon), [Test10278.hs:16:11-12]), -((Test10278.hs:16:5-64,AnnSemi), [Test10278.hs:17:5]), -((Test10278.hs:16:14-64,AnnDot), [Test10278.hs:16:23]), -((Test10278.hs:16:14-64,AnnForall), [Test10278.hs:16:14-19]), -((Test10278.hs:16:25-40,AnnCloseP), [Test10278.hs:16:40, Test10278.hs:16:40]), -((Test10278.hs:16:25-40,AnnDarrow), [Test10278.hs:16:42-43]), -((Test10278.hs:16:25-40,AnnOpenP), [Test10278.hs:16:25, Test10278.hs:16:25]), -((Test10278.hs:16:27-30,AnnComma), [Test10278.hs:16:31]), -((Test10278.hs:16:45-46,AnnBang), [Test10278.hs:16:45]), -((Test10278.hs:16:45-46,AnnRarrow), [Test10278.hs:16:48-49]), -((Test10278.hs:16:45-64,AnnRarrow), [Test10278.hs:16:48-49]), -((Test10278.hs:17:5-80,AnnDcolon), [Test10278.hs:17:12-13]), -((Test10278.hs:17:15-20,AnnCloseP), [Test10278.hs:17:20]), -((Test10278.hs:17:15-20,AnnDarrow), [Test10278.hs:17:22-23]), -((Test10278.hs:17:15-20,AnnOpenP), [Test10278.hs:17:15]), -((Test10278.hs:17:25-80,AnnDot), [Test10278.hs:17:34]), -((Test10278.hs:17:25-80,AnnForall), [Test10278.hs:17:25-30]), -((Test10278.hs:17:36-51,AnnCloseP), [Test10278.hs:17:51, Test10278.hs:17:51]), -((Test10278.hs:17:36-51,AnnDarrow), [Test10278.hs:17:53-54]), -((Test10278.hs:17:36-51,AnnOpenP), [Test10278.hs:17:36, Test10278.hs:17:36]), -((Test10278.hs:17:38-41,AnnComma), [Test10278.hs:17:42]), -((Test10278.hs:17:56-57,AnnBang), [Test10278.hs:17:56]), -((Test10278.hs:17:56-57,AnnRarrow), [Test10278.hs:17:59-60]), -((Test10278.hs:17:56-80,AnnRarrow), [Test10278.hs:17:59-60]), -((Test10278.hs:17:62,AnnRarrow), [Test10278.hs:17:64-65]), -((Test10278.hs:17:62-80,AnnRarrow), [Test10278.hs:17:64-65]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test10278.hs" 21 1 diff --git a/testsuite/tests/ghc-api/annotations/T10280.stdout b/testsuite/tests/ghc-api/annotations/T10280.stdout deleted file mode 100644 index e291777a0e..0000000000 --- a/testsuite/tests/ghc-api/annotations/T10280.stdout +++ /dev/null @@ -1,28 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test10280.hs:1:1,AnnModule), [Test10280.hs:2:1-6]), -((Test10280.hs:1:1,AnnWhere), [Test10280.hs:2:18-22]), -((Test10280.hs:4:1-45,AnnEqual), [Test10280.hs:4:6]), -((Test10280.hs:4:1-45,AnnFunId), [Test10280.hs:4:1-4]), -((Test10280.hs:4:1-45,AnnSemi), [Test10280.hs:5:1]), -((Test10280.hs:4:35-45,AnnCloseP), [Test10280.hs:4:45]), -((Test10280.hs:4:35-45,AnnOpenP), [Test10280.hs:4:35]), -((Test10280.hs:4:36-40,AnnCloseP), [Test10280.hs:4:40]), -((Test10280.hs:4:36-40,AnnOpenP), [Test10280.hs:4:36]), -((Test10280.hs:4:36-44,AnnVal), [Test10280.hs:4:42]), -((Test10280.hs:4:37,AnnComma), [Test10280.hs:4:37]), -((Test10280.hs:4:38-39,AnnCloseP), [Test10280.hs:4:39]), -((Test10280.hs:4:38-39,AnnOpenP), [Test10280.hs:4:38]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test10280.hs" 5 1 diff --git a/testsuite/tests/ghc-api/annotations/T10307.stdout b/testsuite/tests/ghc-api/annotations/T10307.stdout deleted file mode 100644 index 163bfb6b82..0000000000 --- a/testsuite/tests/ghc-api/annotations/T10307.stdout +++ /dev/null @@ -1,28 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test10307.hs:1:1,AnnModule), [Test10307.hs:2:1-6]), -((Test10307.hs:1:1,AnnWhere), [Test10307.hs:2:18-22]), -((Test10307.hs:(4,1)-(6,34),AnnClass), [Test10307.hs:4:1-5]), -((Test10307.hs:(4,1)-(6,34),AnnSemi), [Test10307.hs:7:1]), -((Test10307.hs:(4,1)-(6,34),AnnWhere), [Test10307.hs:4:18-22]), -((Test10307.hs:5:3-34,AnnDcolon), [Test10307.hs:5:31-32]), -((Test10307.hs:5:3-34,AnnSemi), [Test10307.hs:6:3]), -((Test10307.hs:5:3-34,AnnType), [Test10307.hs:5:3-6]), -((Test10307.hs:6:3-34,AnnEqual), [Test10307.hs:6:31]), -((Test10307.hs:6:3-34,AnnType), [Test10307.hs:6:3-6]), -((Test10307.hs:6:8-34,AnnEqual), [Test10307.hs:6:31]), -((Test10307.hs:6:33-34,AnnCloseP), [Test10307.hs:6:34]), -((Test10307.hs:6:33-34,AnnOpenP), [Test10307.hs:6:33]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test10307.hs" 7 1 diff --git a/testsuite/tests/ghc-api/annotations/T10309.stdout b/testsuite/tests/ghc-api/annotations/T10309.stdout deleted file mode 100644 index a929c1b70c..0000000000 --- a/testsuite/tests/ghc-api/annotations/T10309.stdout +++ /dev/null @@ -1,29 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test10309.hs:1:1,AnnModule), [Test10309.hs:2:1-6]), -((Test10309.hs:1:1,AnnWhere), [Test10309.hs:2:18-22]), -((Test10309.hs:(4,1)-(6,34),AnnData), [Test10309.hs:4:1-4]), -((Test10309.hs:(4,1)-(6,34),AnnSemi), [Test10309.hs:7:1]), -((Test10309.hs:(4,1)-(6,34),AnnWhere), [Test10309.hs:4:13-17]), -((Test10309.hs:(5,3)-(6,34),AnnDcolon), [Test10309.hs:5:6-7]), -((Test10309.hs:5:9-15,AnnCloseP), [Test10309.hs:5:15]), -((Test10309.hs:5:9-15,AnnDarrow), [Test10309.hs:5:17-18]), -((Test10309.hs:5:9-15,AnnOpenP), [Test10309.hs:5:9]), -((Test10309.hs:(5,20)-(6,20),AnnCloseC), [Test10309.hs:6:20]), -((Test10309.hs:(5,20)-(6,20),AnnOpenC), [Test10309.hs:5:20]), -((Test10309.hs:(5,20)-(6,20),AnnRarrow), [Test10309.hs:6:22-23]), -((Test10309.hs:(5,20)-(6,34),AnnRarrow), [Test10309.hs:6:22-23]), -((Test10309.hs:5:22-31,AnnDcolon), [Test10309.hs:5:28-29]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test10309.hs" 7 1 diff --git a/testsuite/tests/ghc-api/annotations/T10312.stdout b/testsuite/tests/ghc-api/annotations/T10312.stdout deleted file mode 100644 index 5a46df4f86..0000000000 --- a/testsuite/tests/ghc-api/annotations/T10312.stdout +++ /dev/null @@ -1,258 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test10312.hs:1:1,AnnModule), [Test10312.hs:4:1-6]), -((Test10312.hs:1:1,AnnWhere), [Test10312.hs:4:18-22]), -((Test10312.hs:8:1-15,AnnImport), [Test10312.hs:8:1-6]), -((Test10312.hs:8:1-15,AnnSemi), [Test10312.hs:9:1]), -((Test10312.hs:9:1-30,AnnAs), [Test10312.hs:9:27-28]), -((Test10312.hs:9:1-30,AnnImport), [Test10312.hs:9:1-6]), -((Test10312.hs:9:1-30,AnnQualified), [Test10312.hs:9:8-16]), -((Test10312.hs:9:1-30,AnnSemi), [Test10312.hs:10:1]), -((Test10312.hs:10:1-27,AnnImport), [Test10312.hs:10:1-6]), -((Test10312.hs:10:1-27,AnnSemi), [Test10312.hs:11:1]), -((Test10312.hs:10:17-27,AnnCloseP), [Test10312.hs:10:27]), -((Test10312.hs:10:17-27,AnnOpenP), [Test10312.hs:10:17]), -((Test10312.hs:11:1-25,AnnImport), [Test10312.hs:11:1-6]), -((Test10312.hs:11:1-25,AnnSemi), [Test10312.hs:15:1]), -((Test10312.hs:11:18-25,AnnCloseP), [Test10312.hs:11:25]), -((Test10312.hs:11:18-25,AnnOpenP), [Test10312.hs:11:18]), -((Test10312.hs:15:1-24,AnnDcolon), [Test10312.hs:15:17-18]), -((Test10312.hs:15:1-24,AnnSemi), [Test10312.hs:16:1]), -((Test10312.hs:15:20-24,AnnCloseS), [Test10312.hs:15:24]), -((Test10312.hs:15:20-24,AnnOpenS), [Test10312.hs:15:20]), -((Test10312.hs:(16,1)-(20,19),AnnEqual), [Test10312.hs:16:17]), -((Test10312.hs:(16,1)-(20,19),AnnFunId), [Test10312.hs:16:1-15]), -((Test10312.hs:(16,1)-(20,19),AnnSemi), [Test10312.hs:22:1]), -((Test10312.hs:(16,19)-(20,19),AnnCloseS), [Test10312.hs:20:19]), -((Test10312.hs:(16,19)-(20,19),AnnOpenS), [Test10312.hs:16:19]), -((Test10312.hs:(16,19)-(20,19),AnnVbar), [Test10312.hs:17:19]), -((Test10312.hs:16:21-25,AnnVal), [Test10312.hs:16:23]), -((Test10312.hs:16:21-29,AnnVal), [Test10312.hs:16:27]), -((Test10312.hs:17:21-32,AnnComma), [Test10312.hs:18:19]), -((Test10312.hs:17:21-32,AnnLarrow), [Test10312.hs:17:23-24]), -((Test10312.hs:17:26-32,AnnCloseS), [Test10312.hs:17:32]), -((Test10312.hs:17:26-32,AnnDotdot), [Test10312.hs:17:28-29]), -((Test10312.hs:17:26-32,AnnOpenS), [Test10312.hs:17:26]), -((Test10312.hs:18:21-33,AnnComma), [Test10312.hs:19:19]), -((Test10312.hs:18:21-33,AnnLarrow), [Test10312.hs:18:23-24]), -((Test10312.hs:18:26-33,AnnCloseS), [Test10312.hs:18:33]), -((Test10312.hs:18:26-33,AnnDotdot), [Test10312.hs:18:29-30]), -((Test10312.hs:18:26-33,AnnOpenS), [Test10312.hs:18:26]), -((Test10312.hs:19:21-33,AnnLarrow), [Test10312.hs:19:23-24]), -((Test10312.hs:19:26-33,AnnCloseS), [Test10312.hs:19:33]), -((Test10312.hs:19:26-33,AnnDotdot), [Test10312.hs:19:29-30]), -((Test10312.hs:19:26-33,AnnOpenS), [Test10312.hs:19:26]), -((Test10312.hs:22:1-25,AnnDcolon), [Test10312.hs:22:18-19]), -((Test10312.hs:22:1-25,AnnSemi), [Test10312.hs:23:1]), -((Test10312.hs:22:21-25,AnnCloseS), [Test10312.hs:22:25]), -((Test10312.hs:22:21-25,AnnOpenS), [Test10312.hs:22:21]), -((Test10312.hs:(23,1)-(27,20),AnnEqual), [Test10312.hs:23:18]), -((Test10312.hs:(23,1)-(27,20),AnnFunId), [Test10312.hs:23:1-16]), -((Test10312.hs:(23,1)-(27,20),AnnSemi), [Test10312.hs:32:1]), -((Test10312.hs:(23,20)-(27,20),AnnCloseS), [Test10312.hs:27:20]), -((Test10312.hs:(23,20)-(27,20),AnnOpenS), [Test10312.hs:23:20]), -((Test10312.hs:(23,20)-(27,20),AnnVbar), [Test10312.hs:24:20]), -((Test10312.hs:23:22-26,AnnVal), [Test10312.hs:23:24]), -((Test10312.hs:23:22-30,AnnVal), [Test10312.hs:23:28]), -((Test10312.hs:24:22-33,AnnLarrow), [Test10312.hs:24:24-25]), -((Test10312.hs:24:22-33,AnnVbar), [Test10312.hs:25:20]), -((Test10312.hs:24:27-33,AnnCloseS), [Test10312.hs:24:33]), -((Test10312.hs:24:27-33,AnnDotdot), [Test10312.hs:24:29-30]), -((Test10312.hs:24:27-33,AnnOpenS), [Test10312.hs:24:27]), -((Test10312.hs:25:22-34,AnnLarrow), [Test10312.hs:25:24-25]), -((Test10312.hs:25:22-34,AnnVbar), [Test10312.hs:26:20]), -((Test10312.hs:25:27-34,AnnCloseS), [Test10312.hs:25:34]), -((Test10312.hs:25:27-34,AnnDotdot), [Test10312.hs:25:30-31]), -((Test10312.hs:25:27-34,AnnOpenS), [Test10312.hs:25:27]), -((Test10312.hs:26:22-34,AnnLarrow), [Test10312.hs:26:24-25]), -((Test10312.hs:26:27-34,AnnCloseS), [Test10312.hs:26:34]), -((Test10312.hs:26:27-34,AnnDotdot), [Test10312.hs:26:30-31]), -((Test10312.hs:26:27-34,AnnOpenS), [Test10312.hs:26:27]), -((Test10312.hs:32:1-13,AnnDcolon), [Test10312.hs:32:6-7]), -((Test10312.hs:32:1-13,AnnSemi), [Test10312.hs:33:1]), -((Test10312.hs:32:9-13,AnnCloseS), [Test10312.hs:32:13]), -((Test10312.hs:32:9-13,AnnOpenS), [Test10312.hs:32:9]), -((Test10312.hs:(33,1)-(36,16),AnnEqual), [Test10312.hs:33:6]), -((Test10312.hs:(33,1)-(36,16),AnnFunId), [Test10312.hs:33:1-4]), -((Test10312.hs:(33,1)-(36,16),AnnSemi), [Test10312.hs:38:1]), -((Test10312.hs:33:8-12,AnnVal), [Test10312.hs:33:10]), -((Test10312.hs:(33,8)-(36,16),AnnVal), [Test10312.hs:33:14]), -((Test10312.hs:(33,16)-(36,16),AnnCloseS), [Test10312.hs:36:16]), -((Test10312.hs:(33,16)-(36,16),AnnOpenS), [Test10312.hs:33:16]), -((Test10312.hs:(33,16)-(36,16),AnnVbar), [Test10312.hs:34:16]), -((Test10312.hs:33:18-22,AnnVal), [Test10312.hs:33:20]), -((Test10312.hs:34:18-26,AnnLarrow), [Test10312.hs:34:20-21]), -((Test10312.hs:34:18-26,AnnVbar), [Test10312.hs:35:16]), -((Test10312.hs:35:18-31,AnnLarrow), [Test10312.hs:35:20-21]), -((Test10312.hs:38:1-17,AnnDcolon), [Test10312.hs:38:10-11]), -((Test10312.hs:38:1-17,AnnSemi), [Test10312.hs:39:1]), -((Test10312.hs:38:13-17,AnnCloseS), [Test10312.hs:38:17]), -((Test10312.hs:38:13-17,AnnOpenS), [Test10312.hs:38:13]), -((Test10312.hs:(39,1)-(43,20),AnnEqual), [Test10312.hs:39:10]), -((Test10312.hs:(39,1)-(43,20),AnnFunId), [Test10312.hs:39:1-8]), -((Test10312.hs:(39,1)-(43,20),AnnSemi), [Test10312.hs:46:1]), -((Test10312.hs:39:12-16,AnnVal), [Test10312.hs:39:14]), -((Test10312.hs:(39,12)-(43,20),AnnVal), [Test10312.hs:39:18]), -((Test10312.hs:(39,20)-(43,20),AnnCloseS), [Test10312.hs:43:20]), -((Test10312.hs:(39,20)-(43,20),AnnOpenS), [Test10312.hs:39:20]), -((Test10312.hs:(39,20)-(43,20),AnnVbar), [Test10312.hs:40:20]), -((Test10312.hs:39:22-26,AnnVal), [Test10312.hs:39:24]), -((Test10312.hs:39:22-30,AnnVal), [Test10312.hs:39:28]), -((Test10312.hs:40:22-30,AnnLarrow), [Test10312.hs:40:24-25]), -((Test10312.hs:40:22-30,AnnVbar), [Test10312.hs:41:20]), -((Test10312.hs:41:22-35,AnnLarrow), [Test10312.hs:41:24-25]), -((Test10312.hs:41:22-35,AnnVbar), [Test10312.hs:42:20]), -((Test10312.hs:42:22-42,AnnLarrow), [Test10312.hs:42:24-25]), -((Test10312.hs:42:32-42,AnnCloseP), [Test10312.hs:42:42]), -((Test10312.hs:42:32-42,AnnOpenP), [Test10312.hs:42:32]), -((Test10312.hs:(46,1)-(50,23),AnnData), [Test10312.hs:46:1-4]), -((Test10312.hs:(46,1)-(50,23),AnnEqual), [Test10312.hs:46:16]), -((Test10312.hs:(46,1)-(50,23),AnnSemi), [Test10312.hs:52:1]), -((Test10312.hs:(47,3)-(50,3),AnnCloseC), [Test10312.hs:50:3]), -((Test10312.hs:(47,3)-(50,3),AnnOpenC), [Test10312.hs:47:3]), -((Test10312.hs:47:5-23,AnnComma), [Test10312.hs:48:3]), -((Test10312.hs:47:5-23,AnnDcolon), [Test10312.hs:47:15-16]), -((Test10312.hs:48:5-22,AnnComma), [Test10312.hs:49:3]), -((Test10312.hs:48:5-22,AnnDcolon), [Test10312.hs:48:14-15]), -((Test10312.hs:49:5-20,AnnDcolon), [Test10312.hs:49:15-16]), -((Test10312.hs:50:5-23,AnnDeriving), [Test10312.hs:50:5-12]), -((Test10312.hs:50:14-23,AnnCloseP), [Test10312.hs:50:23]), -((Test10312.hs:50:14-23,AnnOpenP), [Test10312.hs:50:14]), -((Test10312.hs:50:15-18,AnnComma), [Test10312.hs:50:19]), -((Test10312.hs:52:1-22,AnnDcolon), [Test10312.hs:52:9-10]), -((Test10312.hs:52:1-22,AnnSemi), [Test10312.hs:53:1]), -((Test10312.hs:52:12-22,AnnCloseS), [Test10312.hs:52:22]), -((Test10312.hs:52:12-22,AnnOpenS), [Test10312.hs:52:12]), -((Test10312.hs:(53,1)-(59,11),AnnEqual), [Test10312.hs:53:9]), -((Test10312.hs:(53,1)-(59,11),AnnFunId), [Test10312.hs:53:1-7]), -((Test10312.hs:(53,1)-(59,11),AnnSemi), [Test10312.hs:61:1]), -((Test10312.hs:(53,11)-(59,11),AnnCloseS), [Test10312.hs:59:11]), -((Test10312.hs:(53,11)-(59,11),AnnOpenS), [Test10312.hs:53:11]), -((Test10312.hs:53:13-44,AnnComma), [Test10312.hs:54:11]), -((Test10312.hs:54:13-44,AnnComma), [Test10312.hs:55:11]), -((Test10312.hs:55:13-43,AnnComma), [Test10312.hs:56:11]), -((Test10312.hs:56:13-45,AnnComma), [Test10312.hs:57:11]), -((Test10312.hs:57:13-44,AnnComma), [Test10312.hs:58:11]), -((Test10312.hs:61:1-40,AnnDcolon), [Test10312.hs:61:8-9]), -((Test10312.hs:61:1-40,AnnSemi), [Test10312.hs:62:1]), -((Test10312.hs:61:11-13,AnnRarrow), [Test10312.hs:61:15-16]), -((Test10312.hs:61:11-40,AnnRarrow), [Test10312.hs:61:15-16]), -((Test10312.hs:61:18-28,AnnCloseS), [Test10312.hs:61:28]), -((Test10312.hs:61:18-28,AnnOpenS), [Test10312.hs:61:18]), -((Test10312.hs:61:18-28,AnnRarrow), [Test10312.hs:61:30-31]), -((Test10312.hs:61:18-40,AnnRarrow), [Test10312.hs:61:30-31]), -((Test10312.hs:61:33-40,AnnCloseS), [Test10312.hs:61:40]), -((Test10312.hs:61:33-40,AnnOpenS), [Test10312.hs:61:33]), -((Test10312.hs:(62,1)-(66,16),AnnEqual), [Test10312.hs:62:14]), -((Test10312.hs:(62,1)-(66,16),AnnFunId), [Test10312.hs:62:1-6]), -((Test10312.hs:(62,1)-(66,16),AnnSemi), [Test10312.hs:68:1]), -((Test10312.hs:(62,16)-(66,16),AnnCloseS), [Test10312.hs:66:16]), -((Test10312.hs:(62,16)-(66,16),AnnOpenS), [Test10312.hs:62:16]), -((Test10312.hs:(62,16)-(66,16),AnnVbar), [Test10312.hs:63:16]), -((Test10312.hs:62:18-33,AnnVal), [Test10312.hs:62:28-29]), -((Test10312.hs:62:18-45,AnnVal), [Test10312.hs:62:35-36]), -((Test10312.hs:63:18-30,AnnCloseC), [Test10312.hs:63:30]), -((Test10312.hs:63:18-30,AnnDotdot), [Test10312.hs:63:28-29]), -((Test10312.hs:63:18-30,AnnOpenC), [Test10312.hs:63:27]), -((Test10312.hs:63:18-37,AnnComma), [Test10312.hs:64:16]), -((Test10312.hs:63:18-37,AnnLarrow), [Test10312.hs:63:32-33]), -((Test10312.hs:(63,18)-(64,43),AnnBy), [Test10312.hs:64:32-33]), -((Test10312.hs:(63,18)-(64,43),AnnComma), [Test10312.hs:65:16]), -((Test10312.hs:(63,18)-(64,43),AnnThen), [Test10312.hs:64:18-21]), -((Test10312.hs:(63,18)-(65,28),AnnThen), [Test10312.hs:65:18-21]), -((Test10312.hs:68:1-51,AnnDcolon), [Test10312.hs:68:16-17]), -((Test10312.hs:68:1-51,AnnSemi), [Test10312.hs:69:1]), -((Test10312.hs:68:19-23,AnnDarrow), [Test10312.hs:68:25-26]), -((Test10312.hs:68:28-35,AnnCloseP), [Test10312.hs:68:35]), -((Test10312.hs:68:28-35,AnnOpenP), [Test10312.hs:68:28]), -((Test10312.hs:68:28-35,AnnRarrow), [Test10312.hs:68:37-38]), -((Test10312.hs:68:28-51,AnnRarrow), [Test10312.hs:68:37-38]), -((Test10312.hs:68:29,AnnRarrow), [Test10312.hs:68:31-32]), -((Test10312.hs:68:29-34,AnnRarrow), [Test10312.hs:68:31-32]), -((Test10312.hs:68:40-42,AnnCloseS), [Test10312.hs:68:42]), -((Test10312.hs:68:40-42,AnnOpenS), [Test10312.hs:68:40]), -((Test10312.hs:68:40-42,AnnRarrow), [Test10312.hs:68:44-45]), -((Test10312.hs:68:40-51,AnnRarrow), [Test10312.hs:68:44-45]), -((Test10312.hs:68:47-51,AnnCloseS), [Test10312.hs:68:51]), -((Test10312.hs:68:47-51,AnnOpenS), [Test10312.hs:68:47]), -((Test10312.hs:68:48-50,AnnCloseS), [Test10312.hs:68:50]), -((Test10312.hs:68:48-50,AnnOpenS), [Test10312.hs:68:48]), -((Test10312.hs:69:1-69,AnnEqual), [Test10312.hs:69:18]), -((Test10312.hs:69:1-69,AnnFunId), [Test10312.hs:69:1-14]), -((Test10312.hs:69:1-69,AnnSemi), [Test10312.hs:71:1]), -((Test10312.hs:69:20-69,AnnVal), [Test10312.hs:69:57]), -((Test10312.hs:69:27-55,AnnCloseP), [Test10312.hs:69:55]), -((Test10312.hs:69:27-55,AnnOpenP), [Test10312.hs:69:27]), -((Test10312.hs:69:38-54,AnnCloseP), [Test10312.hs:69:54]), -((Test10312.hs:69:38-54,AnnOpenP), [Test10312.hs:69:38]), -((Test10312.hs:69:39-53,AnnVal), [Test10312.hs:69:46]), -((Test10312.hs:71:1-50,AnnDcolon), [Test10312.hs:71:16-17]), -((Test10312.hs:71:1-50,AnnSemi), [Test10312.hs:72:1]), -((Test10312.hs:71:19-29,AnnCloseS), [Test10312.hs:71:29]), -((Test10312.hs:71:19-29,AnnOpenS), [Test10312.hs:71:19]), -((Test10312.hs:71:19-29,AnnRarrow), [Test10312.hs:71:31-32]), -((Test10312.hs:71:19-50,AnnRarrow), [Test10312.hs:71:31-32]), -((Test10312.hs:71:34-50,AnnCloseS), [Test10312.hs:71:50]), -((Test10312.hs:71:34-50,AnnOpenS), [Test10312.hs:71:34]), -((Test10312.hs:71:35-49,AnnCloseP), [Test10312.hs:71:49]), -((Test10312.hs:71:35-49,AnnOpenP), [Test10312.hs:71:35]), -((Test10312.hs:71:36-38,AnnComma), [Test10312.hs:71:39]), -((Test10312.hs:71:41-48,AnnCloseS), [Test10312.hs:71:48]), -((Test10312.hs:71:41-48,AnnOpenS), [Test10312.hs:71:41]), -((Test10312.hs:(72,1)-(75,22),AnnEqual), [Test10312.hs:72:20]), -((Test10312.hs:(72,1)-(75,22),AnnFunId), [Test10312.hs:72:1-14]), -((Test10312.hs:(72,1)-(75,22),AnnSemi), [Test10312.hs:77:1]), -((Test10312.hs:(72,22)-(75,22),AnnCloseS), [Test10312.hs:75:22]), -((Test10312.hs:(72,22)-(75,22),AnnOpenS), [Test10312.hs:72:22]), -((Test10312.hs:(72,22)-(75,22),AnnVbar), [Test10312.hs:73:22]), -((Test10312.hs:72:24-49,AnnCloseP), [Test10312.hs:72:49]), -((Test10312.hs:72:24-49,AnnOpenP), [Test10312.hs:72:24]), -((Test10312.hs:72:25-37,AnnComma), [Test10312.hs:72:38]), -((Test10312.hs:73:24-36,AnnCloseC), [Test10312.hs:73:36]), -((Test10312.hs:73:24-36,AnnDotdot), [Test10312.hs:73:34-35]), -((Test10312.hs:73:24-36,AnnOpenC), [Test10312.hs:73:33]), -((Test10312.hs:73:24-43,AnnComma), [Test10312.hs:74:22]), -((Test10312.hs:73:24-43,AnnLarrow), [Test10312.hs:73:38-39]), -((Test10312.hs:(73,24)-(74,67),AnnBy), [Test10312.hs:74:35-36]), -((Test10312.hs:(73,24)-(74,67),AnnGroup), [Test10312.hs:74:29-33]), -((Test10312.hs:(73,24)-(74,67),AnnThen), [Test10312.hs:74:24-27]), -((Test10312.hs:(73,24)-(74,67),AnnUsing), [Test10312.hs:74:48-52]), -((Test10312.hs:(77,1)-(79,80),AnnEqual), [Test10312.hs:77:9]), -((Test10312.hs:(77,1)-(79,80),AnnFunId), [Test10312.hs:77:1-7]), -((Test10312.hs:(77,1)-(79,80),AnnSemi), [Test10312.hs:80:1]), -((Test10312.hs:(77,11)-(79,80),AnnCloseS), [Test10312.hs:79:80]), -((Test10312.hs:(77,11)-(79,80),AnnOpenS), [Test10312.hs:77:11]), -((Test10312.hs:(77,11)-(79,80),AnnVbar), [Test10312.hs:77:32]), -((Test10312.hs:77:13-30,AnnCloseP), [Test10312.hs:77:30]), -((Test10312.hs:77:13-30,AnnOpenP), [Test10312.hs:77:13]), -((Test10312.hs:77:14,AnnComma), [Test10312.hs:77:15]), -((Test10312.hs:77:17-21,AnnComma), [Test10312.hs:77:22]), -((Test10312.hs:77:34-48,AnnCloseP), [Test10312.hs:77:48]), -((Test10312.hs:77:34-48,AnnOpenP), [Test10312.hs:77:34]), -((Test10312.hs:77:34-54,AnnComma), [Test10312.hs:78:36]), -((Test10312.hs:77:34-54,AnnLarrow), [Test10312.hs:77:50-51]), -((Test10312.hs:(77,34)-(79,78),AnnBy), [Test10312.hs:79:49-50]), -((Test10312.hs:(77,34)-(79,78),AnnGroup), [Test10312.hs:79:43-47]), -((Test10312.hs:(77,34)-(79,78),AnnThen), [Test10312.hs:79:38-41]), -((Test10312.hs:(77,34)-(79,78),AnnUsing), [Test10312.hs:79:64-68]), -((Test10312.hs:77:35,AnnComma), [Test10312.hs:77:36]), -((Test10312.hs:78:38-53,AnnComma), [Test10312.hs:79:36]), -((Test10312.hs:78:38-53,AnnLet), [Test10312.hs:78:38-40]), -((Test10312.hs:78:42-53,AnnEqual), [Test10312.hs:78:45]), -((Test10312.hs:78:42-53,AnnFunId), [Test10312.hs:78:42-43]), -((Test10312.hs:79:57-62,AnnCloseP), [Test10312.hs:79:62]), -((Test10312.hs:79:57-62,AnnOpenP), [Test10312.hs:79:57]), -((Test10312.hs:79:58,AnnComma), [Test10312.hs:79:59]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test10312.hs" 80 1 diff --git a/testsuite/tests/ghc-api/annotations/T10313.stdout b/testsuite/tests/ghc-api/annotations/T10313.stdout deleted file mode 100644 index a85e849548..0000000000 --- a/testsuite/tests/ghc-api/annotations/T10313.stdout +++ /dev/null @@ -1,13 +0,0 @@ -[([i], [(SourceText "b\x61se", base)]), - ([w], - [(SourceText "New Z3 API support is still incomplete and fragile: \ - \you may experience segmentation faults!", - New Z3 API support is still incomplete and fragile: you may experience segmentation faults!)]), - ([d], - [(SourceText "Deprecation: \ - \you may experience segmentation faults!", - Deprecation: you may experience segmentation faults!)]), - ([c], [(SourceText "foo\x63", fooc), (SourceText "b\x61r", bar)]), - ([r], [(SourceText "foo1\x67", foo1g)]), - ([s, t], [(SourceText "a\x62", ab)]), - ([s, c], [(SourceText "foo\x64", food)])] diff --git a/testsuite/tests/ghc-api/annotations/T10354.stdout b/testsuite/tests/ghc-api/annotations/T10354.stdout deleted file mode 100644 index 7fbc54d49c..0000000000 --- a/testsuite/tests/ghc-api/annotations/T10354.stdout +++ /dev/null @@ -1,57 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test10354.hs:1:1,AnnModule), [Test10354.hs:2:1-6]), -((Test10354.hs:1:1,AnnWhere), [Test10354.hs:2:18-22]), -((Test10354.hs:4:1-34,AnnDcolon), [Test10354.hs:4:3-4]), -((Test10354.hs:4:1-34,AnnSemi), [Test10354.hs:5:1]), -((Test10354.hs:4:6-16,AnnCloseP), [Test10354.hs:4:16, Test10354.hs:4:15]), -((Test10354.hs:4:6-16,AnnDarrow), [Test10354.hs:4:18-19]), -((Test10354.hs:4:6-16,AnnOpenP), [Test10354.hs:4:6, Test10354.hs:4:7]), -((Test10354.hs:4:7-15,AnnCloseP), [Test10354.hs:4:15]), -((Test10354.hs:4:7-15,AnnOpenP), [Test10354.hs:4:7]), -((Test10354.hs:4:8-11,AnnComma), [Test10354.hs:4:12]), -((Test10354.hs:4:21,AnnRarrow), [Test10354.hs:4:23-24]), -((Test10354.hs:4:21-34,AnnRarrow), [Test10354.hs:4:23-24]), -((Test10354.hs:4:26,AnnRarrow), [Test10354.hs:4:28-29]), -((Test10354.hs:4:26-34,AnnRarrow), [Test10354.hs:4:28-29]), -((Test10354.hs:5:1-14,AnnEqual), [Test10354.hs:5:7]), -((Test10354.hs:5:1-14,AnnFunId), [Test10354.hs:5:1]), -((Test10354.hs:5:1-14,AnnSemi), [Test10354.hs:7:1]), -((Test10354.hs:5:9-14,AnnVal), [Test10354.hs:5:11-12]), -((Test10354.hs:7:1-24,AnnDcolon), [Test10354.hs:7:5-6]), -((Test10354.hs:7:1-24,AnnSemi), [Test10354.hs:8:1]), -((Test10354.hs:7:8-12,AnnCloseP), [Test10354.hs:7:12, Test10354.hs:7:12]), -((Test10354.hs:7:8-12,AnnDarrow), [Test10354.hs:7:14-15]), -((Test10354.hs:7:8-12,AnnOpenP), [Test10354.hs:7:8, Test10354.hs:7:8]), -((Test10354.hs:7:8-12,AnnUnit), [Test10354.hs:7:8-12]), -((Test10354.hs:7:17,AnnRarrow), [Test10354.hs:7:18-19]), -((Test10354.hs:7:17-24,AnnRarrow), [Test10354.hs:7:18-19]), -((Test10354.hs:8:1-15,AnnEqual), [Test10354.hs:8:5]), -((Test10354.hs:8:1-15,AnnFunId), [Test10354.hs:8:1-3]), -((Test10354.hs:8:1-15,AnnSemi), [Test10354.hs:10:1]), -((Test10354.hs:10:1-23,AnnDcolon), [Test10354.hs:10:5-6]), -((Test10354.hs:10:1-23,AnnSemi), [Test10354.hs:11:1]), -((Test10354.hs:10:8,AnnDarrow), [Test10354.hs:10:10-11]), -((Test10354.hs:10:13,AnnRarrow), [Test10354.hs:10:15-16]), -((Test10354.hs:10:13-23,AnnRarrow), [Test10354.hs:10:15-16]), -((Test10354.hs:11:1-15,AnnEqual), [Test10354.hs:11:5]), -((Test10354.hs:11:1-15,AnnFunId), [Test10354.hs:11:1-3]), -((Test10354.hs:11:1-15,AnnSemi), [Test10354.hs:13:1]), -((Test10354.hs:13:1-17,AnnDcolon), [Test10354.hs:13:5-6]), -((Test10354.hs:13:1-17,AnnSemi), [Test10354.hs:14:1]), -((Test10354.hs:14:1-15,AnnEqual), [Test10354.hs:14:5]), -((Test10354.hs:14:1-15,AnnFunId), [Test10354.hs:14:1-3]), -((Test10354.hs:14:1-15,AnnSemi), [Test10354.hs:15:1]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test10354.hs" 15 1 diff --git a/testsuite/tests/ghc-api/annotations/T10357.stdout b/testsuite/tests/ghc-api/annotations/T10357.stdout deleted file mode 100644 index 4810a59cd7..0000000000 --- a/testsuite/tests/ghc-api/annotations/T10357.stdout +++ /dev/null @@ -1,64 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test10357.hs:1:1,AnnModule), [Test10357.hs:2:1-6]), -((Test10357.hs:1:1,AnnWhere), [Test10357.hs:2:18-22]), -((Test10357.hs:(4,1)-(13,5),AnnEqual), [Test10357.hs:4:11]), -((Test10357.hs:(4,1)-(13,5),AnnFunId), [Test10357.hs:4:1-9]), -((Test10357.hs:(4,1)-(13,5),AnnSemi), [Test10357.hs:14:1]), -((Test10357.hs:4:13-19,AnnVal), [Test10357.hs:4:17]), -((Test10357.hs:(4,13)-(13,5),AnnVal), [Test10357.hs:4:21]), -((Test10357.hs:(5,5)-(13,5),AnnCloseS), [Test10357.hs:13:5]), -((Test10357.hs:(5,5)-(13,5),AnnOpenS), [Test10357.hs:5:5]), -((Test10357.hs:(5,5)-(13,5),AnnVbar), [Test10357.hs:10:5]), -((Test10357.hs:6:9-34,AnnCloseP), [Test10357.hs:6:34]), -((Test10357.hs:6:9-34,AnnOpenP), [Test10357.hs:6:9]), -((Test10357.hs:6:18-33,AnnCloseS), [Test10357.hs:6:33]), -((Test10357.hs:6:18-33,AnnOpenS), [Test10357.hs:6:18]), -((Test10357.hs:6:25-32,AnnCloseP), [Test10357.hs:6:32]), -((Test10357.hs:6:25-32,AnnOpenP), [Test10357.hs:6:25]), -((Test10357.hs:6:26-31,AnnVal), [Test10357.hs:6:29]), -((Test10357.hs:(7,9)-(9,9),AnnCloseP), [Test10357.hs:9:9]), -((Test10357.hs:(7,9)-(9,9),AnnOpenP), [Test10357.hs:7:9]), -((Test10357.hs:7:18-57,AnnCloseP), [Test10357.hs:7:57]), -((Test10357.hs:7:18-57,AnnOpenP), [Test10357.hs:7:18]), -((Test10357.hs:7:19-56,AnnVal), [Test10357.hs:7:43-52]), -((Test10357.hs:7:27-41,AnnCloseS), [Test10357.hs:7:41]), -((Test10357.hs:7:27-41,AnnOpenS), [Test10357.hs:7:27]), -((Test10357.hs:7:28,AnnComma), [Test10357.hs:7:29]), -((Test10357.hs:7:31-36,AnnVal), [Test10357.hs:7:33]), -((Test10357.hs:7:31-40,AnnVal), [Test10357.hs:7:38]), -((Test10357.hs:7:43-52,AnnBackquote), [Test10357.hs:7:43, Test10357.hs:7:52]), -((Test10357.hs:7:43-52,AnnVal), [Test10357.hs:7:44-51]), -((Test10357.hs:8:18-59,AnnCloseP), [Test10357.hs:8:59]), -((Test10357.hs:8:18-59,AnnOpenP), [Test10357.hs:8:18]), -((Test10357.hs:8:19-58,AnnVal), [Test10357.hs:8:43-52]), -((Test10357.hs:8:37-41,AnnCloseS), [Test10357.hs:8:41]), -((Test10357.hs:8:37-41,AnnOpenS), [Test10357.hs:8:37]), -((Test10357.hs:8:38-40,AnnMinus), [Test10357.hs:8:38]), -((Test10357.hs:8:43-52,AnnBackquote), [Test10357.hs:8:43, Test10357.hs:8:52]), -((Test10357.hs:8:43-52,AnnVal), [Test10357.hs:8:44-51]), -((Test10357.hs:10:7-20,AnnComma), [Test10357.hs:10:21]), -((Test10357.hs:10:7-20,AnnLarrow), [Test10357.hs:10:13-14]), -((Test10357.hs:10:16-20,AnnCloseS), [Test10357.hs:10:20]), -((Test10357.hs:10:16-20,AnnDotdot), [Test10357.hs:10:18-19]), -((Test10357.hs:10:16-20,AnnOpenS), [Test10357.hs:10:16]), -((Test10357.hs:10:23-44,AnnLet), [Test10357.hs:10:23-25]), -((Test10357.hs:10:23-44,AnnVbar), [Test10357.hs:11:5]), -((Test10357.hs:10:27-44,AnnEqual), [Test10357.hs:10:30]), -((Test10357.hs:10:27-44,AnnFunId), [Test10357.hs:10:27-28]), -((Test10357.hs:11:7-29,AnnLarrow), [Test10357.hs:11:13-14]), -((Test10357.hs:11:7-29,AnnVbar), [Test10357.hs:12:5]), -((Test10357.hs:12:7-24,AnnLarrow), [Test10357.hs:12:13-14]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test10357.hs" 14 1 diff --git a/testsuite/tests/ghc-api/annotations/T10358.stdout b/testsuite/tests/ghc-api/annotations/T10358.stdout deleted file mode 100644 index fca1a5baa6..0000000000 --- a/testsuite/tests/ghc-api/annotations/T10358.stdout +++ /dev/null @@ -1,40 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[(AnnBang, Test10358.hs:5:19)] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test10358.hs:1:1,AnnModule), [Test10358.hs:2:1-6]), -((Test10358.hs:1:1,AnnWhere), [Test10358.hs:2:18-22]), -((Test10358.hs:(4,1)-(8,6),AnnEqual), [Test10358.hs:4:15]), -((Test10358.hs:(4,1)-(8,6),AnnFunId), [Test10358.hs:4:1-7]), -((Test10358.hs:(4,1)-(8,6),AnnSemi), [Test10358.hs:9:1]), -((Test10358.hs:(5,3)-(8,6),AnnIn), [Test10358.hs:8:3-4]), -((Test10358.hs:(5,3)-(8,6),AnnLet), [Test10358.hs:5:3-5]), -((Test10358.hs:5:7-10,AnnBang), [Test10358.hs:5:7]), -((Test10358.hs:5:7-16,AnnEqual), [Test10358.hs:5:12]), -((Test10358.hs:5:7-16,AnnFunId), [Test10358.hs:5:8-10]), -((Test10358.hs:5:7-16,AnnSemi), [Test10358.hs:5:17]), -((Test10358.hs:5:14-16,AnnVal), [Test10358.hs:5:15]), -((Test10358.hs:5:19-22,AnnBang), [Test10358.hs:5:19]), -((Test10358.hs:5:19-32,AnnEqual), [Test10358.hs:5:24]), -((Test10358.hs:5:19-32,AnnFunId), [Test10358.hs:5:20-22]), -((Test10358.hs:5:19-32,AnnSemi), [Test10358.hs:6:7]), -((Test10358.hs:5:26-32,AnnVal), [Test10358.hs:5:29]), -((Test10358.hs:6:7-16,AnnEqual), [Test10358.hs:6:10]), -((Test10358.hs:6:7-16,AnnFunId), [Test10358.hs:6:7-8]), -((Test10358.hs:6:7-16,AnnSemi), [Test10358.hs:7:7]), -((Test10358.hs:6:12-14,AnnVal), [Test10358.hs:6:13]), -((Test10358.hs:6:12-16,AnnVal), [Test10358.hs:6:15]), -((Test10358.hs:7:7-17,AnnEqual), [Test10358.hs:7:10]), -((Test10358.hs:7:7-17,AnnFunId), [Test10358.hs:7:7-8]), -((Test10358.hs:7:12-17,AnnVal), [Test10358.hs:7:14]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test10358.hs" 9 1 diff --git a/testsuite/tests/ghc-api/annotations/T10396.stdout b/testsuite/tests/ghc-api/annotations/T10396.stdout deleted file mode 100644 index 32dadc3d95..0000000000 --- a/testsuite/tests/ghc-api/annotations/T10396.stdout +++ /dev/null @@ -1,31 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test10396.hs:1:1,AnnModule), [Test10396.hs:2:1-6]), -((Test10396.hs:1:1,AnnWhere), [Test10396.hs:2:18-22]), -((Test10396.hs:4:1-15,AnnDcolon), [Test10396.hs:4:8-9]), -((Test10396.hs:4:1-15,AnnSemi), [Test10396.hs:5:1]), -((Test10396.hs:4:14-15,AnnCloseP), [Test10396.hs:4:15]), -((Test10396.hs:4:14-15,AnnOpenP), [Test10396.hs:4:14]), -((Test10396.hs:(5,1)-(7,11),AnnEqual), [Test10396.hs:5:7]), -((Test10396.hs:(5,1)-(7,11),AnnFunId), [Test10396.hs:5:1-6]), -((Test10396.hs:(5,1)-(7,11),AnnSemi), [Test10396.hs:8:1]), -((Test10396.hs:(5,9)-(7,11),AnnDo), [Test10396.hs:5:9-10]), -((Test10396.hs:6:3-27,AnnLet), [Test10396.hs:6:3-5]), -((Test10396.hs:6:3-27,AnnSemi), [Test10396.hs:7:3]), -((Test10396.hs:6:7-15,AnnDcolon), [Test10396.hs:6:10-11]), -((Test10396.hs:6:7-27,AnnEqual), [Test10396.hs:6:17]), -((Test10396.hs:7:10-11,AnnCloseP), [Test10396.hs:7:11]), -((Test10396.hs:7:10-11,AnnOpenP), [Test10396.hs:7:10]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test10396.hs" 8 1 diff --git a/testsuite/tests/ghc-api/annotations/T10399.stdout b/testsuite/tests/ghc-api/annotations/T10399.stdout deleted file mode 100644 index 7588393264..0000000000 --- a/testsuite/tests/ghc-api/annotations/T10399.stdout +++ /dev/null @@ -1,89 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test10399.hs:1:1,AnnModule), [Test10399.hs:8:1-6]), -((Test10399.hs:1:1,AnnWhere), [Test10399.hs:8:18-22]), -((Test10399.hs:10:1-35,AnnEqual), [Test10399.hs:10:10]), -((Test10399.hs:10:1-35,AnnSemi), [Test10399.hs:12:1]), -((Test10399.hs:10:1-35,AnnType), [Test10399.hs:10:1-4]), -((Test10399.hs:10:12-35,AnnDcolon), [Test10399.hs:10:24-25]), -((Test10399.hs:12:1-66,AnnEqual), [Test10399.hs:12:8]), -((Test10399.hs:12:1-66,AnnFunId), [Test10399.hs:12:1-6]), -((Test10399.hs:12:1-66,AnnSemi), [Test10399.hs:14:1]), -((Test10399.hs:12:10-66,AnnVal), [Test10399.hs:12:17]), -((Test10399.hs:12:23-66,AnnCloseP), [Test10399.hs:12:66]), -((Test10399.hs:12:23-66,AnnOpenP), [Test10399.hs:12:23]), -((Test10399.hs:12:24-33,AnnCloseP), [Test10399.hs:12:33]), -((Test10399.hs:12:24-33,AnnOpenP), [Test10399.hs:12:24]), -((Test10399.hs:12:24-44,AnnVal), [Test10399.hs:12:35-37]), -((Test10399.hs:12:24-54,AnnVal), [Test10399.hs:12:46-48]), -((Test10399.hs:12:24-65,AnnVal), [Test10399.hs:12:56-58]), -((Test10399.hs:12:25,AnnComma), [Test10399.hs:12:25]), -((Test10399.hs:12:26,AnnComma), [Test10399.hs:12:26]), -((Test10399.hs:12:27-28,AnnCloseP), [Test10399.hs:12:28]), -((Test10399.hs:12:27-28,AnnComma), [Test10399.hs:12:29]), -((Test10399.hs:12:27-28,AnnOpenP), [Test10399.hs:12:27]), -((Test10399.hs:12:30,AnnComma), [Test10399.hs:12:30]), -((Test10399.hs:12:31-32,AnnCloseP), [Test10399.hs:12:32]), -((Test10399.hs:12:31-32,AnnOpenP), [Test10399.hs:12:31]), -((Test10399.hs:(14,1)-(18,53),AnnData), [Test10399.hs:14:1-4]), -((Test10399.hs:(14,1)-(18,53),AnnSemi), [Test10399.hs:20:1]), -((Test10399.hs:(14,1)-(18,53),AnnWhere), [Test10399.hs:14:21-25]), -((Test10399.hs:15:5-64,AnnDcolon), [Test10399.hs:15:11-12]), -((Test10399.hs:15:5-64,AnnSemi), [Test10399.hs:16:5]), -((Test10399.hs:15:14-64,AnnDot), [Test10399.hs:15:23]), -((Test10399.hs:15:14-64,AnnForall), [Test10399.hs:15:14-19]), -((Test10399.hs:15:25-40,AnnCloseP), [Test10399.hs:15:40, Test10399.hs:15:40]), -((Test10399.hs:15:25-40,AnnDarrow), [Test10399.hs:15:42-43]), -((Test10399.hs:15:25-40,AnnOpenP), [Test10399.hs:15:25, Test10399.hs:15:25]), -((Test10399.hs:15:27-30,AnnComma), [Test10399.hs:15:31]), -((Test10399.hs:15:45-46,AnnBang), [Test10399.hs:15:45]), -((Test10399.hs:15:45-46,AnnRarrow), [Test10399.hs:15:48-49]), -((Test10399.hs:15:45-64,AnnRarrow), [Test10399.hs:15:48-49]), -((Test10399.hs:(16,5)-(17,67),AnnDcolon), [Test10399.hs:16:12-13]), -((Test10399.hs:(16,5)-(17,67),AnnSemi), [Test10399.hs:18:5]), -((Test10399.hs:(16,15)-(17,67),AnnDot), [Test10399.hs:16:25]), -((Test10399.hs:(16,15)-(17,67),AnnForall), [Test10399.hs:16:15-20]), -((Test10399.hs:16:27-42,AnnCloseP), [Test10399.hs:16:42, Test10399.hs:16:42]), -((Test10399.hs:16:27-42,AnnDarrow), [Test10399.hs:16:44-45]), -((Test10399.hs:16:27-42,AnnOpenP), [Test10399.hs:16:27, Test10399.hs:16:27]), -((Test10399.hs:16:29-32,AnnComma), [Test10399.hs:16:33]), -((Test10399.hs:16:47,AnnRarrow), [Test10399.hs:16:49-50]), -((Test10399.hs:(16,47)-(17,67),AnnRarrow), [Test10399.hs:16:49-50]), -((Test10399.hs:16:52-65,AnnRarrow), [Test10399.hs:17:44-45]), -((Test10399.hs:(16,52)-(17,67),AnnRarrow), [Test10399.hs:17:44-45]), -((Test10399.hs:17:47,AnnRarrow), [Test10399.hs:17:49-50]), -((Test10399.hs:17:47-67,AnnRarrow), [Test10399.hs:17:49-50]), -((Test10399.hs:17:65-67,AnnCloseS), [Test10399.hs:17:67]), -((Test10399.hs:17:65-67,AnnOpenS), [Test10399.hs:17:65]), -((Test10399.hs:18:5-53,AnnDcolon), [Test10399.hs:18:16-17]), -((Test10399.hs:18:19-53,AnnDot), [Test10399.hs:18:28]), -((Test10399.hs:18:19-53,AnnForall), [Test10399.hs:18:19-24]), -((Test10399.hs:18:30-35,AnnCloseP), [Test10399.hs:18:35]), -((Test10399.hs:18:30-35,AnnOpenP), [Test10399.hs:18:30]), -((Test10399.hs:18:30-35,AnnRarrow), [Test10399.hs:18:37-38]), -((Test10399.hs:18:30-53,AnnRarrow), [Test10399.hs:18:37-38]), -((Test10399.hs:20:1-25,AnnCloseQ), [Test10399.hs:20:24-25]), -((Test10399.hs:20:1-25,AnnOpen), [Test10399.hs:20:1-3]), -((Test10399.hs:20:1-25,AnnSemi), [Test10399.hs:22:1]), -((Test10399.hs:20:20-22,AnnDollar), [Test10399.hs:20:20]), -((Test10399.hs:22:1-21,AnnEqual), [Test10399.hs:22:19]), -((Test10399.hs:22:1-21,AnnFunId), [Test10399.hs:22:1-3]), -((Test10399.hs:22:1-21,AnnSemi), [Test10399.hs:23:1]), -((Test10399.hs:22:5-17,AnnDollar), [Test10399.hs:22:5]), -((Test10399.hs:22:6-17,AnnCloseP), [Test10399.hs:22:17]), -((Test10399.hs:22:6-17,AnnOpenP), [Test10399.hs:22:6]), -((Test10399.hs:22:8-15,AnnCloseQ), [Test10399.hs:22:14-15]), -((Test10399.hs:22:8-15,AnnOpen), [Test10399.hs:22:8-10]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test10399.hs" 23 1 diff --git a/testsuite/tests/ghc-api/annotations/T10598.stdout b/testsuite/tests/ghc-api/annotations/T10598.stdout deleted file mode 100644 index b2d9333bf2..0000000000 --- a/testsuite/tests/ghc-api/annotations/T10598.stdout +++ /dev/null @@ -1,43 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test10598.hs:1:1,AnnModule), [Test10598.hs:5:1-6]), -((Test10598.hs:1:1,AnnWhere), [Test10598.hs:5:18-22]), -((Test10598.hs:(7,1)-(9,10),AnnClass), [Test10598.hs:7:1-5]), -((Test10598.hs:(7,1)-(9,10),AnnSemi), [Test10598.hs:11:1]), -((Test10598.hs:(7,1)-(9,10),AnnWhere), [Test10598.hs:7:11-15]), -((Test10598.hs:8:3-21,AnnDcolon), [Test10598.hs:8:5-6]), -((Test10598.hs:8:3-21,AnnSemi), [Test10598.hs:9:3]), -((Test10598.hs:8:8-14,AnnRarrow), [Test10598.hs:8:16-17]), -((Test10598.hs:8:8-21,AnnRarrow), [Test10598.hs:8:16-17]), -((Test10598.hs:9:3-10,AnnEqual), [Test10598.hs:9:7]), -((Test10598.hs:9:3-10,AnnFunId), [Test10598.hs:9:3]), -((Test10598.hs:(11,1)-(12,10),AnnInstance), [Test10598.hs:11:1-8]), -((Test10598.hs:(11,1)-(12,10),AnnSemi), [Test10598.hs:14:1]), -((Test10598.hs:(11,1)-(12,10),AnnWhere), [Test10598.hs:11:16-20]), -((Test10598.hs:12:3-10,AnnEqual), [Test10598.hs:12:7]), -((Test10598.hs:12:3-10,AnnFunId), [Test10598.hs:12:3]), -((Test10598.hs:(14,1)-(17,21),AnnEqual), [Test10598.hs:14:13]), -((Test10598.hs:(14,1)-(17,21),AnnNewtype), [Test10598.hs:14:1-7]), -((Test10598.hs:(14,1)-(17,21),AnnSemi), [Test10598.hs:18:1]), -((Test10598.hs:15:3-22,AnnDeriving), [Test10598.hs:15:3-10]), -((Test10598.hs:16:3-23,AnnDeriving), [Test10598.hs:16:3-10]), -((Test10598.hs:16:12-16,AnnStock), [Test10598.hs:16:12-16]), -((Test10598.hs:17:3-21,AnnDeriving), [Test10598.hs:17:3-10]), -((Test10598.hs:17:12-19,AnnAnyclass), [Test10598.hs:17:12-19]), -((Test10598.hs:18:1-34,AnnDeriving), [Test10598.hs:18:1-8]), -((Test10598.hs:18:1-34,AnnInstance), [Test10598.hs:18:18-25]), -((Test10598.hs:18:1-34,AnnSemi), [Test10598.hs:19:1]), -((Test10598.hs:18:10-16,AnnNewtype), [Test10598.hs:18:10-16]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test10598.hs" 19 1 diff --git a/testsuite/tests/ghc-api/annotations/T11018.stdout b/testsuite/tests/ghc-api/annotations/T11018.stdout deleted file mode 100644 index 27cc80ae6f..0000000000 --- a/testsuite/tests/ghc-api/annotations/T11018.stdout +++ /dev/null @@ -1,217 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test11018.hs:1:1,AnnModule), [Test11018.hs:4:1-6]), -((Test11018.hs:1:1,AnnWhere), [Test11018.hs:4:18-22]), -((Test11018.hs:6:1-36,AnnDcolon), [Test11018.hs:6:12-13]), -((Test11018.hs:6:1-36,AnnSemi), [Test11018.hs:7:1]), -((Test11018.hs:6:15-36,AnnDot), [Test11018.hs:6:24]), -((Test11018.hs:6:15-36,AnnForall), [Test11018.hs:6:15-20]), -((Test11018.hs:6:26,AnnRarrow), [Test11018.hs:6:28-29]), -((Test11018.hs:6:26-36,AnnRarrow), [Test11018.hs:6:28-29]), -((Test11018.hs:(7,1)-(9,10),AnnEqual), [Test11018.hs:7:14]), -((Test11018.hs:(7,1)-(9,10),AnnFunId), [Test11018.hs:7:1-10]), -((Test11018.hs:(7,1)-(9,10),AnnSemi), [Test11018.hs:12:1]), -((Test11018.hs:(7,16)-(9,10),AnnDo), [Test11018.hs:7:16-17]), -((Test11018.hs:8:3-15,AnnLarrow), [Test11018.hs:8:5-6]), -((Test11018.hs:8:3-15,AnnSemi), [Test11018.hs:9:3]), -((Test11018.hs:(12,1)-(15,7),AnnCloseP), [Test11018.hs:12:32]), -((Test11018.hs:(12,1)-(15,7),AnnData), [Test11018.hs:12:1-4]), -((Test11018.hs:(12,1)-(15,7),AnnEqual), [Test11018.hs:13:5]), -((Test11018.hs:(12,1)-(15,7),AnnOpenP), [Test11018.hs:12:21]), -((Test11018.hs:(12,1)-(15,7),AnnSemi), [Test11018.hs:17:1]), -((Test11018.hs:12:21-32,AnnCloseP), [Test11018.hs:12:32]), -((Test11018.hs:12:21-32,AnnOpenP), [Test11018.hs:12:21]), -((Test11018.hs:12:22-31,AnnDcolonU), [Test11018.hs:12:24]), -((Test11018.hs:12:26,AnnRarrow), [Test11018.hs:12:28-29]), -((Test11018.hs:12:26-31,AnnRarrow), [Test11018.hs:12:28-29]), -((Test11018.hs:(13,16)-(15,7),AnnCloseC), [Test11018.hs:15:7]), -((Test11018.hs:(13,16)-(15,7),AnnOpenC), [Test11018.hs:13:16]), -((Test11018.hs:14:9-40,AnnDcolon), [Test11018.hs:14:18-19]), -((Test11018.hs:14:21-40,AnnBang), [Test11018.hs:14:21]), -((Test11018.hs:14:22-40,AnnCloseP), [Test11018.hs:14:40]), -((Test11018.hs:14:22-40,AnnOpenP), [Test11018.hs:14:22]), -((Test11018.hs:17:1-35,AnnDcolon), [Test11018.hs:17:3-4]), -((Test11018.hs:17:1-35,AnnSemi), [Test11018.hs:18:1]), -((Test11018.hs:17:6-12,AnnDarrow), [Test11018.hs:17:14-15]), -((Test11018.hs:17:19-31,AnnCloseP), [Test11018.hs:17:31]), -((Test11018.hs:17:19-31,AnnOpenP), [Test11018.hs:17:19]), -((Test11018.hs:17:20-22,AnnComma), [Test11018.hs:17:23]), -((Test11018.hs:17:24-26,AnnComma), [Test11018.hs:17:27]), -((Test11018.hs:18:1-34,AnnEqual), [Test11018.hs:18:3]), -((Test11018.hs:18:1-34,AnnFunId), [Test11018.hs:18:1]), -((Test11018.hs:18:1-34,AnnSemi), [Test11018.hs:20:1]), -((Test11018.hs:18:5-34,AnnProc), [Test11018.hs:18:5-8]), -((Test11018.hs:18:5-34,AnnRarrow), [Test11018.hs:18:18-19]), -((Test11018.hs:18:10-16,AnnCloseP), [Test11018.hs:18:16]), -((Test11018.hs:18:10-16,AnnOpenP), [Test11018.hs:18:10]), -((Test11018.hs:18:11,AnnComma), [Test11018.hs:18:12]), -((Test11018.hs:18:13,AnnComma), [Test11018.hs:18:14]), -((Test11018.hs:18:21-34,Annlarrowtail), [Test11018.hs:18:29-30]), -((Test11018.hs:18:32-34,AnnVal), [Test11018.hs:18:33]), -((Test11018.hs:20:1-36,AnnDcolon), [Test11018.hs:20:4-5]), -((Test11018.hs:20:1-36,AnnSemi), [Test11018.hs:21:1]), -((Test11018.hs:20:7-13,AnnDarrow), [Test11018.hs:20:15-16]), -((Test11018.hs:20:20-32,AnnCloseP), [Test11018.hs:20:32]), -((Test11018.hs:20:20-32,AnnOpenP), [Test11018.hs:20:20]), -((Test11018.hs:20:21-23,AnnComma), [Test11018.hs:20:24]), -((Test11018.hs:20:25-27,AnnComma), [Test11018.hs:20:28]), -((Test11018.hs:21:1-35,AnnEqual), [Test11018.hs:21:4]), -((Test11018.hs:21:1-35,AnnFunId), [Test11018.hs:21:1-2]), -((Test11018.hs:21:1-35,AnnSemi), [Test11018.hs:23:1]), -((Test11018.hs:21:6-35,AnnProc), [Test11018.hs:21:6-9]), -((Test11018.hs:21:6-35,AnnRarrow), [Test11018.hs:21:19-20]), -((Test11018.hs:21:11-17,AnnCloseP), [Test11018.hs:21:17]), -((Test11018.hs:21:11-17,AnnOpenP), [Test11018.hs:21:11]), -((Test11018.hs:21:12,AnnComma), [Test11018.hs:21:13]), -((Test11018.hs:21:14,AnnComma), [Test11018.hs:21:15]), -((Test11018.hs:21:22-35,Annrarrowtail), [Test11018.hs:21:30-31]), -((Test11018.hs:21:33-35,AnnVal), [Test11018.hs:21:34]), -((Test11018.hs:23:1-49,AnnDcolon), [Test11018.hs:23:3-4]), -((Test11018.hs:23:1-49,AnnSemi), [Test11018.hs:24:1]), -((Test11018.hs:23:6-17,AnnDarrow), [Test11018.hs:23:19-20]), -((Test11018.hs:23:22-24,AnnRarrow), [Test11018.hs:23:26-27]), -((Test11018.hs:23:22-49,AnnRarrow), [Test11018.hs:23:26-27]), -((Test11018.hs:23:31-45,AnnCloseP), [Test11018.hs:23:45]), -((Test11018.hs:23:31-45,AnnOpenP), [Test11018.hs:23:31]), -((Test11018.hs:23:32-40,AnnComma), [Test11018.hs:23:41]), -((Test11018.hs:24:1-29,AnnEqual), [Test11018.hs:24:5]), -((Test11018.hs:24:1-29,AnnFunId), [Test11018.hs:24:1]), -((Test11018.hs:24:1-29,AnnSemi), [Test11018.hs:26:1]), -((Test11018.hs:24:7-29,AnnProc), [Test11018.hs:24:7-10]), -((Test11018.hs:24:7-29,AnnRarrow), [Test11018.hs:24:18-19]), -((Test11018.hs:24:12-16,AnnCloseP), [Test11018.hs:24:16]), -((Test11018.hs:24:12-16,AnnOpenP), [Test11018.hs:24:12]), -((Test11018.hs:24:13,AnnComma), [Test11018.hs:24:14]), -((Test11018.hs:24:21-29,AnnLarrowtail), [Test11018.hs:24:23-25]), -((Test11018.hs:24:27-29,AnnVal), [Test11018.hs:24:28]), -((Test11018.hs:26:1-50,AnnDcolon), [Test11018.hs:26:4-5]), -((Test11018.hs:26:1-50,AnnSemi), [Test11018.hs:27:1]), -((Test11018.hs:26:7-18,AnnDarrow), [Test11018.hs:26:20-21]), -((Test11018.hs:26:23-25,AnnRarrow), [Test11018.hs:26:27-28]), -((Test11018.hs:26:23-50,AnnRarrow), [Test11018.hs:26:27-28]), -((Test11018.hs:26:32-46,AnnCloseP), [Test11018.hs:26:46]), -((Test11018.hs:26:32-46,AnnOpenP), [Test11018.hs:26:32]), -((Test11018.hs:26:33-41,AnnComma), [Test11018.hs:26:42]), -((Test11018.hs:27:1-30,AnnEqual), [Test11018.hs:27:6]), -((Test11018.hs:27:1-30,AnnFunId), [Test11018.hs:27:1-2]), -((Test11018.hs:27:1-30,AnnSemi), [Test11018.hs:31:1]), -((Test11018.hs:27:8-30,AnnProc), [Test11018.hs:27:8-11]), -((Test11018.hs:27:8-30,AnnRarrow), [Test11018.hs:27:19-20]), -((Test11018.hs:27:13-17,AnnCloseP), [Test11018.hs:27:17]), -((Test11018.hs:27:13-17,AnnOpenP), [Test11018.hs:27:13]), -((Test11018.hs:27:14,AnnComma), [Test11018.hs:27:15]), -((Test11018.hs:27:22-30,AnnRarrowtail), [Test11018.hs:27:24-26]), -((Test11018.hs:27:28-30,AnnVal), [Test11018.hs:27:29]), -((Test11018.hs:31:1-26,AnnDcolonU), [Test11018.hs:31:9]), -((Test11018.hs:31:1-26,AnnSemi), [Test11018.hs:32:1]), -((Test11018.hs:31:11-26,AnnDot), [Test11018.hs:31:15]), -((Test11018.hs:31:11-26,AnnForallU), [Test11018.hs:31:11]), -((Test11018.hs:31:17,AnnRarrowU), [Test11018.hs:31:19]), -((Test11018.hs:31:17-26,AnnRarrowU), [Test11018.hs:31:19]), -((Test11018.hs:(32,1)-(34,10),AnnEqual), [Test11018.hs:32:11]), -((Test11018.hs:(32,1)-(34,10),AnnFunId), [Test11018.hs:32:1-7]), -((Test11018.hs:(32,1)-(34,10),AnnSemi), [Test11018.hs:37:1]), -((Test11018.hs:(32,13)-(34,10),AnnDo), [Test11018.hs:32:13-14]), -((Test11018.hs:33:3-14,AnnLarrowU), [Test11018.hs:33:5]), -((Test11018.hs:33:3-14,AnnSemi), [Test11018.hs:34:3]), -((Test11018.hs:(37,1)-(40,7),AnnCloseP), [Test11018.hs:37:32]), -((Test11018.hs:(37,1)-(40,7),AnnData), [Test11018.hs:37:1-4]), -((Test11018.hs:(37,1)-(40,7),AnnEqual), [Test11018.hs:38:5]), -((Test11018.hs:(37,1)-(40,7),AnnOpenP), [Test11018.hs:37:22]), -((Test11018.hs:(37,1)-(40,7),AnnSemi), [Test11018.hs:42:1]), -((Test11018.hs:37:22-32,AnnCloseP), [Test11018.hs:37:32]), -((Test11018.hs:37:22-32,AnnOpenP), [Test11018.hs:37:22]), -((Test11018.hs:37:23-31,AnnDcolonU), [Test11018.hs:37:25]), -((Test11018.hs:37:27,AnnRarrowU), [Test11018.hs:37:29]), -((Test11018.hs:37:27-31,AnnRarrowU), [Test11018.hs:37:29]), -((Test11018.hs:(38,17)-(40,7),AnnCloseC), [Test11018.hs:40:7]), -((Test11018.hs:(38,17)-(40,7),AnnOpenC), [Test11018.hs:38:17]), -((Test11018.hs:39:9-40,AnnDcolonU), [Test11018.hs:39:19]), -((Test11018.hs:39:21-40,AnnBang), [Test11018.hs:39:21]), -((Test11018.hs:39:22-40,AnnCloseP), [Test11018.hs:39:40]), -((Test11018.hs:39:22-40,AnnOpenP), [Test11018.hs:39:22]), -((Test11018.hs:42:1-36,AnnDcolon), [Test11018.hs:42:4-5]), -((Test11018.hs:42:1-36,AnnSemi), [Test11018.hs:43:1]), -((Test11018.hs:42:7-13,AnnDarrowU), [Test11018.hs:42:16]), -((Test11018.hs:42:20-32,AnnCloseP), [Test11018.hs:42:32]), -((Test11018.hs:42:20-32,AnnOpenP), [Test11018.hs:42:20]), -((Test11018.hs:42:21-23,AnnComma), [Test11018.hs:42:24]), -((Test11018.hs:42:25-27,AnnComma), [Test11018.hs:42:28]), -((Test11018.hs:43:1-34,AnnEqual), [Test11018.hs:43:4]), -((Test11018.hs:43:1-34,AnnFunId), [Test11018.hs:43:1-2]), -((Test11018.hs:43:1-34,AnnSemi), [Test11018.hs:45:1]), -((Test11018.hs:43:6-34,AnnProc), [Test11018.hs:43:6-9]), -((Test11018.hs:43:6-34,AnnRarrow), [Test11018.hs:43:19-20]), -((Test11018.hs:43:11-17,AnnCloseP), [Test11018.hs:43:17]), -((Test11018.hs:43:11-17,AnnOpenP), [Test11018.hs:43:11]), -((Test11018.hs:43:12,AnnComma), [Test11018.hs:43:13]), -((Test11018.hs:43:14,AnnComma), [Test11018.hs:43:15]), -((Test11018.hs:43:22-34,AnnlarrowtailU), [Test11018.hs:43:30]), -((Test11018.hs:43:32-34,AnnVal), [Test11018.hs:43:33]), -((Test11018.hs:45:1-36,AnnDcolon), [Test11018.hs:45:5-6]), -((Test11018.hs:45:1-36,AnnSemi), [Test11018.hs:46:1]), -((Test11018.hs:45:8-14,AnnDarrowU), [Test11018.hs:45:16]), -((Test11018.hs:45:20-32,AnnCloseP), [Test11018.hs:45:32]), -((Test11018.hs:45:20-32,AnnOpenP), [Test11018.hs:45:20]), -((Test11018.hs:45:21-23,AnnComma), [Test11018.hs:45:24]), -((Test11018.hs:45:25-27,AnnComma), [Test11018.hs:45:28]), -((Test11018.hs:46:1-35,AnnEqual), [Test11018.hs:46:5]), -((Test11018.hs:46:1-35,AnnFunId), [Test11018.hs:46:1-3]), -((Test11018.hs:46:1-35,AnnSemi), [Test11018.hs:48:1]), -((Test11018.hs:46:7-35,AnnProc), [Test11018.hs:46:7-10]), -((Test11018.hs:46:7-35,AnnRarrow), [Test11018.hs:46:20-21]), -((Test11018.hs:46:12-18,AnnCloseP), [Test11018.hs:46:18]), -((Test11018.hs:46:12-18,AnnOpenP), [Test11018.hs:46:12]), -((Test11018.hs:46:13,AnnComma), [Test11018.hs:46:14]), -((Test11018.hs:46:15,AnnComma), [Test11018.hs:46:16]), -((Test11018.hs:46:23-35,AnnrarrowtailU), [Test11018.hs:46:31]), -((Test11018.hs:46:33-35,AnnVal), [Test11018.hs:46:34]), -((Test11018.hs:48:1-49,AnnDcolon), [Test11018.hs:48:4-5]), -((Test11018.hs:48:1-49,AnnSemi), [Test11018.hs:49:1]), -((Test11018.hs:48:7-18,AnnDarrowU), [Test11018.hs:48:20]), -((Test11018.hs:48:22-24,AnnRarrow), [Test11018.hs:48:26-27]), -((Test11018.hs:48:22-49,AnnRarrow), [Test11018.hs:48:26-27]), -((Test11018.hs:48:31-45,AnnCloseP), [Test11018.hs:48:45]), -((Test11018.hs:48:31-45,AnnOpenP), [Test11018.hs:48:31]), -((Test11018.hs:48:32-40,AnnComma), [Test11018.hs:48:41]), -((Test11018.hs:49:1-28,AnnEqual), [Test11018.hs:49:6]), -((Test11018.hs:49:1-28,AnnFunId), [Test11018.hs:49:1-2]), -((Test11018.hs:49:1-28,AnnSemi), [Test11018.hs:51:1]), -((Test11018.hs:49:8-28,AnnProc), [Test11018.hs:49:8-11]), -((Test11018.hs:49:8-28,AnnRarrow), [Test11018.hs:49:19-20]), -((Test11018.hs:49:13-17,AnnCloseP), [Test11018.hs:49:17]), -((Test11018.hs:49:13-17,AnnOpenP), [Test11018.hs:49:13]), -((Test11018.hs:49:14,AnnComma), [Test11018.hs:49:15]), -((Test11018.hs:49:22-28,AnnLarrowtailU), [Test11018.hs:49:24]), -((Test11018.hs:49:26-28,AnnVal), [Test11018.hs:49:27]), -((Test11018.hs:51:1-50,AnnDcolon), [Test11018.hs:51:5-6]), -((Test11018.hs:51:1-50,AnnSemi), [Test11018.hs:52:1]), -((Test11018.hs:51:8-19,AnnDarrowU), [Test11018.hs:51:21]), -((Test11018.hs:51:23-25,AnnRarrow), [Test11018.hs:51:27-28]), -((Test11018.hs:51:23-50,AnnRarrow), [Test11018.hs:51:27-28]), -((Test11018.hs:51:32-46,AnnCloseP), [Test11018.hs:51:46]), -((Test11018.hs:51:32-46,AnnOpenP), [Test11018.hs:51:32]), -((Test11018.hs:51:33-41,AnnComma), [Test11018.hs:51:42]), -((Test11018.hs:52:1-29,AnnEqual), [Test11018.hs:52:7]), -((Test11018.hs:52:1-29,AnnFunId), [Test11018.hs:52:1-3]), -((Test11018.hs:52:1-29,AnnSemi), [Test11018.hs:53:1]), -((Test11018.hs:52:9-29,AnnProc), [Test11018.hs:52:9-12]), -((Test11018.hs:52:9-29,AnnRarrow), [Test11018.hs:52:20-21]), -((Test11018.hs:52:14-18,AnnCloseP), [Test11018.hs:52:18]), -((Test11018.hs:52:14-18,AnnOpenP), [Test11018.hs:52:14]), -((Test11018.hs:52:15,AnnComma), [Test11018.hs:52:16]), -((Test11018.hs:52:23-29,AnnRarrowtailU), [Test11018.hs:52:25]), -((Test11018.hs:52:27-29,AnnVal), [Test11018.hs:52:28]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test11018.hs" 53 1 diff --git a/testsuite/tests/ghc-api/annotations/T11321.stdout b/testsuite/tests/ghc-api/annotations/T11321.stdout deleted file mode 100644 index 15d2169dba..0000000000 --- a/testsuite/tests/ghc-api/annotations/T11321.stdout +++ /dev/null @@ -1,49 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test11321.hs:1:1,AnnModule), [Test11321.hs:10:1-6]), -((Test11321.hs:1:1,AnnWhere), [Test11321.hs:10:18-22]), -((Test11321.hs:(12,1)-(17,27),AnnData), [Test11321.hs:12:1-4]), -((Test11321.hs:(12,1)-(17,27),AnnEqual), [Test11321.hs:13:3]), -((Test11321.hs:(12,1)-(17,27),AnnInstance), [Test11321.hs:12:6-13]), -((Test11321.hs:(12,1)-(17,27),AnnSemi), [Test11321.hs:18:1]), -((Test11321.hs:12:20-29,AnnCloseP), [Test11321.hs:12:29]), -((Test11321.hs:12:20-29,AnnOpenP), [Test11321.hs:12:20]), -((Test11321.hs:12:21-28,AnnDcolon), [Test11321.hs:12:23-24]), -((Test11321.hs:12:26-28,AnnCloseS), [Test11321.hs:12:28]), -((Test11321.hs:12:26-28,AnnOpenS), [Test11321.hs:12:26]), -((Test11321.hs:(13,5)-(14,8),AnnDarrow), [Test11321.hs:13:13-14]), -((Test11321.hs:(13,5)-(14,8),AnnVbar), [Test11321.hs:15:3]), -((Test11321.hs:13:9-11,AnnCloseS), [Test11321.hs:13:11]), -((Test11321.hs:13:9-11,AnnOpenS), [Test11321.hs:13:10]), -((Test11321.hs:13:9-11,AnnSimpleQuote), [Test11321.hs:13:9]), -((Test11321.hs:(15,5)-(17,27),AnnDarrow), [Test11321.hs:16:36-37]), -((Test11321.hs:(15,5)-(17,27),AnnDot), [Test11321.hs:16:22]), -((Test11321.hs:(15,5)-(17,27),AnnForall), [Test11321.hs:15:5-10]), -((Test11321.hs:15:12-19,AnnCloseP), [Test11321.hs:15:19]), -((Test11321.hs:15:12-19,AnnDcolon), [Test11321.hs:15:15-16]), -((Test11321.hs:15:12-19,AnnOpenP), [Test11321.hs:15:12]), -((Test11321.hs:16:12-21,AnnCloseP), [Test11321.hs:16:21]), -((Test11321.hs:16:12-21,AnnDcolon), [Test11321.hs:16:15-16]), -((Test11321.hs:16:12-21,AnnOpenP), [Test11321.hs:16:12]), -((Test11321.hs:16:18-20,AnnCloseS), [Test11321.hs:16:20]), -((Test11321.hs:16:18-20,AnnOpenS), [Test11321.hs:16:18]), -((Test11321.hs:16:28-30,AnnCloseP), [Test11321.hs:16:30]), -((Test11321.hs:16:28-30,AnnOpenP), [Test11321.hs:16:28]), -((Test11321.hs:16:28-30,AnnVal), [Test11321.hs:16:29]), -((Test11321.hs:17:11-18,AnnCloseP), [Test11321.hs:17:18]), -((Test11321.hs:17:11-18,AnnOpenP), [Test11321.hs:17:11]), -((Test11321.hs:17:20-27,AnnCloseP), [Test11321.hs:17:27]), -((Test11321.hs:17:20-27,AnnOpenP), [Test11321.hs:17:20]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test11321.hs" 18 1 diff --git a/testsuite/tests/ghc-api/annotations/T11332.stdout b/testsuite/tests/ghc-api/annotations/T11332.stdout deleted file mode 100644 index bdb849e680..0000000000 --- a/testsuite/tests/ghc-api/annotations/T11332.stdout +++ /dev/null @@ -1,56 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test11332.hs:1:1,AnnModule), [Test11332.hs:3:1-6]), -((Test11332.hs:1:1,AnnWhere), [Test11332.hs:3:52-56]), -((Test11332.hs:3:18-50,AnnCloseP), [Test11332.hs:3:50]), -((Test11332.hs:3:18-50,AnnOpenP), [Test11332.hs:3:18]), -((Test11332.hs:3:20-29,AnnCloseP), [Test11332.hs:3:29]), -((Test11332.hs:3:20-29,AnnComma), [Test11332.hs:3:24, Test11332.hs:3:30]), -((Test11332.hs:3:20-29,AnnDotdot), [Test11332.hs:3:22-23]), -((Test11332.hs:3:20-29,AnnOpenP), [Test11332.hs:3:21]), -((Test11332.hs:3:32-38,AnnCloseP), [Test11332.hs:3:38]), -((Test11332.hs:3:32-38,AnnComma), [Test11332.hs:3:39]), -((Test11332.hs:3:32-38,AnnDotdot), [Test11332.hs:3:36-37]), -((Test11332.hs:3:32-38,AnnOpenP), [Test11332.hs:3:33]), -((Test11332.hs:3:34,AnnComma), [Test11332.hs:3:35]), -((Test11332.hs:3:41-49,AnnCloseP), [Test11332.hs:3:49]), -((Test11332.hs:3:41-49,AnnComma), [Test11332.hs:3:47]), -((Test11332.hs:3:41-49,AnnDotdot), [Test11332.hs:3:45-46]), -((Test11332.hs:3:41-49,AnnOpenP), [Test11332.hs:3:42]), -((Test11332.hs:3:43,AnnComma), [Test11332.hs:3:44]), -((Test11332.hs:5:1-14,AnnData), [Test11332.hs:5:1-4]), -((Test11332.hs:5:1-14,AnnEqual), [Test11332.hs:5:8]), -((Test11332.hs:5:1-14,AnnSemi), [Test11332.hs:7:1]), -((Test11332.hs:5:10,AnnVbar), [Test11332.hs:5:12]), -((Test11332.hs:7:1-15,AnnEqual), [Test11332.hs:7:13]), -((Test11332.hs:7:1-15,AnnPattern), [Test11332.hs:7:1-7]), -((Test11332.hs:7:1-15,AnnSemi), [Test11332.hs:9:1]), -((Test11332.hs:9:1-14,AnnData), [Test11332.hs:9:1-4]), -((Test11332.hs:9:1-14,AnnEqual), [Test11332.hs:9:10]), -((Test11332.hs:9:1-14,AnnSemi), [Test11332.hs:11:1]), -((Test11332.hs:11:1-17,AnnEqual), [Test11332.hs:11:13]), -((Test11332.hs:11:1-17,AnnPattern), [Test11332.hs:11:1-7]), -((Test11332.hs:11:1-17,AnnSemi), [Test11332.hs:13:1]), -((Test11332.hs:13:1-14,AnnData), [Test11332.hs:13:1-4]), -((Test11332.hs:13:1-14,AnnEqual), [Test11332.hs:13:8]), -((Test11332.hs:13:1-14,AnnSemi), [Test11332.hs:15:1]), -((Test11332.hs:13:10,AnnVbar), [Test11332.hs:13:12]), -((Test11332.hs:15:1-13,AnnEqual), [Test11332.hs:15:11]), -((Test11332.hs:15:1-13,AnnPattern), [Test11332.hs:15:1-7]), -((Test11332.hs:15:1-13,AnnSemi), [Test11332.hs:17:1]), -((Test11332.hs:17:1-13,AnnEqual), [Test11332.hs:17:11]), -((Test11332.hs:17:1-13,AnnPattern), [Test11332.hs:17:1-7]), -((Test11332.hs:17:1-13,AnnSemi), [Test11332.hs:18:1]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test11332.hs" 18 1 diff --git a/testsuite/tests/ghc-api/annotations/T11430.stdout b/testsuite/tests/ghc-api/annotations/T11430.stdout deleted file mode 100644 index 528e1e3d57..0000000000 --- a/testsuite/tests/ghc-api/annotations/T11430.stdout +++ /dev/null @@ -1,5 +0,0 @@ -("f",["0x1"]) -("ib",["001"]) -("ia",["1"]) -("ia",["0x999"]) -("ia",["1"]) diff --git a/testsuite/tests/ghc-api/annotations/T12417.stdout b/testsuite/tests/ghc-api/annotations/T12417.stdout deleted file mode 100644 index 2cfd3c0635..0000000000 --- a/testsuite/tests/ghc-api/annotations/T12417.stdout +++ /dev/null @@ -1,76 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test12417.hs:1:1,AnnModule), [Test12417.hs:3:1-6]), -((Test12417.hs:1:1,AnnWhere), [Test12417.hs:3:18-22]), -((Test12417.hs:5:1-15,AnnImport), [Test12417.hs:5:1-6]), -((Test12417.hs:5:1-15,AnnSemi), [Test12417.hs:6:1]), -((Test12417.hs:6:1-16,AnnImport), [Test12417.hs:6:1-6]), -((Test12417.hs:6:1-16,AnnSemi), [Test12417.hs:8:1]), -((Test12417.hs:8:1-34,AnnImport), [Test12417.hs:8:1-6]), -((Test12417.hs:8:1-34,AnnSemi), [Test12417.hs:10:1]), -((Test12417.hs:8:19-34,AnnCloseP), [Test12417.hs:8:34]), -((Test12417.hs:8:19-34,AnnOpenP), [Test12417.hs:8:19]), -((Test12417.hs:10:1-30,AnnEqual), [Test12417.hs:10:18]), -((Test12417.hs:10:1-30,AnnSemi), [Test12417.hs:12:1]), -((Test12417.hs:10:1-30,AnnType), [Test12417.hs:10:1-4]), -((Test12417.hs:10:20-30,AnnClose), [Test12417.hs:10:29-30]), -((Test12417.hs:10:20-30,AnnOpen), [Test12417.hs:10:20-21]), -((Test12417.hs:10:23,AnnVbar), [Test12417.hs:10:25]), -((Test12417.hs:12:1-56,AnnDcolon), [Test12417.hs:12:13-14]), -((Test12417.hs:12:1-56,AnnSemi), [Test12417.hs:13:1]), -((Test12417.hs:12:16-31,AnnCloseP), [Test12417.hs:12:31, Test12417.hs:12:31]), -((Test12417.hs:12:16-31,AnnDarrow), [Test12417.hs:12:33-34]), -((Test12417.hs:12:16-31,AnnOpenP), [Test12417.hs:12:16, Test12417.hs:12:16]), -((Test12417.hs:12:17-22,AnnComma), [Test12417.hs:12:23]), -((Test12417.hs:12:36-46,AnnRarrow), [Test12417.hs:12:48-49]), -((Test12417.hs:12:36-56,AnnRarrow), [Test12417.hs:12:48-49]), -((Test12417.hs:13:1-48,AnnEqual), [Test12417.hs:13:27]), -((Test12417.hs:13:1-48,AnnFunId), [Test12417.hs:13:1-11]), -((Test12417.hs:13:1-48,AnnSemi), [Test12417.hs:14:1]), -((Test12417.hs:13:13-24,AnnClose), [Test12417.hs:13:23-24]), -((Test12417.hs:13:13-24,AnnOpen), [Test12417.hs:13:13-14]), -((Test12417.hs:13:13-24,AnnVbar), [Test12417.hs:13:21]), -((Test12417.hs:13:29-48,AnnVal), [Test12417.hs:13:37-38]), -((Test12417.hs:14:1-50,AnnEqual), [Test12417.hs:14:27]), -((Test12417.hs:14:1-50,AnnFunId), [Test12417.hs:14:1-11]), -((Test12417.hs:14:1-50,AnnSemi), [Test12417.hs:16:1]), -((Test12417.hs:14:13-25,AnnClose), [Test12417.hs:14:24-25]), -((Test12417.hs:14:13-25,AnnOpen), [Test12417.hs:14:13-14]), -((Test12417.hs:14:13-25,AnnVbar), [Test12417.hs:14:16]), -((Test12417.hs:14:29-50,AnnVal), [Test12417.hs:14:38-39]), -((Test12417.hs:16:1-75,AnnEqual), [Test12417.hs:16:8]), -((Test12417.hs:16:1-75,AnnSemi), [Test12417.hs:18:1]), -((Test12417.hs:16:1-75,AnnType), [Test12417.hs:16:1-4]), -((Test12417.hs:16:10-75,AnnClose), [Test12417.hs:16:74-75]), -((Test12417.hs:16:10-75,AnnOpen), [Test12417.hs:16:10-11]), -((Test12417.hs:16:13-15,AnnVbar), [Test12417.hs:16:17]), -((Test12417.hs:16:19-22,AnnVbar), [Test12417.hs:16:24]), -((Test12417.hs:16:26-31,AnnVbar), [Test12417.hs:16:33]), -((Test12417.hs:16:35-38,AnnVbar), [Test12417.hs:16:40]), -((Test12417.hs:16:42-56,AnnVbar), [Test12417.hs:16:58]), -((Test12417.hs:16:60-63,AnnVbar), [Test12417.hs:16:65]), -((Test12417.hs:18:1-26,AnnDcolon), [Test12417.hs:18:13-14]), -((Test12417.hs:18:1-26,AnnSemi), [Test12417.hs:19:1]), -((Test12417.hs:18:16,AnnRarrow), [Test12417.hs:18:18-19]), -((Test12417.hs:18:16-26,AnnRarrow), [Test12417.hs:18:18-19]), -((Test12417.hs:19:1-52,AnnEqual), [Test12417.hs:19:33]), -((Test12417.hs:19:1-52,AnnFunId), [Test12417.hs:19:1-11]), -((Test12417.hs:19:1-52,AnnSemi), [Test12417.hs:20:1]), -((Test12417.hs:19:13-31,AnnClose), [Test12417.hs:19:30-31]), -((Test12417.hs:19:13-31,AnnOpen), [Test12417.hs:19:13-14]), -((Test12417.hs:19:13-31,AnnVbar), [Test12417.hs:19:16, Test12417.hs:19:20, Test12417.hs:19:22, - Test12417.hs:19:24, Test12417.hs:19:26, Test12417.hs:19:28]), -((Test12417.hs:19:35-52,AnnVal), [Test12417.hs:19:44-45]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test12417.hs" 20 1 diff --git a/testsuite/tests/ghc-api/annotations/T13163.stdout b/testsuite/tests/ghc-api/annotations/T13163.stdout deleted file mode 100644 index 60b89cd832..0000000000 --- a/testsuite/tests/ghc-api/annotations/T13163.stdout +++ /dev/null @@ -1,84 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test13163.hs:1:1,AnnModule), [Test13163.hs:4:1-6]), -((Test13163.hs:1:1,AnnWhere), [Test13163.hs:8:5-9]), -((Test13163.hs:(5,3)-(8,3),AnnCloseP), [Test13163.hs:8:3]), -((Test13163.hs:(5,3)-(8,3),AnnOpenP), [Test13163.hs:5:3]), -((Test13163.hs:5:5-14,AnnCloseP), [Test13163.hs:5:14]), -((Test13163.hs:5:5-14,AnnComma), [Test13163.hs:6:3]), -((Test13163.hs:5:5-14,AnnDotdot), [Test13163.hs:5:12-13]), -((Test13163.hs:5:5-14,AnnOpenP), [Test13163.hs:5:11]), -((Test13163.hs:6:5-12,AnnType), [Test13163.hs:6:5-8]), -((Test13163.hs:6:5-16,AnnCloseP), [Test13163.hs:6:16]), -((Test13163.hs:6:5-16,AnnComma), [Test13163.hs:7:3]), -((Test13163.hs:6:5-16,AnnDotdot), [Test13163.hs:6:14-15]), -((Test13163.hs:6:5-16,AnnOpenP), [Test13163.hs:6:13]), -((Test13163.hs:6:10-12,AnnCloseP), [Test13163.hs:6:12]), -((Test13163.hs:6:10-12,AnnOpenP), [Test13163.hs:6:10]), -((Test13163.hs:6:10-12,AnnVal), [Test13163.hs:6:11]), -((Test13163.hs:7:5,AnnComma), [Test13163.hs:7:6]), -((Test13163.hs:7:8-15,AnnComma), [Test13163.hs:7:16]), -((Test13163.hs:7:8-15,AnnType), [Test13163.hs:7:8-11]), -((Test13163.hs:7:13-15,AnnCloseP), [Test13163.hs:7:15]), -((Test13163.hs:7:13-15,AnnOpenP), [Test13163.hs:7:13]), -((Test13163.hs:7:13-15,AnnVal), [Test13163.hs:7:14]), -((Test13163.hs:7:18-31,AnnPattern), [Test13163.hs:7:18-24]), -((Test13163.hs:10:1-78,AnnImport), [Test13163.hs:10:1-6]), -((Test13163.hs:10:1-78,AnnSemi), [Test13163.hs:11:1]), -((Test13163.hs:10:31-78,AnnCloseP), [Test13163.hs:10:78]), -((Test13163.hs:10:31-78,AnnOpenP), [Test13163.hs:10:31]), -((Test13163.hs:10:32-41,AnnComma), [Test13163.hs:10:42]), -((Test13163.hs:10:32-41,AnnType), [Test13163.hs:10:32-35]), -((Test13163.hs:10:37-41,AnnCloseP), [Test13163.hs:10:41]), -((Test13163.hs:10:37-41,AnnOpenP), [Test13163.hs:10:37]), -((Test13163.hs:10:37-41,AnnVal), [Test13163.hs:10:38-40]), -((Test13163.hs:10:44-53,AnnComma), [Test13163.hs:10:54]), -((Test13163.hs:10:44-53,AnnType), [Test13163.hs:10:44-47]), -((Test13163.hs:10:49-53,AnnCloseP), [Test13163.hs:10:53]), -((Test13163.hs:10:49-53,AnnOpenP), [Test13163.hs:10:49]), -((Test13163.hs:10:49-53,AnnVal), [Test13163.hs:10:50-52]), -((Test13163.hs:10:56-65,AnnComma), [Test13163.hs:10:66]), -((Test13163.hs:10:56-65,AnnType), [Test13163.hs:10:56-59]), -((Test13163.hs:10:61-65,AnnCloseP), [Test13163.hs:10:65]), -((Test13163.hs:10:61-65,AnnOpenP), [Test13163.hs:10:61]), -((Test13163.hs:10:61-65,AnnVal), [Test13163.hs:10:62-64]), -((Test13163.hs:10:68-77,AnnType), [Test13163.hs:10:68-71]), -((Test13163.hs:10:73-77,AnnCloseP), [Test13163.hs:10:77]), -((Test13163.hs:10:73-77,AnnOpenP), [Test13163.hs:10:73]), -((Test13163.hs:10:73-77,AnnVal), [Test13163.hs:10:74-76]), -((Test13163.hs:11:1-61,AnnImport), [Test13163.hs:11:1-6]), -((Test13163.hs:11:1-61,AnnSemi), [Test13163.hs:12:1]), -((Test13163.hs:11:24-61,AnnCloseP), [Test13163.hs:11:61]), -((Test13163.hs:11:24-61,AnnOpenP), [Test13163.hs:11:24]), -((Test13163.hs:11:25-31,AnnComma), [Test13163.hs:11:32]), -((Test13163.hs:11:34-44,AnnComma), [Test13163.hs:11:45]), -((Test13163.hs:11:47-56,AnnType), [Test13163.hs:11:47-50]), -((Test13163.hs:11:47-60,AnnCloseP), [Test13163.hs:11:60]), -((Test13163.hs:11:47-60,AnnDotdot), [Test13163.hs:11:58-59]), -((Test13163.hs:11:47-60,AnnOpenP), [Test13163.hs:11:57]), -((Test13163.hs:11:52-56,AnnCloseP), [Test13163.hs:11:56]), -((Test13163.hs:11:52-56,AnnOpenP), [Test13163.hs:11:52]), -((Test13163.hs:11:52-56,AnnVal), [Test13163.hs:11:53-55]), -((Test13163.hs:12:1-19,AnnImport), [Test13163.hs:12:1-6]), -((Test13163.hs:12:1-19,AnnSemi), [Test13163.hs:14:1]), -((Test13163.hs:14:1-22,AnnEqual), [Test13163.hs:14:18]), -((Test13163.hs:14:1-22,AnnPattern), [Test13163.hs:14:1-7]), -((Test13163.hs:14:1-22,AnnSemi), [Test13163.hs:16:1]), -((Test13163.hs:14:20-22,AnnCloseS), [Test13163.hs:14:22]), -((Test13163.hs:14:20-22,AnnOpenS), [Test13163.hs:14:20]), -((Test13163.hs:16:1-13,AnnEqual), [Test13163.hs:16:3]), -((Test13163.hs:16:1-13,AnnFunId), [Test13163.hs:16:1]), -((Test13163.hs:16:1-13,AnnSemi), [Test13163.hs:17:1]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test13163.hs" 17 1 diff --git a/testsuite/tests/ghc-api/annotations/T15303.stdout b/testsuite/tests/ghc-api/annotations/T15303.stdout deleted file mode 100644 index 84d592dd0e..0000000000 --- a/testsuite/tests/ghc-api/annotations/T15303.stdout +++ /dev/null @@ -1,42 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test15303.hs:4:1-4,AnnCloseP), [Test15303.hs:4:4]), -((Test15303.hs:4:1-4,AnnOpenP), [Test15303.hs:4:1]), -((Test15303.hs:4:1-4,AnnVal), [Test15303.hs:4:2-3]), -((Test15303.hs:4:1-66,AnnDcolon), [Test15303.hs:4:6-7]), -((Test15303.hs:4:1-66,AnnSemi), [Test15303.hs:5:1]), -((Test15303.hs:4:9-17,AnnDarrow), [Test15303.hs:4:19-20]), -((Test15303.hs:4:22-41,AnnRarrow), [Test15303.hs:4:43-44]), -((Test15303.hs:4:22-66,AnnRarrow), [Test15303.hs:4:43-44]), -((Test15303.hs:4:33-41,AnnCloseP), [Test15303.hs:4:41]), -((Test15303.hs:4:33-41,AnnOpenP), [Test15303.hs:4:33]), -((Test15303.hs:4:36-37,AnnSimpleQuote), [Test15303.hs:4:36]), -((Test15303.hs:4:36-37,AnnVal), [Test15303.hs:4:37]), -((Test15303.hs:4:46-48,AnnRarrow), [Test15303.hs:4:50-51]), -((Test15303.hs:4:46-66,AnnRarrow), [Test15303.hs:4:50-51]), -((Test15303.hs:4:58-66,AnnCloseP), [Test15303.hs:4:66]), -((Test15303.hs:4:58-66,AnnOpenP), [Test15303.hs:4:58]), -((Test15303.hs:4:61-62,AnnSimpleQuote), [Test15303.hs:4:61]), -((Test15303.hs:4:61-62,AnnVal), [Test15303.hs:4:62]), -((Test15303.hs:5:1-4,AnnCloseP), [Test15303.hs:5:4]), -((Test15303.hs:5:1-4,AnnOpenP), [Test15303.hs:5:1]), -((Test15303.hs:5:1-4,AnnVal), [Test15303.hs:5:2-3]), -((Test15303.hs:5:1-15,AnnEqual), [Test15303.hs:5:6]), -((Test15303.hs:5:1-15,AnnFunId), [Test15303.hs:5:1-4]), -((Test15303.hs:5:1-15,AnnSemi), [Test15303.hs:6:1]), -((Test15303.hs:6:1-11,AnnInfix), [Test15303.hs:6:1-6]), -((Test15303.hs:6:1-11,AnnSemi), [Test15303.hs:7:1]), -((Test15303.hs:6:1-11,AnnVal), [Test15303.hs:6:8]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test15303.hs" 7 1 diff --git a/testsuite/tests/ghc-api/annotations/T16212.stdout b/testsuite/tests/ghc-api/annotations/T16212.stdout deleted file mode 100644 index ec1932ed42..0000000000 --- a/testsuite/tests/ghc-api/annotations/T16212.stdout +++ /dev/null @@ -1,68 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test16212.hs:1:1,AnnModule), [Test16212.hs:1:1-6]), -((Test16212.hs:1:1,AnnWhere), [Test16212.hs:1:18-22]), -((Test16212.hs:(3,1)-(4,37),AnnClass), [Test16212.hs:3:1-5]), -((Test16212.hs:(3,1)-(4,37),AnnCloseP), [Test16212.hs:3:37]), -((Test16212.hs:(3,1)-(4,37),AnnOpenP), [Test16212.hs:3:21]), -((Test16212.hs:(3,1)-(4,37),AnnSemi), [Test16212.hs:6:1]), -((Test16212.hs:(3,1)-(4,37),AnnWhere), [Test16212.hs:3:39-43]), -((Test16212.hs:3:21-37,AnnCloseP), [Test16212.hs:3:37]), -((Test16212.hs:3:21-37,AnnOpenP), [Test16212.hs:3:21]), -((Test16212.hs:3:22-36,AnnDcolon), [Test16212.hs:3:28-29]), -((Test16212.hs:4:3-37,AnnDcolon), [Test16212.hs:4:9-10]), -((Test16212.hs:4:29-37,AnnCloseP), [Test16212.hs:4:37]), -((Test16212.hs:4:29-37,AnnOpenP), [Test16212.hs:4:29]), -((Test16212.hs:(6,1)-(7,37),AnnClass), [Test16212.hs:6:1-5]), -((Test16212.hs:(6,1)-(7,37),AnnCloseP), [Test16212.hs:6:40, Test16212.hs:6:39]), -((Test16212.hs:(6,1)-(7,37),AnnOpenP), [Test16212.hs:6:22, Test16212.hs:6:23]), -((Test16212.hs:(6,1)-(7,37),AnnSemi), [Test16212.hs:9:1]), -((Test16212.hs:(6,1)-(7,37),AnnWhere), [Test16212.hs:6:42-46]), -((Test16212.hs:6:22-40,AnnCloseP), [Test16212.hs:6:40]), -((Test16212.hs:6:22-40,AnnOpenP), [Test16212.hs:6:22]), -((Test16212.hs:6:23-39,AnnCloseP), [Test16212.hs:6:39]), -((Test16212.hs:6:23-39,AnnOpenP), [Test16212.hs:6:23]), -((Test16212.hs:6:24-38,AnnDcolon), [Test16212.hs:6:30-31]), -((Test16212.hs:7:3-37,AnnDcolon), [Test16212.hs:7:9-10]), -((Test16212.hs:7:29-37,AnnCloseP), [Test16212.hs:7:37]), -((Test16212.hs:7:29-37,AnnOpenP), [Test16212.hs:7:29]), -((Test16212.hs:(9,1)-(11,36),AnnCloseP), [Test16212.hs:9:23]), -((Test16212.hs:(9,1)-(11,36),AnnData), [Test16212.hs:9:1-4]), -((Test16212.hs:(9,1)-(11,36),AnnOpenP), [Test16212.hs:9:10]), -((Test16212.hs:(9,1)-(11,36),AnnSemi), [Test16212.hs:13:1]), -((Test16212.hs:(9,1)-(11,36),AnnWhere), [Test16212.hs:9:25-29]), -((Test16212.hs:9:10-23,AnnCloseP), [Test16212.hs:9:23]), -((Test16212.hs:9:10-23,AnnOpenP), [Test16212.hs:9:10]), -((Test16212.hs:9:11-22,AnnDcolon), [Test16212.hs:9:13-14]), -((Test16212.hs:10:5-23,AnnDcolon), [Test16212.hs:10:13-14]), -((Test16212.hs:10:5-23,AnnSemi), [Test16212.hs:11:5]), -((Test16212.hs:11:5-36,AnnDcolon), [Test16212.hs:11:13-14]), -((Test16212.hs:11:16-20,AnnRarrow), [Test16212.hs:11:22-23]), -((Test16212.hs:11:16-36,AnnRarrow), [Test16212.hs:11:22-23]), -((Test16212.hs:11:29-36,AnnCloseP), [Test16212.hs:11:36]), -((Test16212.hs:11:29-36,AnnOpenP), [Test16212.hs:11:29]), -((Test16212.hs:13:1-41,AnnCloseP), [Test16212.hs:13:12]), -((Test16212.hs:13:1-41,AnnData), [Test16212.hs:13:1-4]), -((Test16212.hs:13:1-41,AnnEqual), [Test16212.hs:13:16]), -((Test16212.hs:13:1-41,AnnOpenP), [Test16212.hs:13:10]), -((Test16212.hs:13:1-41,AnnSemi), [Test16212.hs:14:1]), -((Test16212.hs:13:10-12,AnnCloseP), [Test16212.hs:13:12]), -((Test16212.hs:13:10-12,AnnOpenP), [Test16212.hs:13:10]), -((Test16212.hs:13:22-41,AnnCloseC), [Test16212.hs:13:41]), -((Test16212.hs:13:22-41,AnnOpenC), [Test16212.hs:13:22]), -((Test16212.hs:13:24-30,AnnComma), [Test16212.hs:13:31]), -((Test16212.hs:13:24-30,AnnDcolon), [Test16212.hs:13:27-28]), -((Test16212.hs:13:33-39,AnnDcolon), [Test16212.hs:13:36-37]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test16212.hs" 14 1 diff --git a/testsuite/tests/ghc-api/annotations/T16230.stdout b/testsuite/tests/ghc-api/annotations/T16230.stdout deleted file mode 100644 index 5af52f6a50..0000000000 --- a/testsuite/tests/ghc-api/annotations/T16230.stdout +++ /dev/null @@ -1,68 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test16230.hs:1:1,AnnModule), [Test16230.hs:7:1-6]), -((Test16230.hs:1:1,AnnWhere), [Test16230.hs:7:28-32]), -((Test16230.hs:9:1-17,AnnImport), [Test16230.hs:9:1-6]), -((Test16230.hs:9:1-17,AnnSemi), [Test16230.hs:11:1]), -((Test16230.hs:11:1-11,AnnData), [Test16230.hs:11:1-4]), -((Test16230.hs:11:1-11,AnnFamily), [Test16230.hs:11:6-11]), -((Test16230.hs:11:1-11,AnnSemi), [Test16230.hs:12:1]), -((Test16230.hs:12:1-52,AnnData), [Test16230.hs:12:1-4]), -((Test16230.hs:12:1-52,AnnDot), [Test16230.hs:12:33]), -((Test16230.hs:12:1-52,AnnEqual), [Test16230.hs:12:48]), -((Test16230.hs:12:1-52,AnnForall), [Test16230.hs:12:15-20]), -((Test16230.hs:12:1-52,AnnInstance), [Test16230.hs:12:6-13]), -((Test16230.hs:12:1-52,AnnSemi), [Test16230.hs:14:1]), -((Test16230.hs:12:22-32,AnnCloseP), [Test16230.hs:12:32]), -((Test16230.hs:12:22-32,AnnDcolon), [Test16230.hs:12:25-26]), -((Test16230.hs:12:22-32,AnnOpenP), [Test16230.hs:12:22]), -((Test16230.hs:12:38-46,AnnCloseP), [Test16230.hs:12:46]), -((Test16230.hs:12:38-46,AnnOpenP), [Test16230.hs:12:38]), -((Test16230.hs:(14,1)-(15,13),AnnClass), [Test16230.hs:14:1-5]), -((Test16230.hs:(14,1)-(15,13),AnnSemi), [Test16230.hs:17:1]), -((Test16230.hs:(14,1)-(15,13),AnnWhere), [Test16230.hs:14:11-15]), -((Test16230.hs:15:3-13,AnnType), [Test16230.hs:15:3-6]), -((Test16230.hs:(17,1)-(18,31),AnnInstance), [Test16230.hs:17:1-8]), -((Test16230.hs:(17,1)-(18,31),AnnSemi), [Test16230.hs:21:1]), -((Test16230.hs:(17,1)-(18,31),AnnWhere), [Test16230.hs:17:26-30]), -((Test16230.hs:17:10-24,AnnDot), [Test16230.hs:17:18]), -((Test16230.hs:17:10-24,AnnForall), [Test16230.hs:17:10-15]), -((Test16230.hs:17:22-24,AnnCloseS), [Test16230.hs:17:24]), -((Test16230.hs:17:22-24,AnnOpenS), [Test16230.hs:17:22]), -((Test16230.hs:18:3-31,AnnDot), [Test16230.hs:18:16]), -((Test16230.hs:18:3-31,AnnEqual), [Test16230.hs:18:27]), -((Test16230.hs:18:3-31,AnnForall), [Test16230.hs:18:8-13]), -((Test16230.hs:18:3-31,AnnType), [Test16230.hs:18:3-6]), -((Test16230.hs:18:8-31,AnnDot), [Test16230.hs:18:16]), -((Test16230.hs:18:8-31,AnnEqual), [Test16230.hs:18:27]), -((Test16230.hs:18:8-31,AnnForall), [Test16230.hs:18:8-13]), -((Test16230.hs:18:21-23,AnnCloseS), [Test16230.hs:18:23]), -((Test16230.hs:18:21-23,AnnOpenS), [Test16230.hs:18:21]), -((Test16230.hs:21:1-17,AnnFamily), [Test16230.hs:21:6-11]), -((Test16230.hs:21:1-17,AnnSemi), [Test16230.hs:24:1]), -((Test16230.hs:21:1-17,AnnType), [Test16230.hs:21:1-4]), -((Test16230.hs:21:1-17,AnnWhere), [Test16230.hs:21:19-23]), -((Test16230.hs:22:3-38,AnnDot), [Test16230.hs:22:13]), -((Test16230.hs:22:3-38,AnnEqual), [Test16230.hs:22:31]), -((Test16230.hs:22:3-38,AnnForall), [Test16230.hs:22:3-8]), -((Test16230.hs:22:3-38,AnnSemi), [Test16230.hs:23:3]), -((Test16230.hs:22:17-19,AnnCloseS), [Test16230.hs:22:19]), -((Test16230.hs:22:17-19,AnnOpenS), [Test16230.hs:22:17]), -((Test16230.hs:22:21-29,AnnCloseP), [Test16230.hs:22:29]), -((Test16230.hs:22:21-29,AnnOpenP), [Test16230.hs:22:21]), -((Test16230.hs:23:3-36,AnnDot), [Test16230.hs:23:11]), -((Test16230.hs:23:3-36,AnnEqual), [Test16230.hs:23:31]), -((Test16230.hs:23:3-36,AnnForall), [Test16230.hs:23:3-8]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test16230.hs" 24 1 diff --git a/testsuite/tests/ghc-api/annotations/T16236.stdout b/testsuite/tests/ghc-api/annotations/T16236.stdout deleted file mode 100644 index 8ca1725440..0000000000 --- a/testsuite/tests/ghc-api/annotations/T16236.stdout +++ /dev/null @@ -1,87 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test16236.hs:1:1,AnnModule), [Test16236.hs:4:1-6]), -((Test16236.hs:1:1,AnnWhere), [Test16236.hs:4:22-26]), -((Test16236.hs:5:1-16,AnnImport), [Test16236.hs:5:1-6]), -((Test16236.hs:5:1-16,AnnSemi), [Test16236.hs:7:1]), -((Test16236.hs:7:1-30,AnnData), [Test16236.hs:7:1-4]), -((Test16236.hs:7:1-30,AnnEqual), [Test16236.hs:7:12]), -((Test16236.hs:7:1-30,AnnSemi), [Test16236.hs:9:1]), -((Test16236.hs:7:14-17,AnnVbar), [Test16236.hs:7:19]), -((Test16236.hs:9:1-39,AnnCloseP), [Test16236.hs:9:30]), -((Test16236.hs:9:1-39,AnnDcolon), [Test16236.hs:9:32-33]), -((Test16236.hs:9:1-39,AnnFamily), [Test16236.hs:9:6-11]), -((Test16236.hs:9:1-39,AnnOpenP), [Test16236.hs:9:20]), -((Test16236.hs:9:1-39,AnnSemi), [Test16236.hs:14:1]), -((Test16236.hs:9:1-39,AnnType), [Test16236.hs:9:1-4]), -((Test16236.hs:9:1-39,AnnWhere), [Test16236.hs:9:41-45]), -((Test16236.hs:9:20-30,AnnCloseP), [Test16236.hs:9:30]), -((Test16236.hs:9:20-30,AnnOpenP), [Test16236.hs:9:20]), -((Test16236.hs:9:21-29,AnnDcolon), [Test16236.hs:9:24-25]), -((Test16236.hs:9:27-29,AnnCloseS), [Test16236.hs:9:29]), -((Test16236.hs:9:27-29,AnnOpenS), [Test16236.hs:9:27]), -((Test16236.hs:10:3-36,AnnEqual), [Test16236.hs:10:19]), -((Test16236.hs:10:3-36,AnnSemi), [Test16236.hs:11:3]), -((Test16236.hs:10:10-17,AnnCloseP), [Test16236.hs:10:17]), -((Test16236.hs:10:10-17,AnnOpenP), [Test16236.hs:10:10]), -((Test16236.hs:10:26-36,AnnCloseP), [Test16236.hs:10:36]), -((Test16236.hs:10:26-36,AnnOpenP), [Test16236.hs:10:26]), -((Test16236.hs:11:3-24,AnnEqual), [Test16236.hs:11:19]), -((Test16236.hs:11:10-12,AnnCloseS), [Test16236.hs:11:12]), -((Test16236.hs:11:10-12,AnnOpenS), [Test16236.hs:11:11]), -((Test16236.hs:11:10-12,AnnSimpleQuote), [Test16236.hs:11:10]), -((Test16236.hs:14:1-29,AnnCloseP), [Test16236.hs:14:17]), -((Test16236.hs:14:1-29,AnnData), [Test16236.hs:14:1-4]), -((Test16236.hs:14:1-29,AnnEqual), [Test16236.hs:14:19]), -((Test16236.hs:14:1-29,AnnOpenP), [Test16236.hs:14:10]), -((Test16236.hs:14:1-29,AnnSemi), [Test16236.hs:16:1]), -((Test16236.hs:14:10-17,AnnCloseP), [Test16236.hs:14:17]), -((Test16236.hs:14:10-17,AnnOpenP), [Test16236.hs:14:10]), -((Test16236.hs:14:11-16,AnnDcolon), [Test16236.hs:14:13-14]), -((Test16236.hs:14:25-29,AnnCloseP), [Test16236.hs:14:29]), -((Test16236.hs:14:25-29,AnnOpenP), [Test16236.hs:14:25]), -((Test16236.hs:16:1-48,AnnCloseP), [Test16236.hs:16:23, Test16236.hs:16:40]), -((Test16236.hs:16:1-48,AnnDcolon), [Test16236.hs:16:42-43]), -((Test16236.hs:16:1-48,AnnFamily), [Test16236.hs:16:6-11]), -((Test16236.hs:16:1-48,AnnOpenP), [Test16236.hs:16:16, Test16236.hs:16:25]), -((Test16236.hs:16:1-48,AnnSemi), [Test16236.hs:19:1]), -((Test16236.hs:16:1-48,AnnType), [Test16236.hs:16:1-4]), -((Test16236.hs:16:1-48,AnnWhere), [Test16236.hs:16:50-54]), -((Test16236.hs:16:16-23,AnnCloseP), [Test16236.hs:16:23]), -((Test16236.hs:16:16-23,AnnOpenP), [Test16236.hs:16:16]), -((Test16236.hs:16:17-22,AnnDcolon), [Test16236.hs:16:19-20]), -((Test16236.hs:16:25-40,AnnCloseP), [Test16236.hs:16:40]), -((Test16236.hs:16:25-40,AnnOpenP), [Test16236.hs:16:25]), -((Test16236.hs:16:26-39,AnnDcolon), [Test16236.hs:16:28-29]), -((Test16236.hs:16:31,AnnRarrow), [Test16236.hs:16:33-34]), -((Test16236.hs:16:31-39,AnnRarrow), [Test16236.hs:16:33-34]), -((Test16236.hs:17:3-30,AnnEqual), [Test16236.hs:17:17]), -((Test16236.hs:19:1-11,AnnCloseP), [Test16236.hs:19:24]), -((Test16236.hs:19:1-11,AnnData), [Test16236.hs:19:1-4]), -((Test16236.hs:19:1-11,AnnFamily), [Test16236.hs:19:6-11]), -((Test16236.hs:19:1-11,AnnOpenP), [Test16236.hs:19:17]), -((Test16236.hs:19:1-11,AnnSemi), [Test16236.hs:20:1]), -((Test16236.hs:19:17-24,AnnCloseP), [Test16236.hs:19:24]), -((Test16236.hs:19:17-24,AnnOpenP), [Test16236.hs:19:17]), -((Test16236.hs:19:18-23,AnnDcolon), [Test16236.hs:19:20-21]), -((Test16236.hs:20:1-49,AnnData), [Test16236.hs:20:1-4]), -((Test16236.hs:20:1-49,AnnEqual), [Test16236.hs:20:41]), -((Test16236.hs:20:1-49,AnnInstance), [Test16236.hs:20:6-13]), -((Test16236.hs:20:1-49,AnnSemi), [Test16236.hs:21:1]), -((Test16236.hs:20:20-37,AnnCloseP), [Test16236.hs:20:37]), -((Test16236.hs:20:20-37,AnnOpenP), [Test16236.hs:20:20]), -((Test16236.hs:20:21-26,AnnRarrow), [Test16236.hs:20:28-29]), -((Test16236.hs:20:21-36,AnnRarrow), [Test16236.hs:20:28-29]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test16236.hs" 21 1 diff --git a/testsuite/tests/ghc-api/annotations/T16279.stdout b/testsuite/tests/ghc-api/annotations/T16279.stdout deleted file mode 100644 index 901c776fdd..0000000000 --- a/testsuite/tests/ghc-api/annotations/T16279.stdout +++ /dev/null @@ -1,32 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test16279.hs:5:1-20,AnnDcolon), [Test16279.hs:5:7-8]), -((Test16279.hs:5:1-20,AnnSemi), [Test16279.hs:6:1]), -((Test16279.hs:5:10-12,AnnRarrow), [Test16279.hs:5:14-15]), -((Test16279.hs:5:10-20,AnnRarrow), [Test16279.hs:5:14-15]), -((Test16279.hs:(6,1)-(7,24),AnnEqual), [Test16279.hs:6:7]), -((Test16279.hs:(6,1)-(7,24),AnnFunId), [Test16279.hs:6:1-5]), -((Test16279.hs:(6,1)-(7,24),AnnSemi), [Test16279.hs:9:1]), -((Test16279.hs:(6,9)-(7,24),AnnCase), [Test16279.hs:6:10-13]), -((Test16279.hs:(6,9)-(7,24),AnnLam), [Test16279.hs:6:9]), -((Test16279.hs:6:15-23,AnnSemi), [Test16279.hs:7:15]), -((Test16279.hs:6:17-23,AnnRarrow), [Test16279.hs:6:17-18]), -((Test16279.hs:7:17-24,AnnRarrow), [Test16279.hs:7:17-18]), -((Test16279.hs:9:1-16,AnnEqual), [Test16279.hs:9:6]), -((Test16279.hs:9:1-16,AnnFunId), [Test16279.hs:9:1-4]), -((Test16279.hs:9:1-16,AnnSemi), [Test16279.hs:11:1]), -((Test16279.hs:9:15-16,AnnCloseP), [Test16279.hs:9:16]), -((Test16279.hs:9:15-16,AnnOpenP), [Test16279.hs:9:15]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test16279.hs" 11 1 diff --git a/testsuite/tests/ghc-api/annotations/T17388.stdout b/testsuite/tests/ghc-api/annotations/T17388.stdout deleted file mode 100644 index b2012bff79..0000000000 --- a/testsuite/tests/ghc-api/annotations/T17388.stdout +++ /dev/null @@ -1,35 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test17388.hs:1:1,AnnModule), [Test17388.hs:3:1-6]), -((Test17388.hs:1:1,AnnWhere), [Test17388.hs:3:18-22]), -((Test17388.hs:5:1-21,AnnImport), [Test17388.hs:5:1-6]), -((Test17388.hs:5:1-21,AnnPackageName), [Test17388.hs:5:8-13]), -((Test17388.hs:5:1-21,AnnSemi), [Test17388.hs:6:1]), -((Test17388.hs:6:1-30,AnnClose), [Test17388.hs:6:20-22]), -((Test17388.hs:6:1-30,AnnImport), [Test17388.hs:6:1-6]), -((Test17388.hs:6:1-30,AnnOpen), [Test17388.hs:6:8-17]), -((Test17388.hs:6:1-30,AnnSemi), [Test17388.hs:8:1]), -((Test17388.hs:8:1-40,AnnClose), [Test17388.hs:8:19-21]), -((Test17388.hs:8:1-40,AnnImport), [Test17388.hs:8:1-6]), -((Test17388.hs:8:1-40,AnnOpen), [Test17388.hs:8:8-17]), -((Test17388.hs:8:1-40,AnnPackageName), [Test17388.hs:8:24-29]), -((Test17388.hs:8:1-40,AnnSemi), [Test17388.hs:9:1]), -((Test17388.hs:9:1-50,AnnClose), [Test17388.hs:9:19-21]), -((Test17388.hs:9:1-50,AnnImport), [Test17388.hs:9:1-6]), -((Test17388.hs:9:1-50,AnnOpen), [Test17388.hs:9:8-17]), -((Test17388.hs:9:1-50,AnnPackageName), [Test17388.hs:9:34-39]), -((Test17388.hs:9:1-50,AnnQualified), [Test17388.hs:9:23-31]), -((Test17388.hs:9:1-50,AnnSemi), [Test17388.hs:10:1]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test17388.hs" 10 1 diff --git a/testsuite/tests/ghc-api/annotations/T17519.stdout b/testsuite/tests/ghc-api/annotations/T17519.stdout deleted file mode 100644 index 9560a68675..0000000000 --- a/testsuite/tests/ghc-api/annotations/T17519.stdout +++ /dev/null @@ -1,27 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((Test17519.hs:1:1,AnnModule), [Test17519.hs:3:1-6]), -((Test17519.hs:1:1,AnnWhere), [Test17519.hs:3:18-22]), -((Test17519.hs:5:1-36,AnnDcolonU), [Test17519.hs:5:21]), -((Test17519.hs:5:1-36,AnnFamily), [Test17519.hs:5:6-11]), -((Test17519.hs:5:1-36,AnnSemi), [Test17519.hs:7:1]), -((Test17519.hs:5:1-36,AnnType), [Test17519.hs:5:1-4]), -((Test17519.hs:5:1-36,AnnWhere), [Test17519.hs:5:38-42]), -((Test17519.hs:5:23-36,AnnForallU), [Test17519.hs:5:23]), -((Test17519.hs:5:23-36,AnnRarrowU), [Test17519.hs:5:27]), -((Test17519.hs:5:29,AnnRarrowU), [Test17519.hs:5:31]), -((Test17519.hs:5:29-36,AnnRarrowU), [Test17519.hs:5:31]), -((Test17519.hs:6:3-18,AnnEqual), [Test17519.hs:6:11]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "Test17519.hs" 7 1 diff --git a/testsuite/tests/ghc-api/annotations/Test10255.hs b/testsuite/tests/ghc-api/annotations/Test10255.hs deleted file mode 100644 index 2cfc53bbfb..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test10255.hs +++ /dev/null @@ -1,7 +0,0 @@ -{-# LANGUAGE ScopedTypeVariables #-} -module Test10255 where - -import Data.Maybe - -fob (f :: (Maybe t -> Int)) = - undefined diff --git a/testsuite/tests/ghc-api/annotations/Test10268.hs b/testsuite/tests/ghc-api/annotations/Test10268.hs deleted file mode 100644 index 04cc0e7e0e..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test10268.hs +++ /dev/null @@ -1,11 +0,0 @@ -{-# LANGUAGE TemplateHaskell,TypeOperators,DataKinds #-} - -module Test10268 where - -th = $footemplate - -give :: b -> Pattern '[b] a -give = undefined - -pfail :: Pattern '[] a -pfail = undefined diff --git a/testsuite/tests/ghc-api/annotations/Test10269.hs b/testsuite/tests/ghc-api/annotations/Test10269.hs deleted file mode 100644 index c6df750c04..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test10269.hs +++ /dev/null @@ -1,4 +0,0 @@ -module Test10269 where - - -(f =*= g) sa i = undefined diff --git a/testsuite/tests/ghc-api/annotations/Test10276.hs b/testsuite/tests/ghc-api/annotations/Test10276.hs deleted file mode 100644 index dcf2549979..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test10276.hs +++ /dev/null @@ -1,15 +0,0 @@ -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE QuasiQuotes #-} - -module Test10276 where - -f1 = [| bar |] -f2 = [e| bar |] - -class QQExp a b where - qqExp x = [||fst $ runState $$(qqExpM x) - ((0,M.empty) :: (Int,M.Map L.Name [L.Operand]))||] - -class QQExp2 a b where - qqExp x = [e||fst $ runState $$(qqExpM x) - ((0,M.empty) :: (Int,M.Map L.Name [L.Operand]))||] diff --git a/testsuite/tests/ghc-api/annotations/Test10278.hs b/testsuite/tests/ghc-api/annotations/Test10278.hs deleted file mode 100644 index d9b14f65c1..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test10278.hs +++ /dev/null @@ -1,20 +0,0 @@ -{-# LANGUAGE ScopedTypeVariables,GADTs #-} -module Test10278 where - -extremumNewton :: forall tag. forall tag1. tag -> tag1 -> Int -extremumNewton = undefined - -extremumNewton1 :: (Eq a, Fractional a) => - (forall tag. forall tag1. - Tower tag1 (Tower tag a) - -> Tower tag1 (Tower tag a)) - -> a -> [a] -extremumNewton1 f x0 = zeroNewton (diffUU f) x0 - -data MaybeDefault v where - SetTo :: forall v . ( Eq v, Show v ) => !v -> MaybeDefault v - SetTo2:: forall v . ( Eq v, Show v ) => !v -> MaybeDefault v - SetTo3 :: (Eq a) => forall v . ( Eq v, Show v ) => !v -> a -> MaybeDefault v - {- - SetTo4 :: forall v . (( Eq v, Show v ) => v -> MaybeDefault v -> a -> [a]) - -} diff --git a/testsuite/tests/ghc-api/annotations/Test10280.hs b/testsuite/tests/ghc-api/annotations/Test10280.hs deleted file mode 100644 index 08e4186715..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test10280.hs +++ /dev/null @@ -1,4 +0,0 @@ -{-# LANGUAGE TupleSections #-} -module Test10280 where - -foo2 = atomicModifyIORef ciTokens ((,()) . f) diff --git a/testsuite/tests/ghc-api/annotations/Test10307.hs b/testsuite/tests/ghc-api/annotations/Test10307.hs deleted file mode 100644 index 938801a8d6..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test10307.hs +++ /dev/null @@ -1,6 +0,0 @@ -{-# LANGUAGE TypeFamilies #-} -module Test10307 where - -class Foldable t where - type FoldableConstraint t x :: * - type FoldableConstraint t x = () diff --git a/testsuite/tests/ghc-api/annotations/Test10309.hs b/testsuite/tests/ghc-api/annotations/Test10309.hs deleted file mode 100644 index 75f18a9b71..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test10309.hs +++ /dev/null @@ -1,6 +0,0 @@ -{-# LANGUAGE GADTs #-} -module Test10309 where - -data H1 a b where - C3 :: (Num a) => { field :: a -- ^ hello docs - } -> H1 Int Int diff --git a/testsuite/tests/ghc-api/annotations/Test10312.hs b/testsuite/tests/ghc-api/annotations/Test10312.hs deleted file mode 100644 index 6d3c8476e9..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test10312.hs +++ /dev/null @@ -1,79 +0,0 @@ -{-# LANGUAGE ParallelListComp, - TransformListComp, - RecordWildCards #-} -module Test10312 where --- From --- https://ocharles.org.uk/blog/guest-posts/2014-12-07-list-comprehensions.html - -import GHC.Exts -import qualified Data.Map as M -import Data.Ord (comparing) -import Data.List (sortBy) - --- Let’s look at a simple, normal list comprehension to start: - -regularListComp :: [Int] -regularListComp = [ x + y * z - | x <- [0..10] - , y <- [10..20] - , z <- [20..30] - ] - -parallelListComp :: [Int] -parallelListComp = [ x + y * z - | x <- [0..10] - | y <- [10..20] - | z <- [20..30] - ] - --- fibs :: [Int] --- fibs = 0 : 1 : zipWith (+) fibs (tail fibs) - -fibs :: [Int] -fibs = 0 : 1 : [ x + y - | x <- fibs - | y <- tail fibs - ] - -fiblikes :: [Int] -fiblikes = 0 : 1 : [ x + y + z - | x <- fibs - | y <- tail fibs - | z <- tail (tail fibs) - ] - --- TransformListComp -data Character = Character - { firstName :: String - , lastName :: String - , birthYear :: Int - } deriving (Show, Eq) - -friends :: [Character] -friends = [ Character "Phoebe" "Buffay" 1963 - , Character "Chandler" "Bing" 1969 - , Character "Rachel" "Green" 1969 - , Character "Joey" "Tribbiani" 1967 - , Character "Monica" "Geller" 1964 - , Character "Ross" "Geller" 1966 - ] - -oldest :: Int -> [Character] -> [String] -oldest k tbl = [ firstName ++ " " ++ lastName - | Character{..} <- tbl - , then sortWith by birthYear - , then take k - ] - -groupByLargest :: Ord b => (a -> b) -> [a] -> [[a]] -groupByLargest f = sortBy (comparing (negate . length)) . groupWith f - -bestBirthYears :: [Character] -> [(Int, [String])] -bestBirthYears tbl = [ (the birthYear, firstName) - | Character{..} <- tbl - , then group by birthYear using groupByLargest - ] - -uniq_fs = [ (n, the p, the d') | (n, Fixity p d) <- fs - , let d' = ppDir d - , then group by Down (p,d') using groupWith ] diff --git a/testsuite/tests/ghc-api/annotations/Test10313.hs b/testsuite/tests/ghc-api/annotations/Test10313.hs deleted file mode 100644 index a94c9eac91..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test10313.hs +++ /dev/null @@ -1,35 +0,0 @@ -{-# LANGUAGE PackageImports #-} -{-# LANGUAGE MagicHash, UnliftedFFITypes #-} -{-# LANGUAGE ForeignFunctionInterface #-} - -module Test10313 where - -import "b\x61se" Data.List () - -{-# WARNING Logic - , solverCheckAndGetModel - "New Z3 API support is still incomplete and fragile: \ - \you may experience segmentation faults!" - #-} - -{-# Deprecated Logic - , solverCheckAndGetModel - "Deprecation: \ - \you may experience segmentation faults!" - #-} - -data {-# Ctype "foo\x63" "b\x61r" #-} Logic = Logic - --- Should warn -foo1 x = x -{-# RULES "foo1\x67" [ 1] forall x. foo1 x = x #-} - -foreign import prim unsafe "a\x62" a :: IO Int - -{-# INLINE strictStream #-} -strictStream (Bitstream l v) - = S.concatMap stream (GV.stream v) - `S.sized` - Exact l - -b = {-# SCC "foo\x64" #-} 006 diff --git a/testsuite/tests/ghc-api/annotations/Test10354.hs b/testsuite/tests/ghc-api/annotations/Test10354.hs deleted file mode 100644 index 267ea45ab0..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test10354.hs +++ /dev/null @@ -1,14 +0,0 @@ -{-# LANGUAGE PartialTypeSignatures #-} -module Test10354 where - -f :: ((Eq a, _)) => a -> a -> Bool -f x y = x == y - -bar :: ( ) => a-> Bool -bar = undefined - -baz :: _ => a -> String -baz = undefined - -foo :: ForceError -foo = undefined diff --git a/testsuite/tests/ghc-api/annotations/Test10357.hs b/testsuite/tests/ghc-api/annotations/Test10357.hs deleted file mode 100644 index 8790ca6c1b..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test10357.hs +++ /dev/null @@ -1,13 +0,0 @@ -{-# LANGUAGE ParallelListComp #-} -module Test10357 where - -legendres = one : x : - [ multPoly - (poly LE [recip (n' + 1)]) - (addPoly (poly LE [0, 2 * n' + 1] `multPoly` p_n) - (poly LE [-n'] `multPoly` p_nm1) - ) - | n <- [1..], let n' = fromInteger n - | p_n <- tail legendres - | p_nm1 <- legendres - ] diff --git a/testsuite/tests/ghc-api/annotations/Test10358.hs b/testsuite/tests/ghc-api/annotations/Test10358.hs deleted file mode 100644 index 1e1ce35690..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test10358.hs +++ /dev/null @@ -1,8 +0,0 @@ -{-# LANGUAGE BangPatterns #-} -module Test10358 where - -mtGamma x v d = - let !x_2 = x*x; !x_4 = x_2*x_2 - v3 = v*v*v - dv = d * v3 - in 5 diff --git a/testsuite/tests/ghc-api/annotations/Test10396.hs b/testsuite/tests/ghc-api/annotations/Test10396.hs deleted file mode 100644 index 71b18a8f9e..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test10396.hs +++ /dev/null @@ -1,7 +0,0 @@ -{-# LANGUAGE ScopedTypeVariables #-} -module Test10396 where - -errors :: IO () -errors= do - let ls :: Int = undefined - return () diff --git a/testsuite/tests/ghc-api/annotations/Test10399.hs b/testsuite/tests/ghc-api/annotations/Test10399.hs deleted file mode 100644 index bb3265000d..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test10399.hs +++ /dev/null @@ -1,22 +0,0 @@ -{-# LANGUAGE ImplicitParams #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TupleSections #-} -{-# LANGUAGE ConstraintKinds #-} -{-# LANGUAGE GADTs #-} -module Test10399 where - -type MPI = ?mpi_secret :: MPISecret - -mkPoli = mkBila . map ((,,(),,()) <$> P.base <*> P.pos <*> P.form) - -data MaybeDefault v where - SetTo :: forall v . ( Eq v, Show v ) => !v -> MaybeDefault v - SetTo4 :: forall v a. ( Eq v, Show v ) => v -> MaybeDefault v - -> a -> MaybeDefault [a] - TestParens :: forall v . (Eq v) -> MaybeDefault v - -[t| Map.Map T.Text $tc |] - -bar $( [p| x |] ) = x diff --git a/testsuite/tests/ghc-api/annotations/Test10598.hs b/testsuite/tests/ghc-api/annotations/Test10598.hs deleted file mode 100644 index 8a7651c154..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test10598.hs +++ /dev/null @@ -1,18 +0,0 @@ -{-# LANGUAGE DeriveAnyClass #-} -{-# LANGUAGE DerivingStrategies #-} -{-# LANGUAGE GeneralizedNewtypeDeriving #-} -{-# LANGUAGE StandaloneDeriving #-} -module Test10598 where - -class C a where - c :: proxy a -> Int - c _ = 42 - -instance C Int where - c _ = 27 - -newtype Foo = MkFoo Int - deriving Eq - deriving stock Ord - deriving anyclass C -deriving newtype instance Show Foo diff --git a/testsuite/tests/ghc-api/annotations/Test11018.hs b/testsuite/tests/ghc-api/annotations/Test11018.hs deleted file mode 100644 index e1d020540e..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test11018.hs +++ /dev/null @@ -1,52 +0,0 @@ -{-# LANGUAGE Arrows #-} -{-# LANGUAGE RankNTypes #-} -{-# LANGUAGE UnicodeSyntax #-} -module Test11018 where - -nonUnicode :: forall a . a -> IO Int -nonUnicode _ = do - x <- readChar - return 4 - --- ^ An opaque ESD handle for recording data from the soundcard via ESD. -data Recorder fr ch (r ∷ * -> *) - = Recorder { - reCloseH :: !(FinalizerHandle r) - } - -f :: Arrow a => a (Int,Int,Int) Int -f = proc (x,y,z) -> returnA -< x+y - -f2 :: Arrow a => a (Int,Int,Int) Int -f2 = proc (x,y,z) -> returnA >- x+y - -g :: ArrowApply a => Int -> a (a Int Int,Int) Int -g y = proc (x,z) -> x -<< 2+y - -g2 :: ArrowApply a => Int -> a (a Int Int,Int) Int -g2 y = proc (x,z) -> x >>- 2+y - --- ------------------------------------- - -unicode ∷ ∀ a . a → IO Int -unicode _ = do - x ← readChar - return 4 - --- ^ An opaque ESD handle for recording data from the soundcard via ESD. -data RecorderU fr ch (r ∷ ★ → ★) - = RecorderU { - reCloseHU ∷ !(FinalizerHandle r) - } - -fU :: Arrow a ⇒ a (Int,Int,Int) Int -fU = proc (x,y,z) -> returnA ⤙ x+y - -f2U :: Arrow a ⇒ a (Int,Int,Int) Int -f2U = proc (x,y,z) -> returnA ⤚ x+y - -gU :: ArrowApply a ⇒ Int -> a (a Int Int,Int) Int -gU y = proc (x,z) -> x ⤛ 2+y - -g2U :: ArrowApply a ⇒ Int -> a (a Int Int,Int) Int -g2U y = proc (x,z) -> x ⤜ 2+y diff --git a/testsuite/tests/ghc-api/annotations/Test11321.hs b/testsuite/tests/ghc-api/annotations/Test11321.hs deleted file mode 100644 index d88d997077..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test11321.hs +++ /dev/null @@ -1,17 +0,0 @@ -{-# LANGUAGE TypeOperators - , DataKinds - , PolyKinds - , TypeFamilies - , GADTs - , UndecidableInstances - , RankNTypes - , ScopedTypeVariables - #-} -module Test11321 where - -data instance Sing (z :: [a]) - = z ~ '[] => - SNil - | forall (m :: a) - (n :: [a]). z ~ (:) m n => - SCons (Sing m) (Sing n) diff --git a/testsuite/tests/ghc-api/annotations/Test11332.hs b/testsuite/tests/ghc-api/annotations/Test11332.hs deleted file mode 100644 index 41e84b0d39..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test11332.hs +++ /dev/null @@ -1,17 +0,0 @@ -{-# LANGUAGE PatternSynonyms #-} - -module Test11332 ( A(.., NoA), Q(F,..), G(T,..,U)) where - -data A = A | B - -pattern NoA = B - -data Q a = Q a - -pattern F a = Q a - -data G = G | H - -pattern T = G - -pattern U = H diff --git a/testsuite/tests/ghc-api/annotations/Test11430.hs b/testsuite/tests/ghc-api/annotations/Test11430.hs deleted file mode 100644 index 19b8e54ccd..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test11430.hs +++ /dev/null @@ -1,23 +0,0 @@ -module Test11430 where - - -infixl 0x1 `f` - -x `f` y = x - - -{-# SPECIALISE [~ 001] x :: - Integer -> Integer -> Integer, - Integer -> Int -> Integer, - Int -> Int -> Int #-} -{-# INLINABLE [1] x #-} -x :: (Num a, Integral b) => a -> b -> a -x = undefined - -{-# SPECIALISE INLINE [0x999] y :: - Integer -> Integer -> Integer, - Integer -> Int -> Integer, - Int -> Int -> Int #-} -{-# INLINABLE [1] y #-} -y :: (Num a, Integral b) => a -> b -> a -y = undefined diff --git a/testsuite/tests/ghc-api/annotations/Test12417.hs b/testsuite/tests/ghc-api/annotations/Test12417.hs deleted file mode 100644 index 67da7f2107..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test12417.hs +++ /dev/null @@ -1,19 +0,0 @@ -{-# LANGUAGE UnboxedSums, MagicHash #-} - -module Test12417 where - -import GHC.Prim -import GHC.Types - -import System.Mem (performMajorGC) - -type Either1 a b = (# a | b #) - -showEither1 :: (Show a, Show b) => Either1 a b -> String -showEither1 (# left | #) = "Left " ++ show left -showEither1 (# | right #) = "Right " ++ show right - -type T = (# Int | Bool | String | Char | Either Int Bool | Int# | Float# #) - -showEither4 :: T -> String -showEither4 (# | b | | | | | #) = "Alt1: " ++ show b diff --git a/testsuite/tests/ghc-api/annotations/Test13163.hs b/testsuite/tests/ghc-api/annotations/Test13163.hs deleted file mode 100644 index 439d825386..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test13163.hs +++ /dev/null @@ -1,16 +0,0 @@ -{-# LANGUAGE TypeOperators #-} -{-# LANGUAGE PatternSynonyms #-} -{-# LANGUAGE ExplicitNamespaces #-} -module T13163 - ( Record(..) - , type (?)(..) - , f, type (+), pattern Single - ) where - -import Data.Promotion.Prelude (type (:+$), type (:*$), type (:^$), type (:-$)) -import Options.Generic (Generic, ParseRecord, type (<?>)(..)) -import GHC.TypeLits - -pattern Single x = [x] - -f = undefined diff --git a/testsuite/tests/ghc-api/annotations/Test15303.hs b/testsuite/tests/ghc-api/annotations/Test15303.hs deleted file mode 100644 index 212e9da5ac..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test15303.hs +++ /dev/null @@ -1,6 +0,0 @@ -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE TypeOperators #-} - -(~#) :: Comonad w => CascadeW w (t ': ts) -> w t -> Last (t ': ts) -(~#) = cascadeW -infixr 0 ~# diff --git a/testsuite/tests/ghc-api/annotations/Test16212.hs b/testsuite/tests/ghc-api/annotations/Test16212.hs deleted file mode 100644 index da7e322307..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test16212.hs +++ /dev/null @@ -1,13 +0,0 @@ -module Test16212 where - -class LiftingMonad (trans :: MTrans) where - proof :: Monad m :- Monad (trans m) - -class LiftingMonad2 ((trans :: MTrans)) where - proof :: Monad m :- Monad (trans m) - -data Nat (t :: NatKind) where - ZeroNat :: Nat Zero - SuccNat :: Nat t -> Nat (Succ t) - -data Foo (a) b = Foo { av :: a, bv :: b } diff --git a/testsuite/tests/ghc-api/annotations/Test16230.hs b/testsuite/tests/ghc-api/annotations/Test16230.hs deleted file mode 100644 index e231878464..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test16230.hs +++ /dev/null @@ -1,23 +0,0 @@ -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE KindSignatures #-} -{-# LANGUAGE ExplicitForAll #-} -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE TypeApplications #-} -{-# LANGUAGE DataKinds #-} -module MoreExplicitForalls where - -import Data.Proxy - -data family F1 a -data instance forall (x :: Bool). F1 (Proxy x) = MkF - -class C a where - type F2 a b - -instance forall a. C [a] where - type forall b. F2 [a] b = Int - - -type family G a b where - forall x y. G [x] (Proxy y) = Double - forall z. G z z = Bool diff --git a/testsuite/tests/ghc-api/annotations/Test16236.hs b/testsuite/tests/ghc-api/annotations/Test16236.hs deleted file mode 100644 index e19a0ee0c1..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test16236.hs +++ /dev/null @@ -1,20 +0,0 @@ -{-# LANGUAGE DataKinds, PolyKinds, TypeOperators, TypeFamilies - , TypeApplications, TypeInType #-} - -module DumpParsedAst where -import Data.Kind - -data Peano = Zero | Succ Peano - -type family Length (as :: [k]) :: Peano where - Length (a : as) = Succ (Length as) - Length '[] = Zero - --- vis kind app -data T f (a :: k) = MkT (f a) - -type family F1 (a :: k) (f :: k -> Type) :: Type where - F1 @Peano a f = T @Peano f a - -data family DF3 (a :: k) -data instance DF3 @(K.Type -> K.Type) b = DF3Char diff --git a/testsuite/tests/ghc-api/annotations/Test16279.hs b/testsuite/tests/ghc-api/annotations/Test16279.hs deleted file mode 100644 index 7817edadc5..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test16279.hs +++ /dev/null @@ -1,10 +0,0 @@ -{-# LANGUAGE AlternativeLayoutRule #-} -{-# LANGUAGE LambdaCase #-} --- duplicate of T13087.hs - -isOne :: Int -> Bool -isOne = \case 1 -> True - _ -> False - -main = return () - diff --git a/testsuite/tests/ghc-api/annotations/Test17388.hs b/testsuite/tests/ghc-api/annotations/Test17388.hs deleted file mode 100644 index d5ead3d95e..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test17388.hs +++ /dev/null @@ -1,9 +0,0 @@ -{-# LANGUAGE PackageImports #-} - -module Test17388 where - -import "base" Prelude -import {-# Source #-} Foo.Bar - -import {-# SOURCE #-} "base" Data.Data -import {-# SOURCE #-} qualified "base" Data.Data diff --git a/testsuite/tests/ghc-api/annotations/Test17519.hs b/testsuite/tests/ghc-api/annotations/Test17519.hs deleted file mode 100644 index f705008c51..0000000000 --- a/testsuite/tests/ghc-api/annotations/Test17519.hs +++ /dev/null @@ -1,6 +0,0 @@ -{-# LANGUAGE RankNTypes #-} -{-# LANGUAGE UnicodeSyntax #-} -module Test17519 where - -type family Proxy2' ∷ ∀ k → k → Type where - Proxy2' = Proxy' diff --git a/testsuite/tests/ghc-api/annotations/TestBoolFormula.hs b/testsuite/tests/ghc-api/annotations/TestBoolFormula.hs deleted file mode 100644 index e76ce40fe5..0000000000 --- a/testsuite/tests/ghc-api/annotations/TestBoolFormula.hs +++ /dev/null @@ -1,36 +0,0 @@ -module TestBoolFormula where - -class ManyOps a where - aOp :: a -> a -> Bool - aOp = undefined - bOp :: a -> a -> Bool - bOp = undefined - cOp :: a -> a -> Bool - cOp = undefined - dOp :: a -> a -> Bool - dOp = undefined - eOp :: a -> a -> Bool - eOp = undefined - fOp :: a -> a -> Bool - fOp = undefined - {-# MINIMAL ( aOp) - | ( bOp , cOp) - | ((dOp | eOp) , fOp) - #-} - -class Foo a where - bar :: a -> a -> Bool - foo :: a -> a -> Bool - baq :: a -> a -> Bool - baq = undefined - baz :: a -> a -> Bool - baz = undefined - quux :: a -> a -> Bool - quux = undefined - {-# MINIMAL bar, (foo, baq | foo, quux) #-} - -instance Foo Int where - bar = undefined - baz = undefined - quux = undefined - foo = undefined diff --git a/testsuite/tests/ghc-api/annotations/all.T b/testsuite/tests/ghc-api/annotations/all.T index ce95f40be2..25b3abb4b4 100644 --- a/testsuite/tests/ghc-api/annotations/all.T +++ b/testsuite/tests/ghc-api/annotations/all.T @@ -1,78 +1,3 @@ -test('annotations', [extra_files(['AnnotationLet.hs']), - normalise_slashes, - ignore_stderr], makefile_test, ['annotations']) -test('parseTree', [extra_files(['AnnotationTuple.hs']), - normalise_slashes, - ignore_stderr], makefile_test, ['parseTree']) test('comments', [extra_files(['CommentsTest.hs']), ignore_stderr], makefile_test, ['comments']) -test('exampleTest', [extra_files(['AnnotationTuple.hs']), - ignore_stderr], makefile_test, ['exampleTest']) -test('listcomps', [extra_files(['ListComprehensions.hs']), - normalise_slashes, - ignore_stderr], makefile_test, ['listcomps']) -test('T10255', [extra_files(['Test10255.hs']), - ignore_stderr], makefile_test, ['T10255']) -test('T10268', [extra_files(['Test10268.hs']), - ignore_stderr], makefile_test, ['T10268']) -test('T10269', [extra_files(['Test10269.hs']), - ignore_stderr], makefile_test, ['T10269']) -test('T10280', [extra_files(['Test10280.hs']), - ignore_stderr], makefile_test, ['T10280']) -test('T10312', [extra_files(['Test10312.hs']), - ignore_stderr], makefile_test, ['T10312']) -test('T10307', [extra_files(['Test10307.hs']), - ignore_stderr], makefile_test, ['T10307']) -test('T10309', [extra_files(['Test10309.hs']), - ignore_stderr], makefile_test, ['T10309']) -test('boolFormula', [extra_files(['TestBoolFormula.hs']), - ignore_stderr], makefile_test, ['boolFormula']) -test('T10357', [extra_files(['Test10357.hs']), - ignore_stderr], makefile_test, ['T10357']) -test('T10358', [extra_files(['Test10358.hs']), - ignore_stderr], makefile_test, ['T10358']) -test('T10278', [extra_files(['Test10278.hs']), - ignore_stderr], makefile_test, ['T10278']) -test('T10354', [extra_files(['Test10354.hs']), - ignore_stderr], makefile_test, ['T10354']) -test('T10396', [extra_files(['Test10396.hs']), - ignore_stderr], makefile_test, ['T10396']) -test('T10399', [extra_files(['Test10399.hs']), - ignore_stderr], makefile_test, ['T10399']) -test('T10313', [extra_files(['Test10313.hs', 'stringSource.hs']), - ignore_stderr], makefile_test, ['T10313']) -test('T11018', [extra_files(['Test11018.hs']), - ignore_stderr], makefile_test, ['T11018']) -test('bundle-export', [extra_files(['BundleExport.hs']), - ignore_stderr], makefile_test, ['bundle-export']) -test('T10276', [extra_files(['Test10276.hs']), - ignore_stderr], makefile_test, ['T10276']) -test('T10598', [extra_files(['Test10598.hs']), - ignore_stderr], makefile_test, ['T10598']) -test('T11321', [extra_files(['Test11321.hs']), - ignore_stderr], makefile_test, ['T11321']) -test('T11332', [extra_files(['Test11332.hs']), - ignore_stderr], makefile_test, ['T11332']) -test('T11430', [extra_files(['Test11430.hs', 't11430.hs']), - ignore_stderr], makefile_test, ['T11430']) -test('load-main', ignore_stderr, makefile_test, ['load-main']) -test('T12417', [extra_files(['Test12417.hs']), - ignore_stderr], makefile_test, ['T12417']) -test('T13163', [extra_files(['Test13163.hs']), - ignore_stderr], makefile_test, ['T13163']) -test('T15303', [extra_files(['Test15303.hs']), - ignore_stderr], makefile_test, ['T15303']) -test('T16212', [extra_files(['Test16212.hs']), - ignore_stderr], makefile_test, ['T16212']) -test('T16230', [extra_files(['Test16230.hs']), - ignore_stderr], makefile_test, ['T16230']) -test('T16236', [extra_files(['Test16236.hs']), - ignore_stderr], makefile_test, ['T16236']) -test('StarBinderAnns', [extra_files(['StarBinderAnns.hs']), - ignore_stderr], makefile_test, ['StarBinderAnns']) -test('T16279', [extra_files(['Test16279.hs']), - ignore_stderr], makefile_test, ['T16279']) -test('T17388', [extra_files(['Test17388.hs']), - ignore_stderr], makefile_test, ['T17388']) -test('T17519', [extra_files(['Test17519.hs']), - ignore_stderr], makefile_test, ['T17519']) +test('InTreeAnnotations1',normal, compile, ['-dsuppress-uniques -ddump-parsed-ast']) diff --git a/testsuite/tests/ghc-api/annotations/annotations.hs b/testsuite/tests/ghc-api/annotations/annotations.hs deleted file mode 100644 index 933170deb2..0000000000 --- a/testsuite/tests/ghc-api/annotations/annotations.hs +++ /dev/null @@ -1,62 +0,0 @@ -{-# LANGUAGE RankNTypes #-} - --- This program must be called with GHC's libdir as the single command line --- argument. -module Main where - --- import Data.Generics -import Data.Data -import Data.List (intercalate) -import System.IO -import GHC -import GHC.Driver.Session -import GHC.Driver.Ppr -import GHC.Utils.Monad -import GHC.Utils.Outputable -import GHC.Data.Bag (filterBag,isEmptyBag) -import System.Directory (removeFile) -import System.Environment( getArgs ) -import qualified Data.Map as Map -import Data.Dynamic ( fromDynamic,Dynamic ) - -main::IO() -main = do - [libdir] <- getArgs - testOneFile libdir "AnnotationLet" - -testOneFile libdir fileName = do - p <- runGhc (Just libdir) $ do - dflags <- getSessionDynFlags - setSessionDynFlags dflags - let mn =mkModuleName fileName - addTarget Target { targetId = TargetModule mn - , targetAllowObjCode = True - , targetContents = Nothing } - load LoadAllTargets - modSum <- getModSummary mn - p <- parseModule modSum - t <- typecheckModule p - d <- desugarModule t - l <- loadModule d - let ts=typecheckedSource l - r =renamedSource l - -- liftIO (putStr (showSDocDebug (ppr ts))) - return (pm_annotations p) - - let anns = p - ann_items = apiAnnItems anns - ann_eof = apiAnnEofPos anns - (l,_) = fst $ head $ Map.toList ann_items - annModule = getAnnotation anns l AnnModule - annLet = getAnnotation anns l AnnLet - - putStrLn (intercalate "\n" [showAnns ann_items,pp annModule,pp annLet,pp l, - "EOF: " ++ show ann_eof]) - -showAnns anns = "[\n" ++ (intercalate "\n" - $ map (\((s,k),v) - -> ("(AK " ++ pp s ++ " " ++ show k ++" = " ++ pp v ++ ")\n")) - $ Map.toList anns) - ++ "]\n" - -pp a = showPprUnsafe a diff --git a/testsuite/tests/ghc-api/annotations/annotations.stdout b/testsuite/tests/ghc-api/annotations/annotations.stdout deleted file mode 100644 index fbc028a56f..0000000000 --- a/testsuite/tests/ghc-api/annotations/annotations.stdout +++ /dev/null @@ -1,86 +0,0 @@ -[ -(AK AnnotationLet.hs:1:1 AnnCloseC = [AnnotationLet.hs:17:1]) - -(AK AnnotationLet.hs:1:1 AnnModule = [AnnotationLet.hs:2:1-6]) - -(AK AnnotationLet.hs:1:1 AnnOpenC = [AnnotationLet.hs:4:1]) - -(AK AnnotationLet.hs:1:1 AnnWhere = [AnnotationLet.hs:2:28-32]) - -(AK AnnotationLet.hs:2:22-26 AnnCloseP = [AnnotationLet.hs:2:26]) - -(AK AnnotationLet.hs:2:22-26 AnnOpenP = [AnnotationLet.hs:2:22]) - -(AK AnnotationLet.hs:5:1-32 AnnAs = [AnnotationLet.hs:5:28-29]) - -(AK AnnotationLet.hs:5:1-32 AnnImport = [AnnotationLet.hs:5:1-6]) - -(AK AnnotationLet.hs:5:1-32 AnnQualified = [AnnotationLet.hs:5:8-16]) - -(AK AnnotationLet.hs:5:1-32 AnnSemi = [AnnotationLet.hs:6:1]) - -(AK AnnotationLet.hs:(7,1)-(11,12) AnnEqual = [AnnotationLet.hs:7:5]) - -(AK AnnotationLet.hs:(7,1)-(11,12) AnnFunId = [AnnotationLet.hs:7:1-3]) - -(AK AnnotationLet.hs:(7,1)-(11,12) AnnSemi = [AnnotationLet.hs:12:1]) - -(AK AnnotationLet.hs:(7,7)-(11,12) AnnIn = [AnnotationLet.hs:11:7-8]) - -(AK AnnotationLet.hs:(7,7)-(11,12) AnnLet = [AnnotationLet.hs:7:7-9]) - -(AK AnnotationLet.hs:8:9-15 AnnEqual = [AnnotationLet.hs:8:13]) - -(AK AnnotationLet.hs:8:9-15 AnnFunId = [AnnotationLet.hs:8:9]) - -(AK AnnotationLet.hs:8:9-15 AnnSemi = [AnnotationLet.hs:9:9]) - -(AK AnnotationLet.hs:9:9-15 AnnEqual = [AnnotationLet.hs:9:13]) - -(AK AnnotationLet.hs:9:9-15 AnnFunId = [AnnotationLet.hs:9:9]) - -(AK AnnotationLet.hs:9:9-15 AnnSemi = [AnnotationLet.hs:10:9]) - -(AK AnnotationLet.hs:10:9-13 AnnEqual = [AnnotationLet.hs:10:11]) - -(AK AnnotationLet.hs:10:9-13 AnnFunId = [AnnotationLet.hs:10:9]) - -(AK AnnotationLet.hs:13:1-10 AnnInfix = [AnnotationLet.hs:13:1-6]) - -(AK AnnotationLet.hs:13:1-10 AnnSemi = [AnnotationLet.hs:14:1]) - -(AK AnnotationLet.hs:13:1-10 AnnVal = [AnnotationLet.hs:13:8]) - -(AK AnnotationLet.hs:15:1-40 AnnCloseP = [AnnotationLet.hs:15:14, AnnotationLet.hs:15:13]) - -(AK AnnotationLet.hs:15:1-40 AnnData = [AnnotationLet.hs:15:1-4]) - -(AK AnnotationLet.hs:15:1-40 AnnEqual = [AnnotationLet.hs:15:18]) - -(AK AnnotationLet.hs:15:1-40 AnnOpenP = [AnnotationLet.hs:15:6, AnnotationLet.hs:15:7]) - -(AK AnnotationLet.hs:15:1-40 AnnSemi = [AnnotationLet.hs:16:1]) - -(AK AnnotationLet.hs:15:6-14 AnnCloseP = [AnnotationLet.hs:15:14]) - -(AK AnnotationLet.hs:15:6-14 AnnOpenP = [AnnotationLet.hs:15:6]) - -(AK AnnotationLet.hs:15:7-13 AnnCloseP = [AnnotationLet.hs:15:13]) - -(AK AnnotationLet.hs:15:7-13 AnnOpenP = [AnnotationLet.hs:15:7]) - -(AK AnnotationLet.hs:15:20-28 AnnVbar = [AnnotationLet.hs:15:30]) - -(AK AnnotationLet.hs:15:24-28 AnnCloseP = [AnnotationLet.hs:15:28]) - -(AK AnnotationLet.hs:15:24-28 AnnOpenP = [AnnotationLet.hs:15:24]) - -(AK AnnotationLet.hs:15:36-40 AnnCloseP = [AnnotationLet.hs:15:40]) - -(AK AnnotationLet.hs:15:36-40 AnnOpenP = [AnnotationLet.hs:15:36]) -] - -[AnnotationLet.hs:2:1-6] -[] -AnnotationLet.hs:1:1 -EOF: Just SrcSpanPoint "./AnnotationLet.hs" 18 1 diff --git a/testsuite/tests/ghc-api/annotations/annotations.stdout-mingw32 b/testsuite/tests/ghc-api/annotations/annotations.stdout-mingw32 deleted file mode 100644 index 56f11f7f65..0000000000 --- a/testsuite/tests/ghc-api/annotations/annotations.stdout-mingw32 +++ /dev/null @@ -1,86 +0,0 @@ -[ -(AK AnnotationLet.hs:1:1 AnnCloseC = [AnnotationLet.hs:17:1]) - -(AK AnnotationLet.hs:1:1 AnnModule = [AnnotationLet.hs:2:1-6]) - -(AK AnnotationLet.hs:1:1 AnnOpenC = [AnnotationLet.hs:4:1]) - -(AK AnnotationLet.hs:1:1 AnnWhere = [AnnotationLet.hs:2:28-32]) - -(AK AnnotationLet.hs:2:22-26 AnnCloseP = [AnnotationLet.hs:2:26]) - -(AK AnnotationLet.hs:2:22-26 AnnOpenP = [AnnotationLet.hs:2:22]) - -(AK AnnotationLet.hs:5:1-32 AnnAs = [AnnotationLet.hs:5:28-29]) - -(AK AnnotationLet.hs:5:1-32 AnnImport = [AnnotationLet.hs:5:1-6]) - -(AK AnnotationLet.hs:5:1-32 AnnQualified = [AnnotationLet.hs:5:8-16]) - -(AK AnnotationLet.hs:5:1-32 AnnSemi = [AnnotationLet.hs:6:1]) - -(AK AnnotationLet.hs:(7,1)-(11,12) AnnEqual = [AnnotationLet.hs:7:5]) - -(AK AnnotationLet.hs:(7,1)-(11,12) AnnFunId = [AnnotationLet.hs:7:1-3]) - -(AK AnnotationLet.hs:(7,1)-(11,12) AnnSemi = [AnnotationLet.hs:12:1]) - -(AK AnnotationLet.hs:(7,7)-(11,12) AnnIn = [AnnotationLet.hs:11:7-8]) - -(AK AnnotationLet.hs:(7,7)-(11,12) AnnLet = [AnnotationLet.hs:7:7-9]) - -(AK AnnotationLet.hs:8:9-15 AnnEqual = [AnnotationLet.hs:8:13]) - -(AK AnnotationLet.hs:8:9-15 AnnFunId = [AnnotationLet.hs:8:9]) - -(AK AnnotationLet.hs:8:9-15 AnnSemi = [AnnotationLet.hs:9:9]) - -(AK AnnotationLet.hs:9:9-15 AnnEqual = [AnnotationLet.hs:9:13]) - -(AK AnnotationLet.hs:9:9-15 AnnFunId = [AnnotationLet.hs:9:9]) - -(AK AnnotationLet.hs:9:9-15 AnnSemi = [AnnotationLet.hs:10:9]) - -(AK AnnotationLet.hs:10:9-13 AnnEqual = [AnnotationLet.hs:10:11]) - -(AK AnnotationLet.hs:10:9-13 AnnFunId = [AnnotationLet.hs:10:9]) - -(AK AnnotationLet.hs:13:1-10 AnnInfix = [AnnotationLet.hs:13:1-6]) - -(AK AnnotationLet.hs:13:1-10 AnnSemi = [AnnotationLet.hs:14:1]) - -(AK AnnotationLet.hs:13:1-10 AnnVal = [AnnotationLet.hs:13:8]) - -(AK AnnotationLet.hs:15:1-40 AnnCloseP = [AnnotationLet.hs:15:14, AnnotationLet.hs:15:13]) - -(AK AnnotationLet.hs:15:1-40 AnnData = [AnnotationLet.hs:15:1-4]) - -(AK AnnotationLet.hs:15:1-40 AnnEqual = [AnnotationLet.hs:15:18]) - -(AK AnnotationLet.hs:15:1-40 AnnOpenP = [AnnotationLet.hs:15:6, AnnotationLet.hs:15:7]) - -(AK AnnotationLet.hs:15:1-40 AnnSemi = [AnnotationLet.hs:16:1]) - -(AK AnnotationLet.hs:15:6-14 AnnCloseP = [AnnotationLet.hs:15:14]) - -(AK AnnotationLet.hs:15:6-14 AnnOpenP = [AnnotationLet.hs:15:6]) - -(AK AnnotationLet.hs:15:7-13 AnnCloseP = [AnnotationLet.hs:15:13]) - -(AK AnnotationLet.hs:15:7-13 AnnOpenP = [AnnotationLet.hs:15:7]) - -(AK AnnotationLet.hs:15:20-28 AnnVbar = [AnnotationLet.hs:15:30]) - -(AK AnnotationLet.hs:15:24-28 AnnCloseP = [AnnotationLet.hs:15:28]) - -(AK AnnotationLet.hs:15:24-28 AnnOpenP = [AnnotationLet.hs:15:24]) - -(AK AnnotationLet.hs:15:36-40 AnnCloseP = [AnnotationLet.hs:15:40]) - -(AK AnnotationLet.hs:15:36-40 AnnOpenP = [AnnotationLet.hs:15:36]) -] - -[AnnotationLet.hs:2:1-6] -[] -AnnotationLet.hs:1:1 -EOF: Just SrcSpanPoint ".\\AnnotationLet.hs" 18 1 diff --git a/testsuite/tests/ghc-api/annotations/boolFormula.stdout b/testsuite/tests/ghc-api/annotations/boolFormula.stdout deleted file mode 100644 index 3c425811b4..0000000000 --- a/testsuite/tests/ghc-api/annotations/boolFormula.stdout +++ /dev/null @@ -1,153 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((TestBoolFormula.hs:1:1,AnnModule), [TestBoolFormula.hs:1:1-6]), -((TestBoolFormula.hs:1:1,AnnWhere), [TestBoolFormula.hs:1:24-28]), -((TestBoolFormula.hs:(3,1)-(19,9),AnnClass), [TestBoolFormula.hs:3:1-5]), -((TestBoolFormula.hs:(3,1)-(19,9),AnnSemi), [TestBoolFormula.hs:21:1]), -((TestBoolFormula.hs:(3,1)-(19,9),AnnWhere), [TestBoolFormula.hs:3:17-21]), -((TestBoolFormula.hs:4:5-25,AnnDcolon), [TestBoolFormula.hs:4:9-10]), -((TestBoolFormula.hs:4:5-25,AnnSemi), [TestBoolFormula.hs:5:5]), -((TestBoolFormula.hs:4:12,AnnRarrow), [TestBoolFormula.hs:4:14-15]), -((TestBoolFormula.hs:4:12-25,AnnRarrow), [TestBoolFormula.hs:4:14-15]), -((TestBoolFormula.hs:4:17,AnnRarrow), [TestBoolFormula.hs:4:19-20]), -((TestBoolFormula.hs:4:17-25,AnnRarrow), [TestBoolFormula.hs:4:19-20]), -((TestBoolFormula.hs:5:5-19,AnnEqual), [TestBoolFormula.hs:5:9]), -((TestBoolFormula.hs:5:5-19,AnnFunId), [TestBoolFormula.hs:5:5-7]), -((TestBoolFormula.hs:5:5-19,AnnSemi), [TestBoolFormula.hs:6:5]), -((TestBoolFormula.hs:6:5-25,AnnDcolon), [TestBoolFormula.hs:6:9-10]), -((TestBoolFormula.hs:6:5-25,AnnSemi), [TestBoolFormula.hs:7:5]), -((TestBoolFormula.hs:6:12,AnnRarrow), [TestBoolFormula.hs:6:14-15]), -((TestBoolFormula.hs:6:12-25,AnnRarrow), [TestBoolFormula.hs:6:14-15]), -((TestBoolFormula.hs:6:17,AnnRarrow), [TestBoolFormula.hs:6:19-20]), -((TestBoolFormula.hs:6:17-25,AnnRarrow), [TestBoolFormula.hs:6:19-20]), -((TestBoolFormula.hs:7:5-19,AnnEqual), [TestBoolFormula.hs:7:9]), -((TestBoolFormula.hs:7:5-19,AnnFunId), [TestBoolFormula.hs:7:5-7]), -((TestBoolFormula.hs:7:5-19,AnnSemi), [TestBoolFormula.hs:8:5]), -((TestBoolFormula.hs:8:5-25,AnnDcolon), [TestBoolFormula.hs:8:9-10]), -((TestBoolFormula.hs:8:5-25,AnnSemi), [TestBoolFormula.hs:9:5]), -((TestBoolFormula.hs:8:12,AnnRarrow), [TestBoolFormula.hs:8:14-15]), -((TestBoolFormula.hs:8:12-25,AnnRarrow), [TestBoolFormula.hs:8:14-15]), -((TestBoolFormula.hs:8:17,AnnRarrow), [TestBoolFormula.hs:8:19-20]), -((TestBoolFormula.hs:8:17-25,AnnRarrow), [TestBoolFormula.hs:8:19-20]), -((TestBoolFormula.hs:9:5-19,AnnEqual), [TestBoolFormula.hs:9:9]), -((TestBoolFormula.hs:9:5-19,AnnFunId), [TestBoolFormula.hs:9:5-7]), -((TestBoolFormula.hs:9:5-19,AnnSemi), [TestBoolFormula.hs:10:5]), -((TestBoolFormula.hs:10:5-25,AnnDcolon), [TestBoolFormula.hs:10:9-10]), -((TestBoolFormula.hs:10:5-25,AnnSemi), [TestBoolFormula.hs:11:5]), -((TestBoolFormula.hs:10:12,AnnRarrow), [TestBoolFormula.hs:10:14-15]), -((TestBoolFormula.hs:10:12-25,AnnRarrow), [TestBoolFormula.hs:10:14-15]), -((TestBoolFormula.hs:10:17,AnnRarrow), [TestBoolFormula.hs:10:19-20]), -((TestBoolFormula.hs:10:17-25,AnnRarrow), [TestBoolFormula.hs:10:19-20]), -((TestBoolFormula.hs:11:5-19,AnnEqual), [TestBoolFormula.hs:11:9]), -((TestBoolFormula.hs:11:5-19,AnnFunId), [TestBoolFormula.hs:11:5-7]), -((TestBoolFormula.hs:11:5-19,AnnSemi), [TestBoolFormula.hs:12:5]), -((TestBoolFormula.hs:12:5-25,AnnDcolon), [TestBoolFormula.hs:12:9-10]), -((TestBoolFormula.hs:12:5-25,AnnSemi), [TestBoolFormula.hs:13:5]), -((TestBoolFormula.hs:12:12,AnnRarrow), [TestBoolFormula.hs:12:14-15]), -((TestBoolFormula.hs:12:12-25,AnnRarrow), [TestBoolFormula.hs:12:14-15]), -((TestBoolFormula.hs:12:17,AnnRarrow), [TestBoolFormula.hs:12:19-20]), -((TestBoolFormula.hs:12:17-25,AnnRarrow), [TestBoolFormula.hs:12:19-20]), -((TestBoolFormula.hs:13:5-19,AnnEqual), [TestBoolFormula.hs:13:9]), -((TestBoolFormula.hs:13:5-19,AnnFunId), [TestBoolFormula.hs:13:5-7]), -((TestBoolFormula.hs:13:5-19,AnnSemi), [TestBoolFormula.hs:14:5]), -((TestBoolFormula.hs:14:5-25,AnnDcolon), [TestBoolFormula.hs:14:9-10]), -((TestBoolFormula.hs:14:5-25,AnnSemi), [TestBoolFormula.hs:15:5]), -((TestBoolFormula.hs:14:12,AnnRarrow), [TestBoolFormula.hs:14:14-15]), -((TestBoolFormula.hs:14:12-25,AnnRarrow), [TestBoolFormula.hs:14:14-15]), -((TestBoolFormula.hs:14:17,AnnRarrow), [TestBoolFormula.hs:14:19-20]), -((TestBoolFormula.hs:14:17-25,AnnRarrow), [TestBoolFormula.hs:14:19-20]), -((TestBoolFormula.hs:15:5-19,AnnEqual), [TestBoolFormula.hs:15:9]), -((TestBoolFormula.hs:15:5-19,AnnFunId), [TestBoolFormula.hs:15:5-7]), -((TestBoolFormula.hs:15:5-19,AnnSemi), [TestBoolFormula.hs:16:5]), -((TestBoolFormula.hs:(16,5)-(19,9),AnnClose), [TestBoolFormula.hs:19:7-9]), -((TestBoolFormula.hs:(16,5)-(19,9),AnnOpen), [TestBoolFormula.hs:16:5-15]), -((TestBoolFormula.hs:16:18-23,AnnCloseP), [TestBoolFormula.hs:16:23]), -((TestBoolFormula.hs:16:18-23,AnnOpenP), [TestBoolFormula.hs:16:18]), -((TestBoolFormula.hs:16:18-23,AnnVbar), [TestBoolFormula.hs:17:16]), -((TestBoolFormula.hs:17:18-31,AnnCloseP), [TestBoolFormula.hs:17:31]), -((TestBoolFormula.hs:17:18-31,AnnOpenP), [TestBoolFormula.hs:17:18]), -((TestBoolFormula.hs:17:18-31,AnnVbar), [TestBoolFormula.hs:18:16]), -((TestBoolFormula.hs:17:20-22,AnnComma), [TestBoolFormula.hs:17:26]), -((TestBoolFormula.hs:18:18-38,AnnCloseP), [TestBoolFormula.hs:18:38]), -((TestBoolFormula.hs:18:18-38,AnnOpenP), [TestBoolFormula.hs:18:18]), -((TestBoolFormula.hs:18:19-31,AnnCloseP), [TestBoolFormula.hs:18:31]), -((TestBoolFormula.hs:18:19-31,AnnComma), [TestBoolFormula.hs:18:33]), -((TestBoolFormula.hs:18:19-31,AnnOpenP), [TestBoolFormula.hs:18:19]), -((TestBoolFormula.hs:18:20-22,AnnVbar), [TestBoolFormula.hs:18:25]), -((TestBoolFormula.hs:(21,1)-(30,47),AnnClass), [TestBoolFormula.hs:21:1-5]), -((TestBoolFormula.hs:(21,1)-(30,47),AnnSemi), [TestBoolFormula.hs:32:1]), -((TestBoolFormula.hs:(21,1)-(30,47),AnnWhere), [TestBoolFormula.hs:21:13-17]), -((TestBoolFormula.hs:22:5-25,AnnDcolon), [TestBoolFormula.hs:22:9-10]), -((TestBoolFormula.hs:22:5-25,AnnSemi), [TestBoolFormula.hs:23:5]), -((TestBoolFormula.hs:22:12,AnnRarrow), [TestBoolFormula.hs:22:14-15]), -((TestBoolFormula.hs:22:12-25,AnnRarrow), [TestBoolFormula.hs:22:14-15]), -((TestBoolFormula.hs:22:17,AnnRarrow), [TestBoolFormula.hs:22:19-20]), -((TestBoolFormula.hs:22:17-25,AnnRarrow), [TestBoolFormula.hs:22:19-20]), -((TestBoolFormula.hs:23:5-25,AnnDcolon), [TestBoolFormula.hs:23:9-10]), -((TestBoolFormula.hs:23:5-25,AnnSemi), [TestBoolFormula.hs:24:5]), -((TestBoolFormula.hs:23:12,AnnRarrow), [TestBoolFormula.hs:23:14-15]), -((TestBoolFormula.hs:23:12-25,AnnRarrow), [TestBoolFormula.hs:23:14-15]), -((TestBoolFormula.hs:23:17,AnnRarrow), [TestBoolFormula.hs:23:19-20]), -((TestBoolFormula.hs:23:17-25,AnnRarrow), [TestBoolFormula.hs:23:19-20]), -((TestBoolFormula.hs:24:5-25,AnnDcolon), [TestBoolFormula.hs:24:9-10]), -((TestBoolFormula.hs:24:5-25,AnnSemi), [TestBoolFormula.hs:25:5]), -((TestBoolFormula.hs:24:12,AnnRarrow), [TestBoolFormula.hs:24:14-15]), -((TestBoolFormula.hs:24:12-25,AnnRarrow), [TestBoolFormula.hs:24:14-15]), -((TestBoolFormula.hs:24:17,AnnRarrow), [TestBoolFormula.hs:24:19-20]), -((TestBoolFormula.hs:24:17-25,AnnRarrow), [TestBoolFormula.hs:24:19-20]), -((TestBoolFormula.hs:25:5-19,AnnEqual), [TestBoolFormula.hs:25:9]), -((TestBoolFormula.hs:25:5-19,AnnFunId), [TestBoolFormula.hs:25:5-7]), -((TestBoolFormula.hs:25:5-19,AnnSemi), [TestBoolFormula.hs:26:5]), -((TestBoolFormula.hs:26:5-25,AnnDcolon), [TestBoolFormula.hs:26:9-10]), -((TestBoolFormula.hs:26:5-25,AnnSemi), [TestBoolFormula.hs:27:5]), -((TestBoolFormula.hs:26:12,AnnRarrow), [TestBoolFormula.hs:26:14-15]), -((TestBoolFormula.hs:26:12-25,AnnRarrow), [TestBoolFormula.hs:26:14-15]), -((TestBoolFormula.hs:26:17,AnnRarrow), [TestBoolFormula.hs:26:19-20]), -((TestBoolFormula.hs:26:17-25,AnnRarrow), [TestBoolFormula.hs:26:19-20]), -((TestBoolFormula.hs:27:5-19,AnnEqual), [TestBoolFormula.hs:27:9]), -((TestBoolFormula.hs:27:5-19,AnnFunId), [TestBoolFormula.hs:27:5-7]), -((TestBoolFormula.hs:27:5-19,AnnSemi), [TestBoolFormula.hs:28:5]), -((TestBoolFormula.hs:28:5-26,AnnDcolon), [TestBoolFormula.hs:28:10-11]), -((TestBoolFormula.hs:28:5-26,AnnSemi), [TestBoolFormula.hs:29:5]), -((TestBoolFormula.hs:28:13,AnnRarrow), [TestBoolFormula.hs:28:15-16]), -((TestBoolFormula.hs:28:13-26,AnnRarrow), [TestBoolFormula.hs:28:15-16]), -((TestBoolFormula.hs:28:18,AnnRarrow), [TestBoolFormula.hs:28:20-21]), -((TestBoolFormula.hs:28:18-26,AnnRarrow), [TestBoolFormula.hs:28:20-21]), -((TestBoolFormula.hs:29:5-20,AnnEqual), [TestBoolFormula.hs:29:10]), -((TestBoolFormula.hs:29:5-20,AnnFunId), [TestBoolFormula.hs:29:5-8]), -((TestBoolFormula.hs:29:5-20,AnnSemi), [TestBoolFormula.hs:30:5]), -((TestBoolFormula.hs:30:5-47,AnnClose), [TestBoolFormula.hs:30:45-47]), -((TestBoolFormula.hs:30:5-47,AnnOpen), [TestBoolFormula.hs:30:5-15]), -((TestBoolFormula.hs:30:17-19,AnnComma), [TestBoolFormula.hs:30:20]), -((TestBoolFormula.hs:30:22-43,AnnCloseP), [TestBoolFormula.hs:30:43]), -((TestBoolFormula.hs:30:22-43,AnnOpenP), [TestBoolFormula.hs:30:22]), -((TestBoolFormula.hs:30:23-25,AnnComma), [TestBoolFormula.hs:30:26]), -((TestBoolFormula.hs:30:23-30,AnnVbar), [TestBoolFormula.hs:30:32]), -((TestBoolFormula.hs:30:34-36,AnnComma), [TestBoolFormula.hs:30:37]), -((TestBoolFormula.hs:(32,1)-(36,19),AnnInstance), [TestBoolFormula.hs:32:1-8]), -((TestBoolFormula.hs:(32,1)-(36,19),AnnSemi), [TestBoolFormula.hs:37:1]), -((TestBoolFormula.hs:(32,1)-(36,19),AnnWhere), [TestBoolFormula.hs:32:18-22]), -((TestBoolFormula.hs:33:5-19,AnnEqual), [TestBoolFormula.hs:33:9]), -((TestBoolFormula.hs:33:5-19,AnnFunId), [TestBoolFormula.hs:33:5-7]), -((TestBoolFormula.hs:33:5-19,AnnSemi), [TestBoolFormula.hs:34:5]), -((TestBoolFormula.hs:34:5-19,AnnEqual), [TestBoolFormula.hs:34:9]), -((TestBoolFormula.hs:34:5-19,AnnFunId), [TestBoolFormula.hs:34:5-7]), -((TestBoolFormula.hs:34:5-19,AnnSemi), [TestBoolFormula.hs:35:5]), -((TestBoolFormula.hs:35:5-20,AnnEqual), [TestBoolFormula.hs:35:10]), -((TestBoolFormula.hs:35:5-20,AnnFunId), [TestBoolFormula.hs:35:5-8]), -((TestBoolFormula.hs:35:5-20,AnnSemi), [TestBoolFormula.hs:36:5]), -((TestBoolFormula.hs:36:5-19,AnnEqual), [TestBoolFormula.hs:36:9]), -((TestBoolFormula.hs:36:5-19,AnnFunId), [TestBoolFormula.hs:36:5-7]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "TestBoolFormula.hs" 37 1 diff --git a/testsuite/tests/ghc-api/annotations/comments.hs b/testsuite/tests/ghc-api/annotations/comments.hs index 8497c87eda..d8c68594d0 100644 --- a/testsuite/tests/ghc-api/annotations/comments.hs +++ b/testsuite/tests/ghc-api/annotations/comments.hs @@ -50,7 +50,8 @@ testOneFile libdir fileName useHaddock = do return (pm_annotations p) let anns = p - ann_comments = apiAnnComments anns + -- ann_comments = apiAnnComments anns + ann_comments = Map.empty ann_rcomments = apiAnnRogueComments anns comments = map (\(s,v) -> (RealSrcSpan s Nothing, v)) (Map.toList ann_comments) diff --git a/testsuite/tests/ghc-api/annotations/comments.stdout b/testsuite/tests/ghc-api/annotations/comments.stdout index e5ff216fb0..1b7ed7061a 100644 --- a/testsuite/tests/ghc-api/annotations/comments.stdout +++ b/testsuite/tests/ghc-api/annotations/comments.stdout @@ -1,24 +1,17 @@ [ -( CommentsTest.hs:(12,7)-(15,14) = -[(CommentsTest.hs:14:15-24,AnnLineComment "-- value 2")]) - ( <no location info> = -[(CommentsTest.hs:11:1-33,AnnDocCommentNext " The function @foo@ does blah"), +[(Anchor CommentsTest.hs:11:1-33 UnchangedAnchor,AnnComment {ac_tok = AnnDocCommentNext " The function @foo@ does blah", ac_prior_tok = SrcSpanOneLine "./CommentsTest.hs" 9 31 33}), -(CommentsTest.hs:(3,1)-(7,2),AnnBlockComment "{-\nAn opening comment\n {- with a nested one -}\n {-# nested PRAGMA #-}\n-}"), +(Anchor CommentsTest.hs:(3,1)-(7,2) UnchangedAnchor,AnnComment {ac_tok = AnnBlockComment "{-\nAn opening comment\n {- with a nested one -}\n {-# nested PRAGMA #-}\n-}", ac_prior_tok = SrcSpanOneLine "./CommentsTest.hs" 2 27 32}), -(CommentsTest.hs:1:1-31,AnnBlockComment "{-# LANGUAGE DeriveFoldable #-}")]) +(Anchor CommentsTest.hs:1:1-31 UnchangedAnchor,AnnComment {ac_tok = AnnBlockComment "{-# LANGUAGE DeriveFoldable #-}", ac_prior_tok = SrcSpanPoint "./CommentsTest.hs" 1 1})]) ] [ -( CommentsTest.hs:(12,7)-(15,14) = -[(CommentsTest.hs:14:15-24,AnnLineComment "-- value 2")]) - ( <no location info> = -[(CommentsTest.hs:11:1-33,AnnLineComment "-- | The function @foo@ does blah"), +[(Anchor CommentsTest.hs:11:1-33 UnchangedAnchor,AnnComment {ac_tok = AnnLineComment "-- | The function @foo@ does blah", ac_prior_tok = SrcSpanOneLine "./CommentsTest.hs" 9 31 33}), -(CommentsTest.hs:(3,1)-(7,2),AnnBlockComment "{-\nAn opening comment\n {- with a nested one -}\n {-# nested PRAGMA #-}\n-}"), +(Anchor CommentsTest.hs:(3,1)-(7,2) UnchangedAnchor,AnnComment {ac_tok = AnnBlockComment "{-\nAn opening comment\n {- with a nested one -}\n {-# nested PRAGMA #-}\n-}", ac_prior_tok = SrcSpanOneLine "./CommentsTest.hs" 2 27 32}), -(CommentsTest.hs:1:1-31,AnnBlockComment "{-# LANGUAGE DeriveFoldable #-}")]) +(Anchor CommentsTest.hs:1:1-31 UnchangedAnchor,AnnComment {ac_tok = AnnBlockComment "{-# LANGUAGE DeriveFoldable #-}", ac_prior_tok = SrcSpanPoint "./CommentsTest.hs" 1 1})]) ] - diff --git a/testsuite/tests/ghc-api/annotations/listcomps.hs b/testsuite/tests/ghc-api/annotations/listcomps.hs deleted file mode 100644 index 115aef6527..0000000000 --- a/testsuite/tests/ghc-api/annotations/listcomps.hs +++ /dev/null @@ -1,112 +0,0 @@ -{-# LANGUAGE RankNTypes #-} - --- This program must be called with GHC's libdir as the single command line --- argument. -module Main where - --- import Data.Generics -import Data.Data -import Data.List (intercalate) -import System.IO -import GHC -import GHC.Types.Basic -import GHC.Driver.Session -import GHC.Driver.Ppr -import GHC.Utils.Monad -import GHC.Utils.Outputable -import GHC.Parser.Annotation -import GHC.Data.Bag (filterBag,isEmptyBag) -import System.Directory (removeFile) -import System.Environment( getArgs ) -import System.Exit -import qualified Data.Map as Map -import qualified Data.Set as Set -import Data.Dynamic ( fromDynamic,Dynamic ) - -main::IO() -main = do - [libdir] <- getArgs - testOneFile libdir "ListComprehensions" - exitSuccess - -testOneFile libdir fileName = do - p <- runGhc (Just libdir) $ do - dflags <- getSessionDynFlags - setSessionDynFlags dflags - let mn =mkModuleName fileName - addTarget Target { targetId = TargetModule mn - , targetAllowObjCode = True - , targetContents = Nothing } - load LoadAllTargets - modSum <- getModSummary mn - p <- parseModule modSum - t <- typecheckModule p - d <- desugarModule t - l <- loadModule d - return p - - let anns = pm_annotations p - ann_items = apiAnnItems anns - ann_eof = apiAnnEofPos anns - let spans = Set.fromList $ getAllSrcSpans (pm_parsed_source p) - - putStrLn (pp spans) - putStrLn "--------------------------------" - putStrLn (intercalate "\n" [showAnns ann_items,"EOF: " ++ show ann_eof]) - - where - getAnnSrcSpans :: ApiAnns -> [(RealSrcSpan,(ApiAnnKey,[RealSrcSpan]))] - getAnnSrcSpans anns = map (\a@((ss,_),_) -> (ss,a)) $ Map.toList (apiAnnItems anns) - - getAllSrcSpans :: (Data t) => t -> [RealSrcSpan] - getAllSrcSpans ast = everything (++) ([] `mkQ` getSrcSpan) ast - where - getSrcSpan :: SrcSpan -> [RealSrcSpan] - getSrcSpan (RealSrcSpan ss _) = [ss] - getSrcSpan (UnhelpfulSpan _) = [] - -showAnns anns = "[\n" ++ (intercalate "\n" - $ map (\((s,k),v) - -> ("(AK " ++ pp s ++ " " ++ show k ++" = " ++ pp v ++ ")\n")) - $ Map.toList anns) - ++ "]\n" - -pp a = showPprUnsafe a - - --- --------------------------------------------------------------------- - --- Copied from syb for the test - - --- | Generic queries of type \"r\", --- i.e., take any \"a\" and return an \"r\" --- -type GenericQ r = forall a. Data a => a -> r - - --- | Make a generic query; --- start from a type-specific case; --- return a constant otherwise --- -mkQ :: ( Typeable a - , Typeable b - ) - => r - -> (b -> r) - -> a - -> r -(r `mkQ` br) a = case cast a of - Just b -> br b - Nothing -> r - - - --- | Summarise all nodes in top-down, left-to-right order -everything :: (r -> r -> r) -> GenericQ r -> GenericQ r - --- Apply f to x to summarise top-level node; --- use gmapQ to recurse into immediate subterms; --- use ordinary foldl to reduce list of intermediate results - -everything k f x = foldl k (f x) (gmapQ (everything k f) x) diff --git a/testsuite/tests/ghc-api/annotations/listcomps.stdout b/testsuite/tests/ghc-api/annotations/listcomps.stdout deleted file mode 100644 index 169a1f6634..0000000000 --- a/testsuite/tests/ghc-api/annotations/listcomps.stdout +++ /dev/null @@ -1,160 +0,0 @@ -{ListComprehensions.hs:1:1, ListComprehensions.hs:6:8-25, - ListComprehensions.hs:10:1-15, ListComprehensions.hs:10:8-15, - ListComprehensions.hs:11:1-30, ListComprehensions.hs:11:18-25, - ListComprehensions.hs:11:30, ListComprehensions.hs:12:1-27, - ListComprehensions.hs:12:8-15, ListComprehensions.hs:12:17-27, - ListComprehensions.hs:12:18-26, ListComprehensions.hs:13:1-25, - ListComprehensions.hs:13:8-16, ListComprehensions.hs:13:18-25, - ListComprehensions.hs:13:19-24, ListComprehensions.hs:17:1-16, - ListComprehensions.hs:17:1-25, ListComprehensions.hs:17:21-25, - ListComprehensions.hs:17:22-24, ListComprehensions.hs:18:1-16, - ListComprehensions.hs:(18,1)-(22,20), - ListComprehensions.hs:(18,18)-(22,20), - ListComprehensions.hs:(18,20)-(22,20), ListComprehensions.hs:18:22, - ListComprehensions.hs:18:22-26, ListComprehensions.hs:18:22-30, - ListComprehensions.hs:(18,22)-(21,34), ListComprehensions.hs:18:24, - ListComprehensions.hs:18:26, ListComprehensions.hs:18:28, - ListComprehensions.hs:18:30, ListComprehensions.hs:19:22, - ListComprehensions.hs:19:22-33, - ListComprehensions.hs:(19,22)-(21,34), - ListComprehensions.hs:19:27-33, ListComprehensions.hs:19:28, - ListComprehensions.hs:19:31-32, ListComprehensions.hs:20:22, - ListComprehensions.hs:20:22-34, ListComprehensions.hs:20:27-34, - ListComprehensions.hs:20:28-29, ListComprehensions.hs:20:32-33, - ListComprehensions.hs:21:22, ListComprehensions.hs:21:22-34, - ListComprehensions.hs:21:27-34, ListComprehensions.hs:21:28-29, - ListComprehensions.hs:21:32-33, ListComprehensions.hs:24:1-6, - ListComprehensions.hs:24:1-27, ListComprehensions.hs:24:11-15, - ListComprehensions.hs:24:11-27, ListComprehensions.hs:24:12-14, - ListComprehensions.hs:24:20-27, ListComprehensions.hs:24:21-26, - ListComprehensions.hs:25:1-6, ListComprehensions.hs:(25,1)-(28,14), - ListComprehensions.hs:25:8-10, - ListComprehensions.hs:(25,12)-(28,14), - ListComprehensions.hs:(25,14)-(28,14), - ListComprehensions.hs:25:16-20, - ListComprehensions.hs:(25,16)-(27,22), ListComprehensions.hs:26:16, - ListComprehensions.hs:26:16-23, - ListComprehensions.hs:(26,16)-(27,22), - ListComprehensions.hs:26:21-23, ListComprehensions.hs:27:21-22} --------------------------------- -[ -(AK ListComprehensions.hs:1:1 AnnModule = [ListComprehensions.hs:6:1-6]) - -(AK ListComprehensions.hs:1:1 AnnWhere = [ListComprehensions.hs:6:27-31]) - -(AK ListComprehensions.hs:10:1-15 AnnImport = [ListComprehensions.hs:10:1-6]) - -(AK ListComprehensions.hs:10:1-15 AnnSemi = [ListComprehensions.hs:11:1]) - -(AK ListComprehensions.hs:11:1-30 AnnAs = [ListComprehensions.hs:11:27-28]) - -(AK ListComprehensions.hs:11:1-30 AnnImport = [ListComprehensions.hs:11:1-6]) - -(AK ListComprehensions.hs:11:1-30 AnnQualified = [ListComprehensions.hs:11:8-16]) - -(AK ListComprehensions.hs:11:1-30 AnnSemi = [ListComprehensions.hs:12:1]) - -(AK ListComprehensions.hs:12:1-27 AnnImport = [ListComprehensions.hs:12:1-6]) - -(AK ListComprehensions.hs:12:1-27 AnnSemi = [ListComprehensions.hs:13:1]) - -(AK ListComprehensions.hs:12:17-27 AnnCloseP = [ListComprehensions.hs:12:27]) - -(AK ListComprehensions.hs:12:17-27 AnnOpenP = [ListComprehensions.hs:12:17]) - -(AK ListComprehensions.hs:13:1-25 AnnImport = [ListComprehensions.hs:13:1-6]) - -(AK ListComprehensions.hs:13:1-25 AnnSemi = [ListComprehensions.hs:17:1]) - -(AK ListComprehensions.hs:13:18-25 AnnCloseP = [ListComprehensions.hs:13:25]) - -(AK ListComprehensions.hs:13:18-25 AnnOpenP = [ListComprehensions.hs:13:18]) - -(AK ListComprehensions.hs:17:1-25 AnnDcolon = [ListComprehensions.hs:17:18-19]) - -(AK ListComprehensions.hs:17:1-25 AnnSemi = [ListComprehensions.hs:18:1]) - -(AK ListComprehensions.hs:17:21-25 AnnCloseS = [ListComprehensions.hs:17:25]) - -(AK ListComprehensions.hs:17:21-25 AnnOpenS = [ListComprehensions.hs:17:21]) - -(AK ListComprehensions.hs:(18,1)-(22,20) AnnEqual = [ListComprehensions.hs:18:18]) - -(AK ListComprehensions.hs:(18,1)-(22,20) AnnFunId = [ListComprehensions.hs:18:1-16]) - -(AK ListComprehensions.hs:(18,1)-(22,20) AnnSemi = [ListComprehensions.hs:24:1]) - -(AK ListComprehensions.hs:(18,20)-(22,20) AnnCloseS = [ListComprehensions.hs:22:20]) - -(AK ListComprehensions.hs:(18,20)-(22,20) AnnOpenS = [ListComprehensions.hs:18:20]) - -(AK ListComprehensions.hs:(18,20)-(22,20) AnnVbar = [ListComprehensions.hs:19:20]) - -(AK ListComprehensions.hs:18:22-26 AnnVal = [ListComprehensions.hs:18:24]) - -(AK ListComprehensions.hs:18:22-30 AnnVal = [ListComprehensions.hs:18:28]) - -(AK ListComprehensions.hs:19:22-33 AnnLarrow = [ListComprehensions.hs:19:24-25]) - -(AK ListComprehensions.hs:19:22-33 AnnVbar = [ListComprehensions.hs:20:20]) - -(AK ListComprehensions.hs:19:27-33 AnnCloseS = [ListComprehensions.hs:19:33]) - -(AK ListComprehensions.hs:19:27-33 AnnDotdot = [ListComprehensions.hs:19:29-30]) - -(AK ListComprehensions.hs:19:27-33 AnnOpenS = [ListComprehensions.hs:19:27]) - -(AK ListComprehensions.hs:20:22-34 AnnLarrow = [ListComprehensions.hs:20:24-25]) - -(AK ListComprehensions.hs:20:22-34 AnnVbar = [ListComprehensions.hs:21:20]) - -(AK ListComprehensions.hs:20:27-34 AnnCloseS = [ListComprehensions.hs:20:34]) - -(AK ListComprehensions.hs:20:27-34 AnnDotdot = [ListComprehensions.hs:20:30-31]) - -(AK ListComprehensions.hs:20:27-34 AnnOpenS = [ListComprehensions.hs:20:27]) - -(AK ListComprehensions.hs:21:22-34 AnnLarrow = [ListComprehensions.hs:21:24-25]) - -(AK ListComprehensions.hs:21:27-34 AnnCloseS = [ListComprehensions.hs:21:34]) - -(AK ListComprehensions.hs:21:27-34 AnnDotdot = [ListComprehensions.hs:21:30-31]) - -(AK ListComprehensions.hs:21:27-34 AnnOpenS = [ListComprehensions.hs:21:27]) - -(AK ListComprehensions.hs:24:1-27 AnnDcolon = [ListComprehensions.hs:24:8-9]) - -(AK ListComprehensions.hs:24:1-27 AnnSemi = [ListComprehensions.hs:25:1]) - -(AK ListComprehensions.hs:24:11-15 AnnCloseS = [ListComprehensions.hs:24:15]) - -(AK ListComprehensions.hs:24:11-15 AnnOpenS = [ListComprehensions.hs:24:11]) - -(AK ListComprehensions.hs:24:11-15 AnnRarrow = [ListComprehensions.hs:24:17-18]) - -(AK ListComprehensions.hs:24:11-27 AnnRarrow = [ListComprehensions.hs:24:17-18]) - -(AK ListComprehensions.hs:24:20-27 AnnCloseS = [ListComprehensions.hs:24:27]) - -(AK ListComprehensions.hs:24:20-27 AnnOpenS = [ListComprehensions.hs:24:20]) - -(AK ListComprehensions.hs:(25,1)-(28,14) AnnEqual = [ListComprehensions.hs:25:12]) - -(AK ListComprehensions.hs:(25,1)-(28,14) AnnFunId = [ListComprehensions.hs:25:1-6]) - -(AK ListComprehensions.hs:(25,1)-(28,14) AnnSemi = [ListComprehensions.hs:29:1]) - -(AK ListComprehensions.hs:(25,14)-(28,14) AnnCloseS = [ListComprehensions.hs:28:14]) - -(AK ListComprehensions.hs:(25,14)-(28,14) AnnOpenS = [ListComprehensions.hs:25:14]) - -(AK ListComprehensions.hs:(25,14)-(28,14) AnnVbar = [ListComprehensions.hs:26:14]) - -(AK ListComprehensions.hs:26:16-23 AnnComma = [ListComprehensions.hs:27:14]) - -(AK ListComprehensions.hs:26:16-23 AnnLarrow = [ListComprehensions.hs:26:18-19]) - -(AK ListComprehensions.hs:(26,16)-(27,22) AnnThen = [ListComprehensions.hs:27:16-19]) -] - -EOF: Just SrcSpanPoint "./ListComprehensions.hs" 29 1 diff --git a/testsuite/tests/ghc-api/annotations/listcomps.stdout-mingw32 b/testsuite/tests/ghc-api/annotations/listcomps.stdout-mingw32 deleted file mode 100644 index 3bb7f6ce2d..0000000000 --- a/testsuite/tests/ghc-api/annotations/listcomps.stdout-mingw32 +++ /dev/null @@ -1,160 +0,0 @@ -{ListComprehensions.hs:1:1, ListComprehensions.hs:6:8-25, - ListComprehensions.hs:10:1-15, ListComprehensions.hs:10:8-15, - ListComprehensions.hs:11:1-30, ListComprehensions.hs:11:18-25, - ListComprehensions.hs:11:30, ListComprehensions.hs:12:1-27, - ListComprehensions.hs:12:8-15, ListComprehensions.hs:12:17-27, - ListComprehensions.hs:12:18-26, ListComprehensions.hs:13:1-25, - ListComprehensions.hs:13:8-16, ListComprehensions.hs:13:18-25, - ListComprehensions.hs:13:19-24, ListComprehensions.hs:17:1-16, - ListComprehensions.hs:17:1-25, ListComprehensions.hs:17:21-25, - ListComprehensions.hs:17:22-24, ListComprehensions.hs:18:1-16, - ListComprehensions.hs:(18,1)-(22,20), - ListComprehensions.hs:(18,18)-(22,20), - ListComprehensions.hs:(18,20)-(22,20), ListComprehensions.hs:18:22, - ListComprehensions.hs:18:22-26, ListComprehensions.hs:18:22-30, - ListComprehensions.hs:(18,22)-(21,34), ListComprehensions.hs:18:24, - ListComprehensions.hs:18:26, ListComprehensions.hs:18:28, - ListComprehensions.hs:18:30, ListComprehensions.hs:19:22, - ListComprehensions.hs:19:22-33, - ListComprehensions.hs:(19,22)-(21,34), - ListComprehensions.hs:19:27-33, ListComprehensions.hs:19:28, - ListComprehensions.hs:19:31-32, ListComprehensions.hs:20:22, - ListComprehensions.hs:20:22-34, ListComprehensions.hs:20:27-34, - ListComprehensions.hs:20:28-29, ListComprehensions.hs:20:32-33, - ListComprehensions.hs:21:22, ListComprehensions.hs:21:22-34, - ListComprehensions.hs:21:27-34, ListComprehensions.hs:21:28-29, - ListComprehensions.hs:21:32-33, ListComprehensions.hs:24:1-6, - ListComprehensions.hs:24:1-27, ListComprehensions.hs:24:11-15, - ListComprehensions.hs:24:11-27, ListComprehensions.hs:24:12-14, - ListComprehensions.hs:24:20-27, ListComprehensions.hs:24:21-26, - ListComprehensions.hs:25:1-6, ListComprehensions.hs:(25,1)-(28,14), - ListComprehensions.hs:25:8-10, - ListComprehensions.hs:(25,12)-(28,14), - ListComprehensions.hs:(25,14)-(28,14), - ListComprehensions.hs:25:16-20, - ListComprehensions.hs:(25,16)-(27,22), ListComprehensions.hs:26:16, - ListComprehensions.hs:26:16-23, - ListComprehensions.hs:(26,16)-(27,22), - ListComprehensions.hs:26:21-23, ListComprehensions.hs:27:21-22} --------------------------------- -[ -(AK ListComprehensions.hs:1:1 AnnModule = [ListComprehensions.hs:6:1-6]) - -(AK ListComprehensions.hs:1:1 AnnWhere = [ListComprehensions.hs:6:27-31]) - -(AK ListComprehensions.hs:10:1-15 AnnImport = [ListComprehensions.hs:10:1-6]) - -(AK ListComprehensions.hs:10:1-15 AnnSemi = [ListComprehensions.hs:11:1]) - -(AK ListComprehensions.hs:11:1-30 AnnAs = [ListComprehensions.hs:11:27-28]) - -(AK ListComprehensions.hs:11:1-30 AnnImport = [ListComprehensions.hs:11:1-6]) - -(AK ListComprehensions.hs:11:1-30 AnnQualified = [ListComprehensions.hs:11:8-16]) - -(AK ListComprehensions.hs:11:1-30 AnnSemi = [ListComprehensions.hs:12:1]) - -(AK ListComprehensions.hs:12:1-27 AnnImport = [ListComprehensions.hs:12:1-6]) - -(AK ListComprehensions.hs:12:1-27 AnnSemi = [ListComprehensions.hs:13:1]) - -(AK ListComprehensions.hs:12:17-27 AnnCloseP = [ListComprehensions.hs:12:27]) - -(AK ListComprehensions.hs:12:17-27 AnnOpenP = [ListComprehensions.hs:12:17]) - -(AK ListComprehensions.hs:13:1-25 AnnImport = [ListComprehensions.hs:13:1-6]) - -(AK ListComprehensions.hs:13:1-25 AnnSemi = [ListComprehensions.hs:17:1]) - -(AK ListComprehensions.hs:13:18-25 AnnCloseP = [ListComprehensions.hs:13:25]) - -(AK ListComprehensions.hs:13:18-25 AnnOpenP = [ListComprehensions.hs:13:18]) - -(AK ListComprehensions.hs:17:1-25 AnnDcolon = [ListComprehensions.hs:17:18-19]) - -(AK ListComprehensions.hs:17:1-25 AnnSemi = [ListComprehensions.hs:18:1]) - -(AK ListComprehensions.hs:17:21-25 AnnCloseS = [ListComprehensions.hs:17:25]) - -(AK ListComprehensions.hs:17:21-25 AnnOpenS = [ListComprehensions.hs:17:21]) - -(AK ListComprehensions.hs:(18,1)-(22,20) AnnEqual = [ListComprehensions.hs:18:18]) - -(AK ListComprehensions.hs:(18,1)-(22,20) AnnFunId = [ListComprehensions.hs:18:1-16]) - -(AK ListComprehensions.hs:(18,1)-(22,20) AnnSemi = [ListComprehensions.hs:24:1]) - -(AK ListComprehensions.hs:(18,20)-(22,20) AnnCloseS = [ListComprehensions.hs:22:20]) - -(AK ListComprehensions.hs:(18,20)-(22,20) AnnOpenS = [ListComprehensions.hs:18:20]) - -(AK ListComprehensions.hs:(18,20)-(22,20) AnnVbar = [ListComprehensions.hs:19:20]) - -(AK ListComprehensions.hs:18:22-26 AnnVal = [ListComprehensions.hs:18:24]) - -(AK ListComprehensions.hs:18:22-30 AnnVal = [ListComprehensions.hs:18:28]) - -(AK ListComprehensions.hs:19:22-33 AnnLarrow = [ListComprehensions.hs:19:24-25]) - -(AK ListComprehensions.hs:19:22-33 AnnVbar = [ListComprehensions.hs:20:20]) - -(AK ListComprehensions.hs:19:27-33 AnnCloseS = [ListComprehensions.hs:19:33]) - -(AK ListComprehensions.hs:19:27-33 AnnDotdot = [ListComprehensions.hs:19:29-30]) - -(AK ListComprehensions.hs:19:27-33 AnnOpenS = [ListComprehensions.hs:19:27]) - -(AK ListComprehensions.hs:20:22-34 AnnLarrow = [ListComprehensions.hs:20:24-25]) - -(AK ListComprehensions.hs:20:22-34 AnnVbar = [ListComprehensions.hs:21:20]) - -(AK ListComprehensions.hs:20:27-34 AnnCloseS = [ListComprehensions.hs:20:34]) - -(AK ListComprehensions.hs:20:27-34 AnnDotdot = [ListComprehensions.hs:20:30-31]) - -(AK ListComprehensions.hs:20:27-34 AnnOpenS = [ListComprehensions.hs:20:27]) - -(AK ListComprehensions.hs:21:22-34 AnnLarrow = [ListComprehensions.hs:21:24-25]) - -(AK ListComprehensions.hs:21:27-34 AnnCloseS = [ListComprehensions.hs:21:34]) - -(AK ListComprehensions.hs:21:27-34 AnnDotdot = [ListComprehensions.hs:21:30-31]) - -(AK ListComprehensions.hs:21:27-34 AnnOpenS = [ListComprehensions.hs:21:27]) - -(AK ListComprehensions.hs:24:1-27 AnnDcolon = [ListComprehensions.hs:24:8-9]) - -(AK ListComprehensions.hs:24:1-27 AnnSemi = [ListComprehensions.hs:25:1]) - -(AK ListComprehensions.hs:24:11-15 AnnCloseS = [ListComprehensions.hs:24:15]) - -(AK ListComprehensions.hs:24:11-15 AnnOpenS = [ListComprehensions.hs:24:11]) - -(AK ListComprehensions.hs:24:11-15 AnnRarrow = [ListComprehensions.hs:24:17-18]) - -(AK ListComprehensions.hs:24:11-27 AnnRarrow = [ListComprehensions.hs:24:17-18]) - -(AK ListComprehensions.hs:24:20-27 AnnCloseS = [ListComprehensions.hs:24:27]) - -(AK ListComprehensions.hs:24:20-27 AnnOpenS = [ListComprehensions.hs:24:20]) - -(AK ListComprehensions.hs:(25,1)-(28,14) AnnEqual = [ListComprehensions.hs:25:12]) - -(AK ListComprehensions.hs:(25,1)-(28,14) AnnFunId = [ListComprehensions.hs:25:1-6]) - -(AK ListComprehensions.hs:(25,1)-(28,14) AnnSemi = [ListComprehensions.hs:29:1]) - -(AK ListComprehensions.hs:(25,14)-(28,14) AnnCloseS = [ListComprehensions.hs:28:14]) - -(AK ListComprehensions.hs:(25,14)-(28,14) AnnOpenS = [ListComprehensions.hs:25:14]) - -(AK ListComprehensions.hs:(25,14)-(28,14) AnnVbar = [ListComprehensions.hs:26:14]) - -(AK ListComprehensions.hs:26:16-23 AnnComma = [ListComprehensions.hs:27:14]) - -(AK ListComprehensions.hs:26:16-23 AnnLarrow = [ListComprehensions.hs:26:18-19]) - -(AK ListComprehensions.hs:(26,16)-(27,22) AnnThen = [ListComprehensions.hs:27:16-19]) -] - -EOF: Just SrcSpanPoint ".\\ListComprehensions.hs" 29 1 diff --git a/testsuite/tests/ghc-api/annotations/load-main.hs b/testsuite/tests/ghc-api/annotations/load-main.hs deleted file mode 100644 index 4628a423b8..0000000000 --- a/testsuite/tests/ghc-api/annotations/load-main.hs +++ /dev/null @@ -1,4 +0,0 @@ -module Main where - --- Testing that check-api-annotations can load a main module file -main = putStrLn "hello" diff --git a/testsuite/tests/ghc-api/annotations/load-main.stdout b/testsuite/tests/ghc-api/annotations/load-main.stdout deleted file mode 100644 index 4ba092296b..0000000000 --- a/testsuite/tests/ghc-api/annotations/load-main.stdout +++ /dev/null @@ -1,20 +0,0 @@ ----Unattached Annotation Problems (should be empty list)--- -[] ----Ann before enclosing span problem (should be empty list)--- -[ - -] - ----Annotations----------------------- --- SrcSpan the annotation is attached to, AnnKeywordId, --- list of locations the keyword item appears in -[ -((load-main.hs:1:1,AnnModule), [load-main.hs:1:1-6]), -((load-main.hs:1:1,AnnWhere), [load-main.hs:1:13-17]), -((load-main.hs:4:1-23,AnnEqual), [load-main.hs:4:6]), -((load-main.hs:4:1-23,AnnFunId), [load-main.hs:4:1-4]), -((load-main.hs:4:1-23,AnnSemi), [load-main.hs:5:1]) -] - ----Eof Position (should be Just)----- -Just SrcSpanPoint "load-main.hs" 5 1 diff --git a/testsuite/tests/ghc-api/annotations/parseTree.hs b/testsuite/tests/ghc-api/annotations/parseTree.hs deleted file mode 100644 index f566c51d6f..0000000000 --- a/testsuite/tests/ghc-api/annotations/parseTree.hs +++ /dev/null @@ -1,106 +0,0 @@ -{-# LANGUAGE RankNTypes #-} - --- This program must be called with GHC's libdir as the single command line --- argument. -module Main where - --- import Data.Generics -import Data.Data -import Data.List (intercalate) -import System.IO -import GHC -import GHC.Types.Basic -import GHC.Driver.Session -import GHC.Driver.Ppr -import GHC.Utils.Monad -import GHC.Utils.Outputable -import GHC.Data.Bag (filterBag,isEmptyBag) -import System.Directory (removeFile) -import System.Environment( getArgs ) -import qualified Data.Map as Map -import Data.Dynamic ( fromDynamic,Dynamic ) - -main::IO() -main = do - [libdir] <- getArgs - testOneFile libdir "AnnotationTuple" - -testOneFile libdir fileName = do - p <- runGhc (Just libdir) $ do - dflags <- getSessionDynFlags - setSessionDynFlags dflags - let mn =mkModuleName fileName - addTarget Target { targetId = TargetModule mn - , targetAllowObjCode = True - , targetContents = Nothing } - load LoadAllTargets - modSum <- getModSummary mn - p <- parseModule modSum - t <- typecheckModule p - d <- desugarModule t - l <- loadModule d - return p - - let anns = pm_annotations p - ann_items = apiAnnItems anns - ann_eof = apiAnnEofPos anns - let tupArgs = gq (pm_parsed_source p) - - putStrLn (pp tupArgs) - putStrLn (intercalate "\n" [showAnns ann_items, "EOF: " ++ show ann_eof]) - - where - gq ast = everything (++) ([] `mkQ` doLHsTupArg) ast - - doLHsTupArg :: LHsTupArg GhcPs -> [(SrcSpan,String,HsExpr GhcPs)] - doLHsTupArg (L l arg@(Present {})) - = [(l,"p",ExplicitTuple noExtField [L l arg] Boxed)] - doLHsTupArg (L l arg@(Missing {})) - = [(l,"m",ExplicitTuple noExtField [L l arg] Boxed)] - - -showAnns anns = "[\n" ++ (intercalate "\n" - $ map (\((s,k),v) - -> ("(AK " ++ pp s ++ " " ++ show k ++" = " ++ pp v ++ ")\n")) - $ Map.toList anns) - ++ "]\n" - -pp a = showPprUnsafe a - - --- --------------------------------------------------------------------- - --- Copied from syb for the test - - --- | Generic queries of type \"r\", --- i.e., take any \"a\" and return an \"r\" --- -type GenericQ r = forall a. Data a => a -> r - - --- | Make a generic query; --- start from a type-specific case; --- return a constant otherwise --- -mkQ :: ( Typeable a - , Typeable b - ) - => r - -> (b -> r) - -> a - -> r -(r `mkQ` br) a = case cast a of - Just b -> br b - Nothing -> r - - - --- | Summarise all nodes in top-down, left-to-right order -everything :: (r -> r -> r) -> GenericQ r -> GenericQ r - --- Apply f to x to summarise top-level node; --- use gmapQ to recurse into immediate subterms; --- use ordinary foldl to reduce list of intermediate results - -everything k f x = foldl k (f x) (gmapQ (everything k f) x) diff --git a/testsuite/tests/ghc-api/annotations/parseTree.stdout b/testsuite/tests/ghc-api/annotations/parseTree.stdout deleted file mode 100644 index 8d629fb90a..0000000000 --- a/testsuite/tests/ghc-api/annotations/parseTree.stdout +++ /dev/null @@ -1,160 +0,0 @@ -[(AnnotationTuple.hs:14:20, [p], Solo 1), - (AnnotationTuple.hs:14:23-29, [p], Solo "hello"), - (AnnotationTuple.hs:14:35-37, [p], Solo 6.5), - (AnnotationTuple.hs:14:39, [m], ()), - (AnnotationTuple.hs:14:41-52, [p], Solo [5, 5, 6, 7]), - (AnnotationTuple.hs:16:8, [p], Solo 1), - (AnnotationTuple.hs:16:11-17, [p], Solo "hello"), - (AnnotationTuple.hs:16:20-22, [p], Solo 6.5), - (AnnotationTuple.hs:16:24, [m], ()), - (AnnotationTuple.hs:16:25, [m], ()), - (AnnotationTuple.hs:16:26, [m], ()), (<no location info>, [m], ())] -[ -(AK AnnotationTuple.hs:1:1 AnnCloseC = [AnnotationTuple.hs:27:1]) - -(AK AnnotationTuple.hs:1:1 AnnModule = [AnnotationTuple.hs:3:1-6]) - -(AK AnnotationTuple.hs:1:1 AnnOpenC = [AnnotationTuple.hs:5:1]) - -(AK AnnotationTuple.hs:1:1 AnnWhere = [AnnotationTuple.hs:3:30-34]) - -(AK AnnotationTuple.hs:3:24-28 AnnCloseP = [AnnotationTuple.hs:3:28]) - -(AK AnnotationTuple.hs:3:24-28 AnnOpenP = [AnnotationTuple.hs:3:24]) - -(AK AnnotationTuple.hs:6:1-32 AnnAs = [AnnotationTuple.hs:6:28-29]) - -(AK AnnotationTuple.hs:6:1-32 AnnImport = [AnnotationTuple.hs:6:1-6]) - -(AK AnnotationTuple.hs:6:1-32 AnnQualified = [AnnotationTuple.hs:6:8-16]) - -(AK AnnotationTuple.hs:6:1-32 AnnSemi = [AnnotationTuple.hs:7:1]) - -(AK AnnotationTuple.hs:(8,1)-(11,14) AnnEqual = [AnnotationTuple.hs:8:5]) - -(AK AnnotationTuple.hs:(8,1)-(11,14) AnnFunId = [AnnotationTuple.hs:8:1-3]) - -(AK AnnotationTuple.hs:(8,1)-(11,14) AnnSemi = [AnnotationTuple.hs:13:1]) - -(AK AnnotationTuple.hs:(8,7)-(11,14) AnnIn = [AnnotationTuple.hs:11:7-8]) - -(AK AnnotationTuple.hs:(8,7)-(11,14) AnnLet = [AnnotationTuple.hs:8:7-9]) - -(AK AnnotationTuple.hs:9:9-13 AnnEqual = [AnnotationTuple.hs:9:11]) - -(AK AnnotationTuple.hs:9:9-13 AnnFunId = [AnnotationTuple.hs:9:9]) - -(AK AnnotationTuple.hs:9:9-13 AnnSemi = [AnnotationTuple.hs:10:9]) - -(AK AnnotationTuple.hs:10:9-13 AnnEqual = [AnnotationTuple.hs:10:11]) - -(AK AnnotationTuple.hs:10:9-13 AnnFunId = [AnnotationTuple.hs:10:9]) - -(AK AnnotationTuple.hs:11:10-14 AnnVal = [AnnotationTuple.hs:11:12]) - -(AK AnnotationTuple.hs:14:1-72 AnnEqual = [AnnotationTuple.hs:14:5]) - -(AK AnnotationTuple.hs:14:1-72 AnnFunId = [AnnotationTuple.hs:14:1-3]) - -(AK AnnotationTuple.hs:14:1-72 AnnSemi = [AnnotationTuple.hs:15:1]) - -(AK AnnotationTuple.hs:14:7-72 AnnVal = [AnnotationTuple.hs:14:13]) - -(AK AnnotationTuple.hs:14:19-53 AnnCloseP = [AnnotationTuple.hs:14:53]) - -(AK AnnotationTuple.hs:14:19-53 AnnOpenP = [AnnotationTuple.hs:14:19]) - -(AK AnnotationTuple.hs:14:20 AnnComma = [AnnotationTuple.hs:14:21]) - -(AK AnnotationTuple.hs:14:23-29 AnnComma = [AnnotationTuple.hs:14:33]) - -(AK AnnotationTuple.hs:14:35-37 AnnComma = [AnnotationTuple.hs:14:38]) - -(AK AnnotationTuple.hs:14:39 AnnComma = [AnnotationTuple.hs:14:39]) - -(AK AnnotationTuple.hs:14:41-52 AnnCloseS = [AnnotationTuple.hs:14:52]) - -(AK AnnotationTuple.hs:14:41-52 AnnOpenS = [AnnotationTuple.hs:14:41]) - -(AK AnnotationTuple.hs:14:42 AnnComma = [AnnotationTuple.hs:14:43]) - -(AK AnnotationTuple.hs:14:45 AnnComma = [AnnotationTuple.hs:14:46]) - -(AK AnnotationTuple.hs:14:48 AnnComma = [AnnotationTuple.hs:14:49]) - -(AK AnnotationTuple.hs:14:55-72 AnnCloseS = [AnnotationTuple.hs:14:72]) - -(AK AnnotationTuple.hs:14:55-72 AnnOpenS = [AnnotationTuple.hs:14:55]) - -(AK AnnotationTuple.hs:14:56-62 AnnComma = [AnnotationTuple.hs:14:63]) - -(AK AnnotationTuple.hs:14:61-62 AnnCloseP = [AnnotationTuple.hs:14:62]) - -(AK AnnotationTuple.hs:14:61-62 AnnOpenP = [AnnotationTuple.hs:14:61]) - -(AK AnnotationTuple.hs:16:1-41 AnnEqual = [AnnotationTuple.hs:16:5]) - -(AK AnnotationTuple.hs:16:1-41 AnnFunId = [AnnotationTuple.hs:16:1-3]) - -(AK AnnotationTuple.hs:16:1-41 AnnSemi = [AnnotationTuple.hs:17:1]) - -(AK AnnotationTuple.hs:16:7-27 AnnCloseP = [AnnotationTuple.hs:16:27]) - -(AK AnnotationTuple.hs:16:7-27 AnnOpenP = [AnnotationTuple.hs:16:7]) - -(AK AnnotationTuple.hs:16:8 AnnComma = [AnnotationTuple.hs:16:9]) - -(AK AnnotationTuple.hs:16:11-17 AnnComma = [AnnotationTuple.hs:16:18]) - -(AK AnnotationTuple.hs:16:20-22 AnnComma = [AnnotationTuple.hs:16:23]) - -(AK AnnotationTuple.hs:16:24 AnnComma = [AnnotationTuple.hs:16:24]) - -(AK AnnotationTuple.hs:16:25 AnnComma = [AnnotationTuple.hs:16:25]) - -(AK AnnotationTuple.hs:16:26 AnnComma = [AnnotationTuple.hs:16:26]) - -(AK AnnotationTuple.hs:16:33-41 AnnCloseP = [AnnotationTuple.hs:16:41]) - -(AK AnnotationTuple.hs:16:33-41 AnnOpenP = [AnnotationTuple.hs:16:33]) - -(AK AnnotationTuple.hs:16:39-40 AnnCloseP = [AnnotationTuple.hs:16:40]) - -(AK AnnotationTuple.hs:16:39-40 AnnOpenP = [AnnotationTuple.hs:16:39]) - -(AK AnnotationTuple.hs:18:1-28 AnnData = [AnnotationTuple.hs:18:1-4]) - -(AK AnnotationTuple.hs:18:1-28 AnnDcolon = [AnnotationTuple.hs:18:20-21]) - -(AK AnnotationTuple.hs:18:1-28 AnnFamily = [AnnotationTuple.hs:18:6-11]) - -(AK AnnotationTuple.hs:18:1-28 AnnSemi = [AnnotationTuple.hs:19:1]) - -(AK AnnotationTuple.hs:18:23 AnnRarrow = [AnnotationTuple.hs:18:25-26]) - -(AK AnnotationTuple.hs:18:23-28 AnnRarrow = [AnnotationTuple.hs:18:25-26]) - -(AK AnnotationTuple.hs:(20,1)-(24,14) AnnFunId = [AnnotationTuple.hs:20:1-5]) - -(AK AnnotationTuple.hs:(20,1)-(24,14) AnnSemi = [AnnotationTuple.hs:25:1]) - -(AK AnnotationTuple.hs:(21,7)-(24,14) AnnEqual = [AnnotationTuple.hs:24:7]) - -(AK AnnotationTuple.hs:(21,7)-(24,14) AnnVbar = [AnnotationTuple.hs:21:7]) - -(AK AnnotationTuple.hs:21:9-24 AnnComma = [AnnotationTuple.hs:22:7]) - -(AK AnnotationTuple.hs:21:9-24 AnnLarrow = [AnnotationTuple.hs:21:16-17]) - -(AK AnnotationTuple.hs:22:9-25 AnnComma = [AnnotationTuple.hs:23:7]) - -(AK AnnotationTuple.hs:22:9-25 AnnLarrow = [AnnotationTuple.hs:22:16-17]) - -(AK AnnotationTuple.hs:23:9-24 AnnLarrow = [AnnotationTuple.hs:23:16-17]) - -(AK AnnotationTuple.hs:26:1-10 AnnDcolon = [AnnotationTuple.hs:26:5-6]) - -(AK AnnotationTuple.hs:26:1-14 AnnEqual = [AnnotationTuple.hs:26:12]) -] - -EOF: Just SrcSpanPoint "./AnnotationTuple.hs" 32 1 |