ghc-exactprint 0.5.1.1 → 0.5.2

raw patch · 5 files changed

+13/−5 lines, 5 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

- Language.Haskell.GHC.ExactPrint.Annotate: AnnotationsToComments :: [AnnKeywordId] -> next -> AnnotationF next

- Language.Haskell.GHC.ExactPrint.Annotate: CountAnns :: AnnKeywordId -> (Int -> next) -> AnnotationF next

- Language.Haskell.GHC.ExactPrint.Annotate: GetSrcSpanForKw :: AnnKeywordId -> (SrcSpan -> next) -> AnnotationF next

- Language.Haskell.GHC.ExactPrint.Annotate: MarkEOF :: next -> AnnotationF next

- Language.Haskell.GHC.ExactPrint.Annotate: MarkExternal :: SrcSpan -> AnnKeywordId -> String -> next -> AnnotationF next

- Language.Haskell.GHC.ExactPrint.Annotate: MarkInside :: AnnKeywordId -> next -> AnnotationF next

- Language.Haskell.GHC.ExactPrint.Annotate: MarkMany :: AnnKeywordId -> next -> AnnotationF next

- Language.Haskell.GHC.ExactPrint.Annotate: MarkOffsetPrim :: AnnKeywordId -> Int -> Maybe String -> next -> AnnotationF next

- Language.Haskell.GHC.ExactPrint.Annotate: MarkOutside :: AnnKeywordId -> KeywordId -> next -> AnnotationF next

- Language.Haskell.GHC.ExactPrint.Annotate: MarkPrim :: AnnKeywordId -> Maybe String -> next -> AnnotationF next

- Language.Haskell.GHC.ExactPrint.Annotate: SetLayoutFlag :: Rigidity -> Annotated () -> next -> AnnotationF next

- Language.Haskell.GHC.ExactPrint.Annotate: StoreOriginalSrcSpan :: AnnKey -> (AnnKey -> next) -> AnnotationF next

- Language.Haskell.GHC.ExactPrint.Annotate: StoreString :: String -> SrcSpan -> next -> AnnotationF next

- Language.Haskell.GHC.ExactPrint.Annotate: WithAST :: Located a -> Annotated b -> next -> AnnotationF next

- Language.Haskell.GHC.ExactPrint.Annotate: WithSortKey :: [(SrcSpan, Annotated ())] -> next -> AnnotationF next

- Language.Haskell.GHC.ExactPrint.Annotate: instance (PlaceHolder.DataId name, Language.Haskell.GHC.ExactPrint.Annotate.Annotate arg) => Language.Haskell.GHC.ExactPrint.Annotate.Annotate (HsTypes.HsWithBndrs name (SrcLoc.Located arg))

- Language.Haskell.GHC.ExactPrint.Annotate: instance (PlaceHolder.DataId name, Outputable.OutputableBndr name, OccName.HasOccName name, Language.Haskell.GHC.ExactPrint.Annotate.Annotate name) => Language.Haskell.GHC.ExactPrint.Annotate.Annotate (HsTypes.HsQuasiQuote name)

- Language.Haskell.GHC.ExactPrint.Lookup: unicodeString :: KeywordId -> String

- Language.Haskell.GHC.ExactPrint.Types: AnnUnicode :: AnnKeywordId -> KeywordId

+ Language.Haskell.GHC.ExactPrint.Annotate: [AnnotationsToComments] :: [AnnKeywordId] -> next -> AnnotationF next

+ Language.Haskell.GHC.ExactPrint.Annotate: [CountAnns] :: AnnKeywordId -> (Int -> next) -> AnnotationF next

+ Language.Haskell.GHC.ExactPrint.Annotate: [GetSrcSpanForKw] :: AnnKeywordId -> (SrcSpan -> next) -> AnnotationF next

+ Language.Haskell.GHC.ExactPrint.Annotate: [MarkEOF] :: next -> AnnotationF next

+ Language.Haskell.GHC.ExactPrint.Annotate: [MarkExternal] :: SrcSpan -> AnnKeywordId -> String -> next -> AnnotationF next

+ Language.Haskell.GHC.ExactPrint.Annotate: [MarkInside] :: AnnKeywordId -> next -> AnnotationF next

+ Language.Haskell.GHC.ExactPrint.Annotate: [MarkMany] :: AnnKeywordId -> next -> AnnotationF next

+ Language.Haskell.GHC.ExactPrint.Annotate: [MarkOffsetPrim] :: AnnKeywordId -> Int -> Maybe String -> next -> AnnotationF next

+ Language.Haskell.GHC.ExactPrint.Annotate: [MarkOutside] :: AnnKeywordId -> KeywordId -> next -> AnnotationF next

+ Language.Haskell.GHC.ExactPrint.Annotate: [MarkPrim] :: AnnKeywordId -> Maybe String -> next -> AnnotationF next

+ Language.Haskell.GHC.ExactPrint.Annotate: [SetLayoutFlag] :: Rigidity -> Annotated () -> next -> AnnotationF next

+ Language.Haskell.GHC.ExactPrint.Annotate: [StoreOriginalSrcSpan] :: AnnKey -> (AnnKey -> next) -> AnnotationF next

+ Language.Haskell.GHC.ExactPrint.Annotate: [WithAST] :: Data a => Located a -> Annotated b -> next -> AnnotationF next

+ Language.Haskell.GHC.ExactPrint.Annotate: [WithSortKey] :: [(SrcSpan, Annotated ())] -> next -> AnnotationF next

