Moved PackageData and package to new file

Author: B-rando1

code/drasil-code/lib/Language/Drasil/Code/FileData.hs

@@ -2,11 +2,9 @@
 {-# LANGUAGE FlexibleContexts #-}
 -- | Defines the underlying data types used in the package extension.
 module Language.Drasil.Code.FileData (FileAndContents(filePath, fileDoc),
-  fileAndContents, hasPathAndDocToFileAndContents, PackageData(packageProg,
-  packageAux), packageData
-) where
+  fileAndContents, hasPathAndDocToFileAndContents) where
 
-import Text.PrettyPrint.HughesPJ (Doc, isEmpty)
+import Text.PrettyPrint.HughesPJ (Doc)
 import Utils.Drasil (HasPathAndDoc(..))
 
 -- | The underlying data type for auxiliary files in all renderers.
@@ -22,10 +20,3 @@ instance HasPathAndDoc FileAndContents Doc where
 
 hasPathAndDocToFileAndContents :: (HasPathAndDoc a Doc) => a -> FileAndContents
 hasPathAndDocToFileAndContents file = fileAndContents (getPath file) (getDoc file)
-
--- | The underlying data type for packages in all renderers.
-data PackageData a = PackD {packageProg :: a, packageAux :: [FileAndContents]}
-
--- | Constructor for package data.
-packageData :: a -> [FileAndContents] -> PackageData a
-packageData p as = PackD p (filter (not . isEmpty . fileDoc) as)

code/drasil-code/lib/Language/Drasil/Code/Imperative/GOOL/ClassInterface.hs

@@ -8,18 +8,17 @@ module Language.Drasil.Code.Imperative.GOOL.ClassInterface (
   -- Typeclasses
   AuxiliarySym(..),
   -- Functions
-  package, sampleInput, auxFromData
+  sampleInput, auxFromData
 ) where
 
 import Text.PrettyPrint.HughesPJ (Doc)
 
-import Drasil.GOOL (ProgData, onCodeList)
+import Drasil.GOOL (ProgData)
 import Language.Drasil.Printers (PrintingInformation)
 
 import Language.Drasil (Expr)
 import Language.Drasil.Code.DataDesc (DataDesc)
-import Language.Drasil.Code.FileData (FileAndContents(..), PackageData,
-  fileAndContents, packageData)
+import Language.Drasil.Code.FileData (FileAndContents(..), fileAndContents)
 import Language.Drasil.Code.FileNames (sampleInputName)
 import Language.Drasil.Choices (Comments, ImplementationType, Verbosity)
 import Language.Drasil.Code.Imperative.WriteInput (makeInputFile)
@@ -56,9 +55,6 @@ class AuxiliarySym r where
 
   auxHelperDoc :: r Doc -> Doc
 
-package :: (Monad r) => ProgData -> [r FileAndContents] -> r (PackageData ProgData)
-package p = onCodeList (packageData p)
-
 sampleInput :: (Applicative r) => PrintingInformation -> DataDesc -> [Expr] ->
   r FileAndContents
 sampleInput db d sd = auxFromData sampleInputName (makeInputFile db d sd)

code/drasil-code/lib/Language/Drasil/Code/Imperative/Generator.hs

@@ -41,11 +41,12 @@ import Language.Drasil.Code.Imperative.Modules (genInputMod, genInputModProc,
   genOutputModProc, genSampleInput)
 import Language.Drasil.Code.Imperative.DrasilState (GenState, DrasilState(..),
   ScopeType(..), designLog, modExportMap, clsDefMap, genICName)
-import Language.Drasil.Code.Imperative.GOOL.ClassInterface (
-  makeSds, AuxiliarySym(..), package)
+import Language.Drasil.Code.Imperative.GOOL.ClassInterface (makeSds,
+  AuxiliarySym(..))
 import Language.Drasil.Code.Imperative.README (ReadMeInfo(..))
-import Language.Drasil.Code.FileData (PackageData(..), FileAndContents(..),
-  fileAndContents, hasPathAndDocToFileAndContents)
+import Language.Drasil.Code.FileData (FileAndContents(..), fileAndContents,
+  hasPathAndDocToFileAndContents)
+import Language.Drasil.Code.PackageData (PackageData(..), package)
 import Language.Drasil.Code.FileNames(sampleInputName)
 import Language.Drasil.Code.ExtLibImport (auxMods, imports, modExports)
 import Language.Drasil.Code.Lang (Lang(..))

code/drasil-code/lib/Language/Drasil/Code/PackageData.hs

@@ -0,0 +1,17 @@
+module Language.Drasil.Code.PackageData (PackageData(packageProg, packageAux),
+  package
+) where
+
+import Language.Drasil.Code.FileData (FileAndContents(..))
+import Text.PrettyPrint.HughesPJ (isEmpty)
+import Drasil.GOOL (ProgData, onCodeList)
+
+-- | The underlying data type for packages in all renderers.
+data PackageData a = PackD {packageProg :: a, packageAux :: [FileAndContents]}
+
+-- | Constructor for package data.
+packageData :: a -> [FileAndContents] -> PackageData a
+packageData p as = PackD p (filter (not . isEmpty . fileDoc) as)
+
+package :: (Monad r) => ProgData -> [r FileAndContents] -> r (PackageData ProgData)
+package p = onCodeList (packageData p)

code/drasil-code/lib/Language/Drasil/GOOL.hs

@@ -5,9 +5,9 @@ module Language.Drasil.GOOL (
   unPP, unJP, unCSP, unCPPP, unSP, unJLP
 ) where
 
-import Language.Drasil.Code.Imperative.GOOL.ClassInterface (AuxiliarySym(..),
-  package)
-import Language.Drasil.Code.FileData (FileAndContents(..), PackageData(..))
+import Language.Drasil.Code.Imperative.GOOL.ClassInterface (AuxiliarySym(..))
+import Language.Drasil.Code.FileData (FileAndContents(..))
+import Language.Drasil.Code.PackageData (PackageData(..), package)
 
 import Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.PythonRenderer (unPP)
 import Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.JavaRenderer (unJP)