diff --git a/plutus-common/plutus-common.cabal b/plutus-common/plutus-common.cabal index 9372258abc0..02eae338183 100644 --- a/plutus-common/plutus-common.cabal +++ b/plutus-common/plutus-common.cabal @@ -20,7 +20,7 @@ source-repository head library exposed-modules: - PlutusError + Language.Plutus.Common other-modules: hs-source-dirs: src diff --git a/plutus-common/src/PlutusError.hs b/plutus-common/src/Language/Plutus/Common.hs similarity index 79% rename from plutus-common/src/PlutusError.hs rename to plutus-common/src/Language/Plutus/Common.hs index b0d52efd376..1935d7115f8 100644 --- a/plutus-common/src/PlutusError.hs +++ b/plutus-common/src/Language/Plutus/Common.hs @@ -1,4 +1,4 @@ -module PlutusError +module Language.Plutus.Common ( ErrorCode(..) ) where diff --git a/plutus-core/plutus-ir/Language/PlutusIR/Error.hs b/plutus-core/plutus-ir/Language/PlutusIR/Error.hs index b18be1ee91c..a13b3e40178 100644 --- a/plutus-core/plutus-ir/Language/PlutusIR/Error.hs +++ b/plutus-core/plutus-ir/Language/PlutusIR/Error.hs @@ -29,7 +29,7 @@ import Control.Lens import qualified Data.Text as T import Data.Text.Prettyprint.Doc as PP -import PlutusError +import Language.Plutus.Common data TypeErrorExt uni ann = MalformedDataConstrResType diff --git a/plutus-core/plutus-ir/Language/PlutusIR/Parser.hs b/plutus-core/plutus-ir/Language/PlutusIR/Parser.hs index c7859ebbd14..9ee1709db0a 100644 --- a/plutus-core/plutus-ir/Language/PlutusIR/Parser.hs +++ b/plutus-core/plutus-ir/Language/PlutusIR/Parser.hs @@ -42,7 +42,7 @@ import Data.Word import qualified Control.Monad.Combinators.NonEmpty as NE import Text.Megaparsec.Char import qualified Text.Megaparsec.Char.Lexer as Lex -import PlutusError +import Language.Plutus.Common diff --git a/plutus-core/src/Language/PlutusCore/DeBruijn/Internal.hs b/plutus-core/src/Language/PlutusCore/DeBruijn/Internal.hs index f7ae7da7278..c14620f3470 100644 --- a/plutus-core/src/Language/PlutusCore/DeBruijn/Internal.hs +++ b/plutus-core/src/Language/PlutusCore/DeBruijn/Internal.hs @@ -46,7 +46,7 @@ import Numeric.Natural import Control.DeepSeq (NFData) import GHC.Generics -import PlutusError +import Language.Plutus.Common -- | A relative index used for de Bruijn identifiers. newtype Index = Index Natural diff --git a/plutus-core/src/Language/PlutusCore/Error.hs b/plutus-core/src/Language/PlutusCore/Error.hs index fb31445daeb..9e9a2831f5a 100644 --- a/plutus-core/src/Language/PlutusCore/Error.hs +++ b/plutus-core/src/Language/PlutusCore/Error.hs @@ -42,7 +42,7 @@ import Control.Monad.Except import qualified Data.Text as T import Data.Text.Prettyprint.Doc import Data.Text.Prettyprint.Doc.Internal (Doc (Text)) -import PlutusError +import Language.Plutus.Common {- Note [Annotations and equality] Equality of two errors DOES DEPEND on their annotations. So feel free to use @deriving Eq@ for errors. diff --git a/plutus-core/src/Language/PlutusCore/Evaluation/Machine/Cek.hs b/plutus-core/src/Language/PlutusCore/Evaluation/Machine/Cek.hs index 20d29e1c097..5684fb2d59f 100644 --- a/plutus-core/src/Language/PlutusCore/Evaluation/Machine/Cek.hs +++ b/plutus-core/src/Language/PlutusCore/Evaluation/Machine/Cek.hs @@ -73,7 +73,7 @@ import Data.Hashable import Data.HashMap.Monoidal import qualified Data.Map as Map import Data.Text.Prettyprint.Doc -import PlutusError +import Language.Plutus.Common {- Note [Scoping] The CEK machine does not rely on the global uniqueness condition, so the renamer pass is not a diff --git a/plutus-core/src/Language/PlutusCore/Evaluation/Machine/Exception.hs b/plutus-core/src/Language/PlutusCore/Evaluation/Machine/Exception.hs index 83ec5b5bccc..e868115c6f7 100644 --- a/plutus-core/src/Language/PlutusCore/Evaluation/Machine/Exception.hs +++ b/plutus-core/src/Language/PlutusCore/Evaluation/Machine/Exception.hs @@ -43,7 +43,7 @@ import Control.Monad.Except import Data.String (IsString) import Data.Text (Text) import Data.Text.Prettyprint.Doc -import PlutusError +import Language.Plutus.Common -- | When unlifting of a PLC term into a Haskell value fails, this error is thrown. newtype UnliftingError diff --git a/plutus-core/untyped-plutus-core/Language/UntypedPlutusCore/Evaluation/Machine/Cek.hs b/plutus-core/untyped-plutus-core/Language/UntypedPlutusCore/Evaluation/Machine/Cek.hs index e7a5c43c389..02eb4b17756 100644 --- a/plutus-core/untyped-plutus-core/Language/UntypedPlutusCore/Evaluation/Machine/Cek.hs +++ b/plutus-core/untyped-plutus-core/Language/UntypedPlutusCore/Evaluation/Machine/Cek.hs @@ -71,7 +71,7 @@ import Data.Hashable import Data.HashMap.Monoidal import qualified Data.Map as Map import Data.Text.Prettyprint.Doc -import PlutusError +import Language.Plutus.Common {- Note [Scoping] The CEK machine does not rely on the global uniqueness condition, so the renamer pass is not a diff --git a/plutus-errors/src/Errors.hs b/plutus-errors/src/Errors.hs index 5304e503b7c..69ff769a050 100644 --- a/plutus-errors/src/Errors.hs +++ b/plutus-errors/src/Errors.hs @@ -2,7 +2,7 @@ module Errors (errors) where import Language.Haskell.TH -import PlutusError +import Language.Plutus.Common import qualified Language.PlutusIR.Error as PIR import qualified Language.PlutusIR.Parser as PIR diff --git a/plutus-errors/src/TH/Bootstrap.hs b/plutus-errors/src/TH/Bootstrap.hs index cf20c5fd829..21b44cca033 100644 --- a/plutus-errors/src/TH/Bootstrap.hs +++ b/plutus-errors/src/TH/Bootstrap.hs @@ -3,7 +3,7 @@ module TH.Bootstrap ( ) where import Language.Haskell.TH -import PlutusError +import Language.Plutus.Common import Data.Traversable import Data.List import Data.Function diff --git a/plutus-errors/src/TH/Codes.hs b/plutus-errors/src/TH/Codes.hs index b0b8bfbfcaa..edb97c49a6b 100644 --- a/plutus-errors/src/TH/Codes.hs +++ b/plutus-errors/src/TH/Codes.hs @@ -2,7 +2,7 @@ module TH.Codes (genCodes) where import Language.Haskell.TH -import PlutusError +import Language.Plutus.Common genCodes :: [Name] -> Q Exp genCodes ns = listE $ fmap (\ n -> do diff --git a/plutus-tx-plugin/src/Language/PlutusTx/Compiler/Error.hs b/plutus-tx-plugin/src/Language/PlutusTx/Compiler/Error.hs index 925181a2a72..c62aa60b6b2 100644 --- a/plutus-tx-plugin/src/Language/PlutusTx/Compiler/Error.hs +++ b/plutus-tx-plugin/src/Language/PlutusTx/Compiler/Error.hs @@ -29,7 +29,7 @@ import Control.Monad.Except import qualified Data.Text as T import qualified Data.Text.Prettyprint.Doc as PP import Data.Typeable -import PlutusError +import Language.Plutus.Common -- | An error with some (nested) context. The integer argument to 'WithContextC' represents -- the priority of the context when displaying it. Lower numbers are more prioritised. diff --git a/plutus-tx/src/Language/PlutusTx/Code.hs b/plutus-tx/src/Language/PlutusTx/Code.hs index 8570f7d6790..63bf64f4870 100644 --- a/plutus-tx/src/Language/PlutusTx/Code.hs +++ b/plutus-tx/src/Language/PlutusTx/Code.hs @@ -21,7 +21,7 @@ import Control.Exception import qualified Data.ByteString as BS import qualified Data.ByteString.Lazy as BSL -import PlutusError +import Language.Plutus.Common -- NOTE: any changes to this type must be paralleled by changes -- in the plugin code that generates values of this type. That is diff --git a/plutus-tx/src/Language/PlutusTx/Lift/Class.hs b/plutus-tx/src/Language/PlutusTx/Lift/Class.hs index 33b4cb172a9..e4448eb2ce4 100644 --- a/plutus-tx/src/Language/PlutusTx/Lift/Class.hs +++ b/plutus-tx/src/Language/PlutusTx/Lift/Class.hs @@ -52,7 +52,7 @@ import Data.Proxy import qualified Data.Text as T import Data.Traversable import qualified Data.Text.Prettyprint.Doc as PP -import PlutusError +import Language.Plutus.Common import qualified Control.Exception as Prelude (throw, Exception) import qualified Data.Typeable as Prelude