Lift: move TH to its own file (#4875)

This matches the other classes, so the `Class` file just has the classes and the straightforward instances.
IntersectMBO · Oct 3, 2022 · c606fb6 · c606fb6
1 parent ae9312a
commit c606fb6
Show file tree

Hide file tree

Showing 6 changed files with 618 additions and 600 deletions.
diff --git a/plutus-errors/src/Errors.hs b/plutus-errors/src/Errors.hs
@@ -13,7 +13,7 @@ import PlutusCore.Evaluation.Machine.Exception qualified as PLC
 import PlutusIR.Error qualified as PIR
 import PlutusTx.Code qualified as PTX
 import PlutusTx.Compiler.Error qualified as PTX
-import PlutusTx.Lift.Class qualified as PTX
+import PlutusTx.Lift qualified as PTX
 import UntypedPlutusCore.Evaluation.Machine.Cek qualified as PLC
 
 {- | A collection of error instances which are obsolete, together with their error codes bundled to one instance.

diff --git a/plutus-tx/plutus-tx.cabal b/plutus-tx/plutus-tx.cabal
@@ -89,6 +89,7 @@ library
     PlutusTx.IsData.Instances
     PlutusTx.IsData.TH
     PlutusTx.Lift.Instances
+    PlutusTx.Lift.TH
     PlutusTx.Lift.THUtils
 
   build-depends:

diff --git a/plutus-tx/src/PlutusTx/Lift.hs b/plutus-tx/src/PlutusTx/Lift.hs
@@ -5,7 +5,6 @@
 {-# LANGUAGE ScopedTypeVariables   #-}
 {-# LANGUAGE TypeOperators         #-}
 module PlutusTx.Lift (
-    makeLift,
     safeLift,
     safeLiftProgram,
     safeLiftCode,
@@ -14,12 +13,15 @@ module PlutusTx.Lift (
     liftProgramDef,
     liftCode,
     typeCheckAgainst,
-    typeCode) where
+    typeCode,
+    makeTypeable,
+    makeLift,
+    LiftError(..)) where
 
 import PlutusTx.Code
-import PlutusTx.Lift.Class (makeLift)
 import PlutusTx.Lift.Class qualified as Lift
 import PlutusTx.Lift.Instances ()
+import PlutusTx.Lift.TH (LiftError (..), makeLift, makeTypeable)
 
 import Data.Bifunctor
 import PlutusIR