Implement HasChunkRefs for DQD, UnitalChunk, and CI

Author: Xinlu-Y

code/drasil-lang/lib/Language/Drasil/Chunk/CommonIdea.hs

@@ -14,6 +14,7 @@ module Language.Drasil.Chunk.CommonIdea (
 import Control.Lens (makeLenses, (^.), view)
 
 import Drasil.Database (UID, HasUID(uid), HasChunkRefs(..))
+import qualified Data.Set as Set
 import Utils.Drasil (repUnd)
 
 import Language.Drasil.Chunk.NamedIdea (IdeaDict, nc)
@@ -31,7 +32,11 @@ data CI = CI { _nc' :: IdeaDict, _ab :: String, cdom' :: [UID]}
 makeLenses ''CI
 
 instance HasChunkRefs CI where
-  chunkRefs = const mempty -- FIXME: `chunkRefs` should actually collect the referenced chunks.
+  chunkRefs c = Set.unions
+    [ chunkRefs (c ^. nc')
+    , Set.fromList (cdom c)
+    ]
+  {-# INLINABLE chunkRefs #-}
 
 -- | Finds 'UID' of the 'IdeaDict' used to make the 'CI'.
 instance HasUID        CI where uid  = nc' . uid

code/drasil-lang/lib/Language/Drasil/Chunk/DefinedQuantity.hs

@@ -13,6 +13,7 @@ module Language.Drasil.Chunk.DefinedQuantity (
 import Control.Lens ((^.), makeLenses, view, Getter)
 
 import Drasil.Database (HasChunkRefs(..), HasUID(..))
+import qualified Data.Set as Set
 
 import Language.Drasil.Symbol (HasSymbol(symbol), Symbol (Empty))
 import Language.Drasil.Classes (NamedIdea(term), Idea(getA), Concept, Express(..),
@@ -42,7 +43,11 @@ class DefinesQuantity d where
   defLhs :: Getter d DefinedQuantityDict
 
 instance HasChunkRefs DefinedQuantityDict where
-  chunkRefs = const mempty -- FIXME: `chunkRefs` should actually collect the referenced chunks.
+  chunkRefs d = Set.unions
+    [ chunkRefs (d ^. con)
+    , chunkRefs (d ^. unit')
+    ]
+  {-# INLINABLE chunkRefs #-}
 
 -- | Finds the 'UID' of the 'ConceptChunk' used to make the 'DefinedQuantityDict'.
 instance HasUID        DefinedQuantityDict where uid = con . uid

code/drasil-lang/lib/Language/Drasil/Chunk/Unital.hs

@@ -9,6 +9,7 @@ module Language.Drasil.Chunk.Unital (
 import Control.Lens (makeLenses, view, (^.))
 
 import Drasil.Database (HasUID(..), HasChunkRefs(..))
+import qualified Data.Set as Set
 
 import Language.Drasil.Chunk.Concept (dccWDS,cw)
 import Language.Drasil.Chunk.DefinedQuantity (DefinedQuantityDict, dqd, dqd', dqdWr)
@@ -34,7 +35,11 @@ data UnitalChunk = UC { _defq' :: DefinedQuantityDict
 makeLenses ''UnitalChunk
 
 instance HasChunkRefs UnitalChunk where
-  chunkRefs = const mempty -- FIXME: `chunkRefs` should actually collect the referenced chunks.
+  chunkRefs u = Set.unions
+    [ chunkRefs (u ^. defq')
+    , chunkRefs (u ^. uni)
+    ]
+  {-# INLINABLE chunkRefs #-}
 
 -- | Finds 'UID' of the 'DefinedQuantityDict' used to make the 'UnitalChunk'.
 instance HasUID        UnitalChunk where uid = defq' . uid