+ Language.Haskell.GHC.ExactPrint.Annotate: instance (PlaceHolder.DataId name, Language.Haskell.GHC.ExactPrint.Annotate.Annotate arg) => Language.Haskell.GHC.ExactPrint.Annotate.Annotate (HsTypes.HsImplicitBndrs name (SrcLoc.Located arg))

+ Language.Haskell.GHC.ExactPrint.Annotate: instance (PlaceHolder.DataId name, Language.Haskell.GHC.ExactPrint.Annotate.Annotate name) => Language.Haskell.GHC.ExactPrint.Annotate.Annotate (HsDecls.InjectivityAnn name)

+ Language.Haskell.GHC.ExactPrint.Annotate: instance (PlaceHolder.DataId name, Language.Haskell.GHC.ExactPrint.Annotate.Annotate name, Outputable.OutputableBndr name, OccName.HasOccName name) => Language.Haskell.GHC.ExactPrint.Annotate.Annotate (HsDecls.FamilyResultSig name)

+ Language.Haskell.GHC.ExactPrint.Annotate: instance (PlaceHolder.DataId name, Outputable.OutputableBndr name, OccName.HasOccName name, Language.Haskell.GHC.ExactPrint.Annotate.Annotate name) => Language.Haskell.GHC.ExactPrint.Annotate.Annotate (HsPat.HsRecUpdField name)

+ Language.Haskell.GHC.ExactPrint.Annotate: instance Data.Data.Data Language.Haskell.GHC.ExactPrint.Annotate.WildCardAnon

+ Language.Haskell.GHC.ExactPrint.Annotate: instance GHC.Show.Show Language.Haskell.GHC.ExactPrint.Annotate.WildCardAnon

+ Language.Haskell.GHC.ExactPrint.Annotate: instance Language.Haskell.GHC.ExactPrint.Annotate.Annotate BasicTypes.StringLiteral

+ Language.Haskell.GHC.ExactPrint.Annotate: instance Language.Haskell.GHC.ExactPrint.Annotate.Annotate Language.Haskell.GHC.ExactPrint.Annotate.WildCardAnon

+ Language.Haskell.GHC.ExactPrint.Annotate: instance PlaceHolder.DataId name => Language.Haskell.GHC.ExactPrint.Annotate.Annotate (HsTypes.AmbiguousFieldOcc name)

+ Language.Haskell.GHC.ExactPrint.Annotate: instance PlaceHolder.DataId name => Language.Haskell.GHC.ExactPrint.Annotate.Annotate (HsTypes.FieldOcc name)

- Language.Haskell.GHC.ExactPrint.Transform: modifyValD :: (HasTransform m) => SrcSpan -> Decl -> (Match -> [Decl] -> m ([Decl], Maybe t)) -> m (Decl, Maybe t)

+ Language.Haskell.GHC.ExactPrint.Transform: modifyValD :: forall m t. (HasTransform m) => SrcSpan -> Decl -> (Match -> [Decl] -> m ([Decl], Maybe t)) -> m (Decl, Maybe t)

Files

ChangeLog +5/−1
ghc-exactprint.cabal +1/−1
src/Language/Haskell/GHC/ExactPrint/Annotate.hs +3/−3
tests/examples/ghc710/NegLit.hs +1/−0
tests/examples/ghc710/OldQuasiQuote.hs +3/−0

ChangeLog view

@@ -1,5 +1,9 @@+2016-07-24 v0.5.2+	* Move annotations from the `RdrName` to `HsVar` and `PatVar` for+	consistency.+ 2016-06-03 v0.5.1.1-	* Fixx haddocks for GHC 8.0 (@phadej)+	* Fix haddocks for GHC 8.0 (@phadej) 	* Add test files for ghc710-only to dist tarball (#41) 2016-06-02 v0.5.1.0 	* Support for GHC 8.0.1

ghc-exactprint.cabal view

@@ -1,5 +1,5 @@ name:                ghc-exactprint-version:             0.5.1.1+version:             0.5.2 synopsis:            ExactPrint for GHC description:         Using the API Annotations available from GHC 7.10.2, this                      library provides a means to round trip any code that can

src/Language/Haskell/GHC/ExactPrint/Annotate.hs view

@@ -1704,7 +1704,7 @@ #if __GLASGOW_HASKELL__ <= 710     markAST l n #else-    markLocated n+    markAST l (GHC.unLoc n) #endif   markAST _ (GHC.LazyPat p) = do     mark GHC.AnnTilde@@ -2041,14 +2041,14 @@ #if __GLASGOW_HASKELL__ <= 710   markAST l (GHC.HsVar n)           = markAST l n #else-  markAST l (GHC.HsVar n)           = markLocated n+  markAST l (GHC.HsVar n)           = markAST l (GHC.unLoc n) #endif  #if __GLASGOW_HASKELL__ <= 710 #else   markAST l (GHC.HsRecFld f) = markAST l f -  markAST l (GHC.HsOverLabel fs) +  markAST l (GHC.HsOverLabel fs)     = markExternal l GHC.AnnVal ("#" ++ GHC.unpackFS fs) #endif

+ tests/examples/ghc710/NegLit.hs view

@@ -0,0 +1,1 @@+a = -b/c

+ tests/examples/ghc710/OldQuasiQuote.hs view

@@ -0,0 +1,3 @@+{-# LANGUAGE QuasiQuotes #-}++foo = [$qq| string|]