Merge pull request #2267 from ucsd-progsys/fd/rm-liquid-platform

Remove liquid-patform
ucsd-progsys · Feb 5, 2024 · b5d1e99 · b5d1e99
2 parents 77895fa + 1bc0957
commit b5d1e99
Show file tree

Hide file tree

Showing 24 changed files with 214 additions and 908 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -65,7 +65,7 @@ commands:
             echo 'export PATH=~/.ghcup/bin:$PATH' >> $BASH_ENV
             << parameters.cabal_update_command >>
             cabal v2-clean
-            cabal v2-build --project-file << parameters.project_file >> --flag devel -j --enable-tests liquidhaskell-boot liquid-prelude liquid-parallel liquid-vector liquid-platform test-driver
+            cabal v2-build --project-file << parameters.project_file >> --flag devel -j --enable-tests liquidhaskell-boot liquid-prelude liquid-parallel liquid-vector test-driver
       - save_cache:
           key: cabal-cache-v3-{{ checksum "liquidhaskell-boot/liquidhaskell-boot.cabal" }}-{{ checksum "liquidhaskell.cabal" }}-{{ checksum "<< parameters.project_file >>" }}-{{ checksum "liquid-fixpoint-commit" }}
           paths:
@@ -155,7 +155,6 @@ jobs:
         - stack_build_and_test:
             stack_yaml_file: "stack.yaml"
             extra_build_flags: "--flag liquidhaskell-boot:devel"
-            extra_test_flags: " liquid-platform:liquidhaskell "
   cabal_900:
     machine:
       image: ubuntu-2004:202107-02

diff --git a/INSTALL.md b/INSTALL.md
diff --git a/README.md b/README.md
@@ -44,6 +44,18 @@ If you have further questions or you just need help, you can always reach out on
 
 For those diving into the implementation of LiquidHaskell, here are a few tips:
 
+## Running the pluging on individual files
+
+```
+stack build liquidhaskell
+stack exec ghc -- -fplugin=LiquidHaskell FILE.hs
+```
+
+```
+cabal build liquidhaskell
+cabal exec ghc -- -fplugin=LiquidHaskell FILE.hs
+```
+
 ## Fast (re)compilation
 
 When working on the `liquidhaskell-boot` library, usually all we want is to make changes and quickly recompile

diff --git a/cabal.project b/cabal.project
@@ -5,7 +5,6 @@ packages: .
           ./liquid-parallel
           ./liquid-prelude
           ./liquid-vector
-          ./liquid-platform
           ./liquidhaskell-boot
           ./tests
           ./tests/benchmarks/popl18/lib
@@ -33,6 +32,3 @@ package liquidhaskell
 
 package liquidhaskell-boot
   ghc-options: -j
-
-package liquid-platform
-  flags: +devel
diff --git a/liquid-platform/LICENSE b/liquid-platform/LICENSE
diff --git a/liquid-platform/liquid-platform.cabal b/liquid-platform/liquid-platform.cabal
diff --git a/liquid-platform/src/Liquid.hs b/liquid-platform/src/Liquid.hs
diff --git a/liquidhaskell-boot/include/CoreToLogic.lg b/liquidhaskell-boot/include/CoreToLogic.lg
diff --git a/liquidhaskell-boot/liquidhaskell-boot.cabal b/liquidhaskell-boot/liquidhaskell-boot.cabal
@@ -15,9 +15,6 @@ homepage:           https://github.com/ucsd-progsys/liquidhaskell
 build-type:         Simple
 tested-with:        GHC == 9.6.3
 
-data-files:         include/CoreToLogic.lg
-                    syntax/liquid.css
-
 source-repository head
   type:     git
   location: https://github.com/ucsd-progsys/liquidhaskell/
@@ -47,6 +44,7 @@ library
                       Language.Haskell.Liquid.Bare.Slice
                       Language.Haskell.Liquid.Bare.Typeclass
                       Language.Haskell.Liquid.Bare.Elaborate
+                      Language.Haskell.Liquid.CSS
                       Language.Haskell.Liquid.Constraint.Constraint
                       Language.Haskell.Liquid.Constraint.Env
                       Language.Haskell.Liquid.Constraint.Fresh
@@ -63,6 +61,7 @@ library
                       Liquid.GHC.API
                       Liquid.GHC.API.Extra
                       Liquid.GHC.API.StableModule
+                      Language.Haskell.Liquid.GHC.CoreToLogic
                       Language.Haskell.Liquid.GHC.Interface
                       Language.Haskell.Liquid.GHC.Logging
                       Language.Haskell.Liquid.GHC.Misc