From 80f41496c3f7bf7855f2fd1f52bdd4c494f54022 Mon Sep 17 00:00:00 2001 From: Boyd Stephen Smith Jr Date: Wed, 27 Nov 2013 16:34:40 -0600 Subject: [PATCH] Restore long-form import/export to improve documentation. --- src/Cryptsy/API/Public.hs | 24 +++++++++++++++-------- src/Cryptsy/API/Public/Market.hs | 7 ++++--- src/Cryptsy/API/Public/OrderData.hs | 9 ++++++--- src/Cryptsy/API/Public/Types.hs | 31 ++++++++++++++++++++++-------- src/Cryptsy/API/Public/Types/Market.hs | 13 ++++++++----- src/Cryptsy/API/Public/Types/MarketData.hs | 8 ++++++-- 6 files changed, 63 insertions(+), 29 deletions(-) rewrite src/Cryptsy/API/Public.hs (99%) rewrite src/Cryptsy/API/Public/Types.hs (94%) diff --git a/src/Cryptsy/API/Public.hs b/src/Cryptsy/API/Public.hs dissimilarity index 99% index a94174e..613e972 100644 --- a/src/Cryptsy/API/Public.hs +++ b/src/Cryptsy/API/Public.hs @@ -1,8 +1,16 @@ -module Cryptsy.API.Public (module X) where - --- this package -import Cryptsy.API.Public.Market as X -import Cryptsy.API.Public.MarketData.New as X -import Cryptsy.API.Public.MarketData.Old as X -import Cryptsy.API.Public.OrderBook as X -import Cryptsy.API.Public.OrderData as X +module Cryptsy.API.Public + ( module Cryptsy.API.Public.Types + , module Cryptsy.API.Public.MarketData.Old + , module Cryptsy.API.Public.MarketData.New + , module Cryptsy.API.Public.Market + , module Cryptsy.API.Public.OrderData + , module Cryptsy.API.Public.OrderBook + ) +where + +import Cryptsy.API.Public.Market +import Cryptsy.API.Public.MarketData.New +import Cryptsy.API.Public.MarketData.Old +import Cryptsy.API.Public.OrderBook +import Cryptsy.API.Public.OrderData +import Cryptsy.API.Public.Types diff --git a/src/Cryptsy/API/Public/Market.hs b/src/Cryptsy/API/Public/Market.hs index 6662092..f76079a 100644 --- a/src/Cryptsy/API/Public/Market.hs +++ b/src/Cryptsy/API/Public/Market.hs @@ -1,7 +1,8 @@ {-# LANGUAGE FlexibleContexts, ViewPatterns #-} module Cryptsy.API.Public.Market ( module Cryptsy.API.Public.Market - , module X + , module Cryptsy.API.Public.Types.Market + , module Cryptsy.API.Public.Types.Monad ) where @@ -16,8 +17,8 @@ import Data.HashMap.Strict (toList) -- this package import Cryptsy.API.Public.Internal -import Cryptsy.API.Public.Types.Market as X -import Cryptsy.API.Public.Types.Monad as X +import Cryptsy.API.Public.Types.Market +import Cryptsy.API.Public.Types.Monad -- |single market API request singleMarket :: FromJSON (GMarket p q dt t) diff --git a/src/Cryptsy/API/Public/OrderData.hs b/src/Cryptsy/API/Public/OrderData.hs index b7e061c..9fdd37b 100644 --- a/src/Cryptsy/API/Public/OrderData.hs +++ b/src/Cryptsy/API/Public/OrderData.hs @@ -1,7 +1,9 @@ {-# LANGUAGE FlexibleContexts, UndecidableInstances #-} module Cryptsy.API.Public.OrderData ( module Cryptsy.API.Public.OrderData - , module X + , module Cryptsy.API.Public.Types.OrderBook + , module Cryptsy.API.Public.Types.Monad + , module Cryptsy.API.Public.Types.Num ) where @@ -25,8 +27,9 @@ import Data.HashMap.Strict (HashMap) -- this package import Cryptsy.API.Public.Internal -import Cryptsy.API.Public.Types.OrderBook as X -import Cryptsy.API.Public.Types.Monad as X +import Cryptsy.API.Public.Types.OrderBook +import Cryptsy.API.Public.Types.Monad +import Cryptsy.API.Public.Types.Num -- |general order data parameterized by types for prices, quantities, -- and totals (price * quantity) diff --git a/src/Cryptsy/API/Public/Types.hs b/src/Cryptsy/API/Public/Types.hs dissimilarity index 94% index e532178..755a6a0 100644 --- a/src/Cryptsy/API/Public/Types.hs +++ b/src/Cryptsy/API/Public/Types.hs @@ -1,8 +1,23 @@ -module Cryptsy.API.Public.Types (module X) where - --- this package -import Cryptsy.API.Public.Types.Error as X -import Cryptsy.API.Public.Types.Market as X -import Cryptsy.API.Public.Types.MarketData as X -import Cryptsy.API.Public.Types.Monad as X -import Cryptsy.API.Public.Types.OrderBook as X +module Cryptsy.API.Public.Types + ( module Cryptsy.API.Public.Types.Error + , module Cryptsy.API.Public.Types.Market + , module Cryptsy.API.Public.Types.MarketData + , module Cryptsy.API.Public.Types.Monad + , module Cryptsy.API.Public.Types.Num + , module Cryptsy.API.Public.Types.Order + , module Cryptsy.API.Public.Types.OrderBook + , module Cryptsy.API.Public.Types.Time + , module Cryptsy.API.Public.Types.Trade + ) +where + +-- this package +import Cryptsy.API.Public.Types.Error +import Cryptsy.API.Public.Types.Market +import Cryptsy.API.Public.Types.MarketData +import Cryptsy.API.Public.Types.Monad +import Cryptsy.API.Public.Types.Num +import Cryptsy.API.Public.Types.Order +import Cryptsy.API.Public.Types.OrderBook +import Cryptsy.API.Public.Types.Time +import Cryptsy.API.Public.Types.Trade diff --git a/src/Cryptsy/API/Public/Types/Market.hs b/src/Cryptsy/API/Public/Types/Market.hs index ce99641..9f01f52 100644 --- a/src/Cryptsy/API/Public/Types/Market.hs +++ b/src/Cryptsy/API/Public/Types/Market.hs @@ -1,6 +1,9 @@ module Cryptsy.API.Public.Types.Market ( module Cryptsy.API.Public.Types.Market - , module X + , module Cryptsy.API.Public.Types.Num + , module Cryptsy.API.Public.Types.Order + , module Cryptsy.API.Public.Types.Time + , module Cryptsy.API.Public.Types.Trade ) where @@ -21,10 +24,10 @@ import Data.Vector (Vector) -- this package import Cryptsy.API.Public.Types.Internal -import Cryptsy.API.Public.Types.Num as X -import Cryptsy.API.Public.Types.Order as X -import Cryptsy.API.Public.Types.Time as X -import Cryptsy.API.Public.Types.Trade as X +import Cryptsy.API.Public.Types.Num +import Cryptsy.API.Public.Types.Order +import Cryptsy.API.Public.Types.Time +import Cryptsy.API.Public.Types.Trade -- |generalized market data GMarket p q dt t = Market diff --git a/src/Cryptsy/API/Public/Types/MarketData.hs b/src/Cryptsy/API/Public/Types/MarketData.hs index ad2b7a7..6d512b5 100644 --- a/src/Cryptsy/API/Public/Types/MarketData.hs +++ b/src/Cryptsy/API/Public/Types/MarketData.hs @@ -1,7 +1,9 @@ {-# LANGUAGE UndecidableInstances #-} module Cryptsy.API.Public.Types.MarketData ( module Cryptsy.API.Public.Types.MarketData - , module X + , module Cryptsy.API.Public.Types.Market + , module Cryptsy.API.Public.Types.Num + , module Cryptsy.API.Public.Types.Time ) where @@ -22,7 +24,9 @@ import Data.Text (Text) import Data.HashMap.Strict (HashMap) -- this package -import Cryptsy.API.Public.Types.Market as X +import Cryptsy.API.Public.Types.Market +import Cryptsy.API.Public.Types.Num +import Cryptsy.API.Public.Types.Time -- |general market data parameterized by types for prices, quantities, -- date/time values, and totals (price * quantity) -- 2.11.4.GIT