Export the plugin in LiquidHaskell

This commit re-exports the source plugin under the 'LiquidHaskell' module, so that users can simply use `-fplugin=LiquidHaskell`.
YoshikiTakashima · Jun 8, 2020 · baf82a2 · baf82a2
1 parent eaf8a5c
commit baf82a2
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 12 deletions.
diff --git a/liquid-base/liquid-base.cabal b/liquid-base/liquid-base.cabal
@@ -104,4 +104,4 @@ library
   default-extensions: PackageImports
                       NoImplicitPrelude
   if impl(ghc >= 8.10)
-    ghc-options: -fplugin=Language.Haskell.Liquid.GHC.Plugin 
+    ghc-options: -fplugin=LiquidHaskell
diff --git a/liquid-bytestring/liquid-bytestring.cabal b/liquid-bytestring/liquid-bytestring.cabal
@@ -33,4 +33,4 @@ library
   default-language:   Haskell98
   default-extensions: PackageImports
   if impl(ghc >= 8.10)
-    ghc-options: -fplugin=Language.Haskell.Liquid.GHC.Plugin 
+    ghc-options: -fplugin=LiquidHaskell
diff --git a/liquid-containers/liquid-containers.cabal b/liquid-containers/liquid-containers.cabal
@@ -24,4 +24,4 @@ library
   default-language:   Haskell98
   default-extensions: PackageImports
   if impl(ghc >= 8.10)
-    ghc-options: -fplugin=Language.Haskell.Liquid.GHC.Plugin 
+    ghc-options: -fplugin=LiquidHaskell
diff --git a/liquid-ghc-prim/liquid-ghc-prim.cabal b/liquid-ghc-prim/liquid-ghc-prim.cabal
@@ -34,4 +34,4 @@ library
                       NoImplicitPrelude
                       MagicHash
   if impl(ghc >= 8.10)
-    ghc-options: -fplugin=Language.Haskell.Liquid.GHC.Plugin
+    ghc-options: -fplugin=LiquidHaskell
diff --git a/liquid-parallel/liquid-parallel.cabal b/liquid-parallel/liquid-parallel.cabal
@@ -23,4 +23,4 @@ library
   default-language:   Haskell98
   default-extensions: PackageImports
   if impl(ghc >= 8.10)
-    ghc-options: -fplugin=Language.Haskell.Liquid.GHC.Plugin 
+    ghc-options: -fplugin=LiquidHaskell
diff --git a/liquid-platform/src/Liquid.hs b/liquid-platform/src/Liquid.hs
@@ -63,7 +63,7 @@ main = do
 
   let p = proc ghcPath $ [ "-O0"
                          , "-no-link"
-                         , "-fplugin=Language.Haskell.Liquid.GHC.Plugin"
+                         , "-fplugin=LiquidHaskell"
                          , "-plugin-package", "liquidhaskell"
                          , "-package", "liquid-ghc-prim"
                          , "-package", "liquid-base"
@@ -76,9 +76,9 @@ main = do
                          , "-hide-package", "containers"
                          , "-hide-package", "vector"
                          , "-hide-package", "bytestring"
-                         , "-fplugin-opt=Language.Haskell.Liquid.GHC.Plugin:--normal" -- normal logging.
+                         , "-fplugin-opt=LiquidHaskell:--normal" -- normal logging.
                          ]
-                         <> map (mappend "-fplugin-opt=Language.Haskell.Liquid.GHC.Plugin:") liquidArgs
+                         <> map (mappend "-fplugin-opt=LiquidHaskell:") liquidArgs
                          <> ghcArgs
                          <> targets
 

diff --git a/liquid-prelude/liquid-prelude.cabal b/liquid-prelude/liquid-prelude.cabal
@@ -31,4 +31,4 @@ library
                     , liquidhaskell        >= 0.8.10.1
   default-language:   Haskell98
   if impl(ghc >= 8.10)
-    ghc-options: -fplugin=Language.Haskell.Liquid.GHC.Plugin 
+    ghc-options: -fplugin=LiquidHaskell
diff --git a/liquid-vector/liquid-vector.cabal b/liquid-vector/liquid-vector.cabal
@@ -28,4 +28,4 @@ library
   default-language:   Haskell98
   default-extensions: PackageImports
   if impl(ghc >= 8.10)
-    ghc-options: -fplugin=Language.Haskell.Liquid.GHC.Plugin 
+    ghc-options: -fplugin=LiquidHaskell
diff --git a/src/Language/Haskell/Liquid/GHC/Plugin/Tutorial.hs b/src/Language/Haskell/Liquid/GHC/Plugin/Tutorial.hs
@@ -58,7 +58,7 @@ library
         liquid-base
       , liquidhaskell
   default-language: Haskell2010
-  ghc-options: -fplugin=Language.Haskell.Liquid.GHC.Plugin  -- Add this!
+  ghc-options: -fplugin=LiquidHaskell  -- Add this!
 @
 
 We will talk about the use (and need) for @liquid-base@ in the next section, but let's ignore it for now.
@@ -150,7 +150,7 @@ For example let's image we want to skip verification of our 'Toy.A' module. At t
     name:           toy-package-a
       ..
       default-language: Haskell2010
-      ghc-options: -fplugin=Language.Haskell.Liquid.GHC.Plugin -fplugin-opt=Language.Haskell.Liquid.GHC.Plugin:--compilespec
+      ghc-options: -fplugin=LiquidHaskell -fplugin-opt=LiquidHaskell:--compilespec
     @
 
 -}

diff --git a/src/LiquidHaskell.hs b/src/LiquidHaskell.hs
@@ -1,7 +1,10 @@
 module LiquidHaskell (
     -- * LiquidHaskell Specification QuasiQuoter
     lq
+    -- * LiquidHaskell as a compiler plugin
+  , plugin
   ) where
 
 import Language.Haskell.Liquid.UX.QuasiQuoter
+import Language.Haskell.Liquid.GHC.Plugin (plugin)