use explicit export lists

src/Compare.hs

@@ -1,6 +1,8 @@
 {-# language RankNTypes #-}
 
-module Compare (module Compare) where
+module Compare (
+  runShare,
+) where
 
 
 import Data.Char                        (toLower)

src/Examples.hs

@@ -7,6 +7,10 @@ module Examples (
   example4,
   example5,
   threeCircles,
+
+  shareTest1,
+  shareTest2,
+  shareTest3,
 ) where
 
 
@@ -53,3 +57,15 @@ threeCircles :: Drawable a => a
 threeCircles = colored red (solidCircle 1)
              & translated 2 4 (colored green $ solidCircle 1)
              & translated 0 3 (colored yellow $ solidCircle 1)
+
+
+shareTest1 :: Drawable a => a
+shareTest1 = circle 1 & translated 1 2 (circle 1)
+
+
+shareTest2 :: Drawable a => a
+shareTest2 = let c = circle 1 in c & translated 1 2 c
+
+
+shareTest3 :: Drawable a => a
+shareTest3 = let r = rectangle 2 3 in r & r

src/HashCons.hs

@@ -1,18 +1,26 @@
 {-# language MultiParamTypeClasses#-}
 {-# language FlexibleContexts #-}
 
-module HashCons (module HashCons) where
+module HashCons (
+  Node(..),
+  NodeId,
+  BiMap,
+  getNodes,
+  hashconsShare,
+) where
 
 
 import Control.Monad.State              (State, get, put, runState)
 import Data.List                        (elemIndex)
 import Data.Text                        (Text)
 
 import API                              (Drawable(..))
-import Types                            (Color, Font, NodeId, Point, TextStyle)
+import Types                            (Color, Font, Point, TextStyle)
 
 
 
+type NodeId = Int
+
 data Node
   = RectangleNode Double Double
   | ThickRectangleNode Double Double Double
@@ -161,11 +169,3 @@ getNodes n = case n of
   PicturesNode is     -> is
   AndNode i1 i2       -> [i1,i2]
   _                   -> []
-
-
-test1 :: Drawable a => a
-test1 = circle 1 & translated 1 2 (circle 1)
-
-
-test2 :: Drawable a => a
-test2 = let c = circle 1 in c & translated 1 2 c

src/Normalize.hs

@@ -12,7 +12,7 @@ import Data.List.Extra                  (sort)
 import Data.Text                        (Text)
 
 import API                              (Drawable(..))
-import Types                            (Color(..), Point)
+import Types                            (Color, Point)
 import VectorSpace (
   atOriginWithOffset,
   isRectangle,

src/Reify.hs

@@ -1,7 +1,10 @@
 {-# language DeriveTraversable #-}
 {-# language TypeFamilies #-}
 
-module Reify (module Reify) where
+module Reify (
+  ReifyPicture(..),
+  share,
+  ) where
 
 
 import Data.Foldable                    (toList)
@@ -147,7 +150,3 @@ share d = do
 
 mapInsertWith :: [Key] -> IntMap Int -> IntMap Int
 mapInsertWith b m = Prelude.foldr (\x acc-> IM.insertWith (+) x (1 :: Int) acc) m b
-
-
-test :: Drawable a => a
-test = let r = rectangle 2 3 in r & r

src/Trie.hs

@@ -2,7 +2,7 @@
 {-# options_ghc -Wno-orphans #-}
 
 module Trie (
-  module Trie
+  shareGraph,
   ) where
 
 
@@ -16,8 +16,7 @@ import qualified Data.ByteString.Char8  as BS
 import qualified Data.Trie              as T
 
 import API                              (Drawable(..))
-import HashCons                         (Node(..), getNodes)
-import Types                            (NodeId)
+import HashCons                         (Node(..), NodeId, getNodes)
 
 
 

src/Types.hs

@@ -1,14 +1,23 @@
 
 module Types (
-  module Types
+  Point,
+  Vector,
+
+  Color,
+  TextStyle,
+  Font,
+
+  red,
+  green,
+  yellow,
   ) where
 
 
 import Data.Text                        (Text)
 
 
 
-type NodeId = Int
+--type NodeId = Int
 type Point = (Double,Double)
 type Vector = (Double,Double)