Move from home-grown Proxy to 'tagged' package

diff --git a/dyna.cabal b/dyna.cabal
index 3129776e47a02c738ba3e26ea61810ab5029eba7..858f9e0a411331ba2503f7b45cfbe8ccb0f5cb32 100644 (file)
--- a/dyna.cabal
+++ b/dyna.cabal
@@ -45,6 +45,7 @@ Library
                         parsers >=0.2,
                         reducers >=3.0,
                         semigroups >=0.8,
+                        tagged >= 0.4.4,
                         template-haskell,
                         trifecta >=0.90,
                         unification-fd,
@@ -68,6 +69,7 @@ Executable drepl
                         parsers >=0.2,
                         reducers >=3.0,
                         semigroups >=0.8,
+                        tagged >= 0.4.4,
                         trifecta >=0.90,
                         unordered-containers>=0.2,
                         utf8-string >=0.3,
@@ -93,6 +95,7 @@ Test-suite dyna-selftests
                         parsers >=0.2,
                         reducers >=3.0,
                         semigroups >=0.8,
+                        tagged >= 0.4.4,
                         template-haskell,
                         test-framework >=0.6,
                         test-framework-hunit >=0.2,

diff --git a/src/Dyna/BackendK3/AST.hs b/src/Dyna/BackendK3/AST.hs
index e3731b3eb28a213af7740eae45c5dad24d55f74d..de15c4a5c9c550a46f9d3ac6f3316b7d89675908 100644 (file)
--- a/src/Dyna/BackendK3/AST.hs
+++ b/src/Dyna/BackendK3/AST.hs
@@ -64,6 +64,7 @@ module Dyna.BackendK3.AST (
     Decl(..), DKind(..), mkdecl, mkfdecl, asCollR, asRefR
 ) where
 
+import           Data.Proxy
 import           Data.Word
 import           GHC.Prim (Constraint)
 -- import           Language.Haskell.TH (varT, mkName)

diff --git a/src/Dyna/XXX/HList.hs b/src/Dyna/XXX/HList.hs
index e96dd2b771e64629cb3575213f5dabc77cced9a9..7f14ba9f3d9aa101bad4cd8aeff7c22fd5a1bfe5 100644 (file)
--- a/src/Dyna/XXX/HList.hs
+++ b/src/Dyna/XXX/HList.hs
@@ -18,8 +18,6 @@
 {-# LANGUAGE UndecidableInstances #-}
 
 module Dyna.XXX.HList(
-  -- * Proxy
-  Proxy(..),
   -- * Type-level functions on lifted lists
   Append, Map, MapConstraint,
 
@@ -36,14 +34,6 @@ module Dyna.XXX.HList(
 import           Control.Applicative
 import           GHC.Prim (Constraint)
 
-------------------------------------------------------------------------}}}
--- Proxy                                                                {{{
-
--- | Capture a type-constructor as data.
---
--- /Good luck!  I am behind seven/.
-data Proxy (r :: k) = Proxy
-
 ------------------------------------------------------------------------}}}
 -- Type-level functions                                                 {{{