From: Nathaniel Wesley Filardo Date: Mon, 12 Nov 2012 16:06:52 +0000 (-0500) Subject: Move from home-grown Proxy to 'tagged' package X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=b35280900f71f84f7cbfb1fe10397cadff2cc7af;p=dyna2 Move from home-grown Proxy to 'tagged' package --- diff --git a/dyna.cabal b/dyna.cabal index 3129776..858f9e0 100644 --- 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 e3731b3..de15c4a 100644 --- 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 e96dd2b..7f14ba9 100644 --- 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 {{{