diff --git a/code/drasil-code/lib/Language/Drasil/Code/Imperative/Descriptions.hs b/code/drasil-code/lib/Language/Drasil/Code/Imperative/Descriptions.hs index 2f7ce38a2d..4ae700108b 100644 --- a/code/drasil-code/lib/Language/Drasil/Code/Imperative/Descriptions.hs +++ b/code/drasil-code/lib/Language/Drasil/Code/Imperative/Descriptions.hs @@ -15,7 +15,7 @@ import Language.Drasil.Code.Imperative.DrasilState (GenState, DrasilState(..), genICName) import Language.Drasil.Choices (ImplementationType(..), Structure(..), InternalConcept(..)) -import Language.Drasil.CodeSpec (CodeSpec(..)) +import Language.Drasil.CodeSpec (CodeSpec(..), sysInfo) import Language.Drasil.Mod (Description) import Language.Drasil.Printers (SingleLine(OneLine), sentenceDoc) @@ -24,6 +24,7 @@ import qualified Data.Map as Map (filter, lookup, null) import Data.Maybe (mapMaybe) import Control.Lens ((^.)) import Control.Monad.State (get) +import SysInfo.Drasil hiding (sysinfodb) -- | Returns a module description based on a list of descriptions of what is -- contained in the module. @@ -40,7 +41,7 @@ unmodularDesc = do implTypeStr Program = "program" implTypeStr Library = "library" return $ show $ sentenceDoc (sysinfodb spec) Implementation OneLine $ capSent $ - foldlSent ([S "a", S (implTypeStr (implType g)), S "to"] ++ purpose spec) + foldlSent ([S "a", S (implTypeStr (implType g)), S "to"] ++ codeSpec g ^. sysInfo .purpose) -- | Returns description of what is contained in the Input Parameters module. -- If user chooses the 'Bundled' input parameter, this module will include the structure for holding the diff --git a/code/drasil-code/lib/Language/Drasil/Code/Imperative/Generator.hs b/code/drasil-code/lib/Language/Drasil/Code/Imperative/Generator.hs index 4b0681fd96..4ce331bafb 100644 --- a/code/drasil-code/lib/Language/Drasil/Code/Imperative/Generator.hs +++ b/code/drasil-code/lib/Language/Drasil/Code/Imperative/Generator.hs @@ -32,7 +32,7 @@ import Language.Drasil.Code.Lang (Lang(..)) import Language.Drasil.Choices (Choices(..), Modularity(..), Architecture(..), Visibility(..), DataInfo(..), Constraints(..), choicesSent, DocConfig(..), LogConfig(..), OptionalFeatures(..), InternalConcept(..)) -import Language.Drasil.CodeSpec (CodeSpec(..), getODE) +import Language.Drasil.CodeSpec (CodeSpec(..), getODE, sysInfo) import Language.Drasil.Printers (SingleLine(OneLine), sentenceDoc) import Drasil.GOOL (OOProg, VisibilityTag(..), @@ -40,6 +40,7 @@ import Drasil.GOOL (OOProg, VisibilityTag(..), import qualified Drasil.GOOL as OO (GSProgram, SFile, ProgramSym(..), unCI) import Drasil.GProc (ProcProg) import qualified Drasil.GProc as Proc (GSProgram, SFile, ProgramSym(..), unCI) +import SysInfo.Drasil hiding (sysinfodb) import System.Directory (setCurrentDirectory, createDirectoryIfMissing, getCurrentDirectory) @@ -149,13 +150,13 @@ genPackage unRepr = do -- prps = show $ sentenceDoc db Implementation OneLine -- (foldlSent $ purpose $ codeSpec g) prps = show $ sentenceDoc db Implementation OneLine - (foldlSent $ sysInfo ^. purpose) + (foldlSent $ codeSpec g ^. sysInfo .purpose) bckgrnd = show $ sentenceDoc db Implementation OneLine - (foldlSent $ background $ codeSpec g) + (foldlSent $ codeSpec g ^. sysInfo . background) mtvtn = show $ sentenceDoc db Implementation OneLine - (foldlSent $ motivation $ codeSpec g) + (foldlSent $ codeSpec g ^. sysInfo . motivation) scp = show $ sentenceDoc db Implementation OneLine - (foldlSent $ scope $ codeSpec g) + (foldlSent $ codeSpec g ^. sysInfo . scope) i <- genSampleInput d <- genDoxConfig s rm <- genReadMe ReadMeInfo { @@ -182,7 +183,7 @@ genProgram = do g <- get ms <- chooseModules $ modular g let n = pName $ codeSpec g - let p = show $ sentenceDoc (sysinfodb $ codeSpec g) Implementation OneLine $ foldlSent $ purpose $ codeSpec g + let p = show $ sentenceDoc (sysinfodb $ codeSpec g) Implementation OneLine $ foldlSent $ codeSpec g ^. sysInfo .purpose return $ OO.prog n p ms -- | Generates either a single module or many modules, based on the users choice @@ -261,13 +262,13 @@ genPackageProc unRepr = do cfp = configFiles $ codeSpec g db = sysinfodb $ codeSpec g prps = show $ sentenceDoc db Implementation OneLine - (foldlSent $ purpose $ codeSpec g) + (foldlSent $ codeSpec g ^. sysInfo .purpose) bckgrnd = show $ sentenceDoc db Implementation OneLine - (foldlSent $ background $ codeSpec g) + (foldlSent $ codeSpec g ^. sysInfo . background) mtvtn = show $ sentenceDoc db Implementation OneLine - (foldlSent $ motivation $ codeSpec g) + (foldlSent $ codeSpec g ^. sysInfo . motivation) scp = show $ sentenceDoc db Implementation OneLine - (foldlSent $ scope $ codeSpec g) + (foldlSent $ codeSpec g ^. sysInfo . scope) i <- genSampleInput d <- genDoxConfig s rm <- genReadMe ReadMeInfo { @@ -294,7 +295,7 @@ genProgramProc = do g <- get ms <- chooseModulesProc $ modular g let n = pName $ codeSpec g - let p = show $ sentenceDoc (sysinfodb $ codeSpec g) Implementation OneLine $ foldlSent $ purpose $ codeSpec g + let p = show $ sentenceDoc (sysinfodb $ codeSpec g) Implementation OneLine $ foldlSent $ codeSpec g ^. sysInfo .purpose return $ Proc.prog n p ms -- | Generates either a single module or many modules, based on the users choice diff --git a/code/drasil-docLang/lib/Drasil/DocumentLanguage/TraceabilityGraph.hs b/code/drasil-docLang/lib/Drasil/DocumentLanguage/TraceabilityGraph.hs index 38ae6659fa..631af4344f 100644 --- a/code/drasil-docLang/lib/Drasil/DocumentLanguage/TraceabilityGraph.hs +++ b/code/drasil-docLang/lib/Drasil/DocumentLanguage/TraceabilityGraph.hs @@ -4,7 +4,7 @@ module Drasil.DocumentLanguage.TraceabilityGraph where import Language.Drasil import Database.Drasil hiding (cdb) -import SysInfo.Drasil +import SysInfo.Drasil hiding (purpose) import Control.Lens ((^.)) import qualified Data.Map as Map import Drasil.DocumentLanguage.TraceabilityMatrix (TraceViewCat, traceMReferees, traceMReferrers, diff --git a/code/drasil-docLang/lib/Drasil/DocumentLanguage/TraceabilityMatrix.hs b/code/drasil-docLang/lib/Drasil/DocumentLanguage/TraceabilityMatrix.hs index ddb2b24aa6..a50cca8efc 100644 --- a/code/drasil-docLang/lib/Drasil/DocumentLanguage/TraceabilityMatrix.hs +++ b/code/drasil-docLang/lib/Drasil/DocumentLanguage/TraceabilityMatrix.hs @@ -4,7 +4,7 @@ module Drasil.DocumentLanguage.TraceabilityMatrix where import Language.Drasil import Database.Drasil hiding (cdb) -import SysInfo.Drasil +import SysInfo.Drasil hiding (purpose) import qualified Language.Drasil.Sentence.Combinators as S import Data.Drasil.Concepts.Documentation (purpose, component, dependency,