#3288: updated function import to Drasil.DocLang

JacquesCarette · May 23, 2024 · fe933ef · fe933ef
1 parent 372c282
commit fe933ef
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/code/drasil-example/gamephysics/lib/Drasil/GamePhysics/Requirements.hs b/code/drasil-example/gamephysics/lib/Drasil/GamePhysics/Requirements.hs
@@ -6,7 +6,7 @@ import Language.Drasil.Chunk.Concept.NamedCombinators
 import qualified Language.Drasil.Sentence.Combinators as S
 
 import qualified Drasil.DocLang.SRS as SRS (solCharSpec)
-import Drasil.Sections.Requirements (mkMaintainableNFR)
+import Drasil.DocLang (mkMaintainableNFR)
 import Data.Drasil.Concepts.Documentation as Doc (body, funcReqDom, input_, 
  nonFuncReqDom, output_, physicalConstraint, physicalSim, property, solutionCharSpec)
 

diff --git a/code/drasil-example/glassbr/lib/Drasil/GlassBR/Requirements.hs b/code/drasil-example/glassbr/lib/Drasil/GlassBR/Requirements.hs
@@ -3,13 +3,12 @@ module Drasil.GlassBR.Requirements (funcReqs, funcReqsTables, inReqDesc, nonfunc
 import Control.Lens ((^.))
 
 import Language.Drasil
-import Drasil.DocLang (inReq, mkQRTuple, mkQRTupleRef, mkValsSourceTable)
+import Drasil.DocLang (inReq, mkQRTuple, mkQRTupleRef, mkValsSourceTable, mkMaintainableNFR)
 import Drasil.DocLang.SRS (datCon, propCorSol)
 import Language.Drasil.Chunk.Concept.NamedCombinators
 import qualified Language.Drasil.NounPhrase.Combinators as NP
 import qualified Language.Drasil.Sentence.Combinators as S
 import Theory.Drasil (DataDefinition)
-import Drasil.Sections.Requirements (mkMaintainableNFR)
 
 import Data.Drasil.Concepts.Computation (inValue)
 import Data.Drasil.Concepts.Documentation (characteristic, code,

diff --git a/code/drasil-example/pdcontroller/lib/Drasil/PDController/Requirements.hs b/code/drasil-example/pdcontroller/lib/Drasil/PDController/Requirements.hs
@@ -3,7 +3,7 @@ module Drasil.PDController.Requirements where
 
 import Data.Drasil.Concepts.Documentation (funcReqDom, nonFuncReqDom, datumConstraint)
 import Drasil.DocLang.SRS (datCon)
-import Drasil.Sections.Requirements (mkMaintainableNFR)
+import Drasil.DocLang (mkMaintainableNFR)
 
 import Drasil.PDController.Concepts
 import Drasil.PDController.IModel

diff --git a/code/drasil-example/projectile/lib/Drasil/Projectile/Requirements.hs b/code/drasil-example/projectile/lib/Drasil/Projectile/Requirements.hs
@@ -4,7 +4,7 @@ import Language.Drasil
 import Drasil.DocLang.SRS (datCon, propCorSol)
 import Language.Drasil.Chunk.Concept.NamedCombinators
 import qualified Language.Drasil.Sentence.Combinators as S
-import Drasil.Sections.Requirements (mkMaintainableNFR)
+import Drasil.DocLang (mkMaintainableNFR)
 
 import Data.Drasil.Concepts.Computation (inValue)
 import Data.Drasil.Concepts.Documentation (code, datumConstraint,

diff --git a/code/drasil-example/ssp/lib/Drasil/SSP/Requirements.hs b/code/drasil-example/ssp/lib/Drasil/SSP/Requirements.hs
@@ -4,9 +4,8 @@ import Language.Drasil
 import Language.Drasil.Chunk.Concept.NamedCombinators
 import qualified Language.Drasil.Sentence.Combinators as S
 
-import Drasil.DocLang (mkInputPropsTable)
+import Drasil.DocLang (mkInputPropsTable, mkMaintainableNFR)
 import Drasil.DocLang.SRS (datCon, propCorSol) 
-import Drasil.Sections.Requirements (mkMaintainableNFR)
 
 import Data.Drasil.Concepts.Computation (inDatum)
 import Data.Drasil.Concepts.Documentation (code,

diff --git a/code/drasil-example/swhs/lib/Drasil/SWHS/Requirements.hs b/code/drasil-example/swhs/lib/Drasil/SWHS/Requirements.hs
@@ -6,9 +6,8 @@ import qualified Language.Drasil.NounPhrase.Combinators as NP
 import qualified Language.Drasil.Sentence.Combinators as S
 import Theory.Drasil (InstanceModel, HasOutput(output))
 
-import Drasil.DocLang (inReq)
+import Drasil.DocLang (inReq, mkMaintainableNFR)
 import Drasil.DocLang.SRS (datCon, propCorSol) 
-import Drasil.Sections.Requirements (mkMaintainableNFR)
 
 import Data.Drasil.Concepts.Computation (inValue)
 import Data.Drasil.Concepts.Documentation (code, condition,