removed refAdd field from Goal and PSD

JacquesCarette · Aug 2, 2018 · 535c446 · JacquesCarette · Aug 2, 2018 · JacquesCarette
1 parent 1ca3090
commit 535c446
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/code/drasil-lang/Language/Drasil/Chunk/Goal.hs b/code/drasil-lang/Language/Drasil/Chunk/Goal.hs
@@ -5,13 +5,12 @@
 module Language.Drasil.Chunk.Goal
   ( Goal
   , mkGoal
-  , refAddr
+  , lbl
   ) where
 
 import Language.Drasil.UID (UID)
 import Language.Drasil.Classes (HasUID(uid))
 import Language.Drasil.Spec (Sentence)
-import Language.Drasil.RefTypes (RefAdd)
 
 import Language.Drasil.Chunk.ShortName (HasShortName(shortname))
 import Language.Drasil.Label.Core (Label)
@@ -23,7 +22,6 @@ import Control.Lens (makeLenses, (^.))
 data Goal = GS
           { _gid :: UID
           , __ :: Sentence -- The goal
-          , _refAddr :: RefAdd
           , _lbl :: Label
           }
 
@@ -35,5 +33,5 @@ instance HasLabel      Goal where getLabel = lbl
 instance HasShortName  Goal where shortname = lbl . shortname
 
 -- | Goal smart constructor
-mkGoal :: String -> Sentence -> RefAdd -> Label -> Goal
+mkGoal :: String -> Sentence -> Label -> Goal
 mkGoal = GS
diff --git a/code/drasil-lang/Language/Drasil/Chunk/PhysSystDesc.hs b/code/drasil-lang/Language/Drasil/Chunk/PhysSystDesc.hs
@@ -6,7 +6,7 @@ module Language.Drasil.Chunk.PhysSystDesc
   ( PhysSystDesc
   , pSysDes
   , psd
-  , refAddr
+  , lbl
   ) where
 
 import Language.Drasil.UID (UID)
@@ -22,7 +22,6 @@ import Control.Lens (makeLenses, (^.))
 data PhysSystDesc = PSD
           { _did        :: UID
           , pSysDes     :: Sentence
-          , _refAddr    :: RefAdd
           , _lbl        :: Label
           }
 
@@ -34,5 +33,5 @@ instance HasLabel      PhysSystDesc where getLabel = lbl
 instance HasShortName  PhysSystDesc where shortname = lbl . shortname
 
 -- | PhysSystDesc smart constructor
-psd :: String -> Sentence -> RefAdd -> Label -> PhysSystDesc
+psd :: String -> Sentence -> Label -> PhysSystDesc
 psd = PSD
diff --git a/code/drasil-lang/Language/Drasil/Reference.hs b/code/drasil-lang/Language/Drasil/Reference.hs
@@ -14,9 +14,9 @@ import Language.Drasil.Chunk.Citation as Ci (BibRef, Citation(citeID), CiteField
 import Language.Drasil.Chunk.Concept (ConceptInstance)
 import Language.Drasil.Chunk.Eq (QDefinition)
 import Language.Drasil.Chunk.GenDefn (GenDefn)
-import Language.Drasil.Chunk.Goal as G (Goal, refAddr)
+import Language.Drasil.Chunk.Goal as G (Goal, lbl)
 import Language.Drasil.Chunk.InstanceModel (InstanceModel)
-import Language.Drasil.Chunk.PhysSystDesc as PD (PhysSystDesc, refAddr)
+import Language.Drasil.Chunk.PhysSystDesc as PD (PhysSystDesc, lbl)
 import Language.Drasil.Chunk.ReqChunk as R (ReqChunk(..), ReqType(FR))
 import Language.Drasil.Chunk.ShortName (HasShortName(shortname), ShortName, getStringSN, shortname')
 import Language.Drasil.Chunk.Theory (TheoryModel)
@@ -193,11 +193,11 @@ class Referable s where
   rType   :: s -> RefType -- The reference type (referencing namespace?)
 
 instance Referable Goal where
-  refAdd g = "GS:" ++ g ^. G.refAddr
+  refAdd g = "GS:" ++ (getAdd ((g ^. G.lbl) ^. getRefAdd))
   rType _ = Goal
 
 instance Referable PhysSystDesc where
-  refAdd p = "PS:" ++ p ^. PD.refAddr
+  refAdd p = "PS:" ++ (getAdd ((p ^. PD.lbl) ^. getRefAdd))
   rType _ = PSD
 
 instance Referable AssumpChunk where
@@ -206,7 +206,7 @@ instance Referable AssumpChunk where
 
 instance Referable ReqChunk where
   refAdd  r@(RC _ rt _ _) = show rt ++ ":" ++ concatMap repUnd (r ^. uid)
-  rType   _                 = Req
+  rType   _               = Req
 
 instance Referable Change where
   refAdd r@(ChC _ rt _ _)    = show rt ++ ":" ++ concatMap repUnd (r ^. uid)