diff --git a/codet-plugin.cabal b/codet-plugin.cabal --- a/codet-plugin.cabal +++ b/codet-plugin.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: codet-plugin -version: 0.1.0.1 +version: 0.1.0.2 license: BSD-3-Clause license-file: LICENSE author: Oleg Grenrus @@ -10,7 +10,14 @@ build-type: Simple extra-doc-files: CHANGELOG.md tested-with: - GHC ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2 || ==9.10.1 + GHC ==9.0.2 + || ==9.2.8 + || ==9.4.8 + || ==9.6.7 + || ==9.8.4 + || ==9.10.3 + || ==9.12.4 + || ==9.14.1 synopsis: GHC type-checker plugin for solving LiftT instances from codet @@ -34,9 +41,9 @@ exposed-modules: Language.Haskell.TH.CodeT.Plugin other-modules: Plugin.GHC build-depends: - , base ^>=4.15.1.0 || ^>=4.16.3.0 || ^>=4.17.2.1 || ^>=4.18.1.0 || ^>=4.19.0.0 || ^>=4.20.0.0 + , base ^>=4.15.1.0 || ^>=4.16.3.0 || ^>=4.17.2.1 || ^>=4.18.1.0 || ^>=4.19.0.0 || ^>=4.20.0.0 || ^>=4.21.0.0 || ^>=4.22.0.0 , codet ^>=0.1 - , ghc ^>=9.0.2 || ^>=9.2.3 || ^>=9.4.8 || ^>=9.6.3 || ^>=9.8.1 || ^>=9.10.1 + , ghc ^>=9.0.2 || ^>=9.2.3 || ^>=9.4.8 || ^>=9.6.3 || ^>=9.8.1 || ^>=9.10.1 || ^>=9.12.2 || ^>=9.14.1 test-suite codet-plugin-tests import: language diff --git a/src/Language/Haskell/TH/CodeT/Plugin.hs b/src/Language/Haskell/TH/CodeT/Plugin.hs --- a/src/Language/Haskell/TH/CodeT/Plugin.hs +++ b/src/Language/Haskell/TH/CodeT/Plugin.hs @@ -8,6 +8,8 @@ import Data.Maybe (catMaybes) import Data.String (fromString) +import Language.Haskell.TH.CodeT () + import qualified GHC.Plugins as Plugins import Plugin.GHC diff --git a/tests/codet-plugin-tests-902.txt b/tests/codet-plugin-tests-902.txt --- a/tests/codet-plugin-tests-902.txt +++ b/tests/codet-plugin-tests-902.txt @@ -5,9 +5,9 @@ GHC.Maybe.Just (ConT (Name (OccName "Just") (NameG (DataName) (PkgName "base") (ModName "GHC.Maybe")))) Main.Foo -(ConT (Name (OccName "Foo") (NameG (TcClsName) (PkgName "main") (ModName "Main")))) +(ConT (Name (OccName "Foo") (NameG (TcClsName) (PkgName "codet-plugin-0.1.0.2-inplace-codet-plugin-tests") (ModName "Main")))) Main.Foo -(ConT (Name (OccName "Foo") (NameG (DataName) (PkgName "main") (ModName "Main")))) +(ConT (Name (OccName "Foo") (NameG (DataName) (PkgName "codet-plugin-0.1.0.2-inplace-codet-plugin-tests") (ModName "Main")))) GHC.Types.[] GHC.Types.Int (AppT (ConT (Name (OccName "[]") (NameG (TcClsName) (PkgName "ghc-prim") (ModName "GHC.Types")))) (ConT (Name (OccName "Int") (NameG (TcClsName) (PkgName "ghc-prim") (ModName "GHC.Types"))))) GHC.Show.Show diff --git a/tests/codet-plugin-tests-906.txt b/tests/codet-plugin-tests-906.txt --- a/tests/codet-plugin-tests-906.txt +++ b/tests/codet-plugin-tests-906.txt @@ -5,9 +5,9 @@ GHC.Maybe.Just (ConT (Name (OccName "Just") (NameG (DataName) (PkgName "base") (ModName "GHC.Maybe")))) Main.Foo -(ConT (Name (OccName "Foo") (NameG (TcClsName) (PkgName "main") (ModName "Main")))) +(ConT (Name (OccName "Foo") (NameG (TcClsName) (PkgName "codet-plugin-0.1.0.2-inplace-codet-plugin-tests") (ModName "Main")))) Main.Foo -(ConT (Name (OccName "Foo") (NameG (DataName) (PkgName "main") (ModName "Main")))) +(ConT (Name (OccName "Foo") (NameG (DataName) (PkgName "codet-plugin-0.1.0.2-inplace-codet-plugin-tests") (ModName "Main")))) GHC.Types.List GHC.Types.Int (AppT (ConT (Name (OccName "List") (NameG (TcClsName) (PkgName "ghc-prim") (ModName "GHC.Types")))) (ConT (Name (OccName "Int") (NameG (TcClsName) (PkgName "ghc-prim") (ModName "GHC.Types"))))) GHC.Show.Show diff --git a/tests/codet-plugin-tests-910.txt b/tests/codet-plugin-tests-910.txt --- a/tests/codet-plugin-tests-910.txt +++ b/tests/codet-plugin-tests-910.txt @@ -5,9 +5,9 @@ GHC.Internal.Maybe.Just (ConT (Name (OccName "Just") (NameG (DataName) (PkgName "ghc-internal") (ModName "GHC.Internal.Maybe")))) Main.Foo -(ConT (Name (OccName "Foo") (NameG (TcClsName) (PkgName "main") (ModName "Main")))) +(ConT (Name (OccName "Foo") (NameG (TcClsName) (PkgName "codet-plugin-0.1.0.2-inplace-codet-plugin-tests") (ModName "Main")))) Main.Foo -(ConT (Name (OccName "Foo") (NameG (DataName) (PkgName "main") (ModName "Main")))) +(ConT (Name (OccName "Foo") (NameG (DataName) (PkgName "codet-plugin-0.1.0.2-inplace-codet-plugin-tests") (ModName "Main")))) GHC.Types.List GHC.Types.Int (AppT (ConT (Name (OccName "List") (NameG (TcClsName) (PkgName "ghc-prim") (ModName "GHC.Types")))) (ConT (Name (OccName "Int") (NameG (TcClsName) (PkgName "ghc-prim") (ModName "GHC.Types"))))) GHC.Internal.Show.Show diff --git a/tests/codet-plugin-tests-914.txt b/tests/codet-plugin-tests-914.txt new file mode 100644 --- /dev/null +++ b/tests/codet-plugin-tests-914.txt @@ -0,0 +1,22 @@ +GHC.Internal.Types.Int +(ConT (Name (OccName "Int") (NameG (TcClsName) (PkgName "ghc-internal") (ModName "GHC.Internal.Types")))) +GHC.Internal.Data.Proxy.Proxy +(ConT (Name (OccName "Proxy") (NameG (TcClsName) (PkgName "ghc-internal") (ModName "GHC.Internal.Data.Proxy")))) +GHC.Internal.Maybe.Just +(ConT (Name (OccName "Just") (NameG (DataName) (PkgName "ghc-internal") (ModName "GHC.Internal.Maybe")))) +Main.Foo +(ConT (Name (OccName "Foo") (NameG (TcClsName) (PkgName "codet-plugin-0.1.0.2-inplace-codet-plugin-tests") (ModName "Main")))) +Main.Foo +(ConT (Name (OccName "Foo") (NameG (DataName) (PkgName "codet-plugin-0.1.0.2-inplace-codet-plugin-tests") (ModName "Main")))) +GHC.Internal.Types.List GHC.Internal.Types.Int +(AppT (ConT (Name (OccName "List") (NameG (TcClsName) (PkgName "ghc-internal") (ModName "GHC.Internal.Types")))) (ConT (Name (OccName "Int") (NameG (TcClsName) (PkgName "ghc-internal") (ModName "GHC.Internal.Types"))))) +GHC.Internal.Show.Show +(ConT (Name (OccName "Show") (NameG (TcClsName) (PkgName "ghc-internal") (ModName "GHC.Internal.Show")))) +1 +(LitT (NumTyLit (1))) +"string" +(LitT (StrTyLit "string")) +'c' +(LitT (CharTyLit ('c'))) +GHC.Internal.Types.Int +(ConT (Name (OccName "Int") (NameG (TcClsName) (PkgName "ghc-internal") (ModName "GHC.Internal.Types")))) diff --git a/tests/codet-plugin-tests.hs b/tests/codet-plugin-tests.hs --- a/tests/codet-plugin-tests.hs +++ b/tests/codet-plugin-tests.hs @@ -41,6 +41,7 @@ ghcVer :: Int -> Int ghcVer v + | v >= 914 = 914 -- 9.14+ has more stuff defined in GHC.Internal.* (instead of ghc-prim) | v >= 910 = 910 -- 9.10+ has stuff defined in GHC.Internal.* | v >= 906 = 906 -- 9.6+ prints GHC.Types.List, not [] | v >= 902 = 902 -- 9.2+ has Char kind