Change Data.Drasil to Metadata.Drasil

JacquesCarette · Aug 4, 2023 · 33edb21 · 33edb21
1 parent 5a0ffbd
commit 33edb21
Show file tree

Hide file tree

Showing 20 changed files with 22 additions and 22 deletions.
diff --git a/code/drasil-code/lib/Language/Drasil/Code/Imperative/Build/Import.hs b/code/drasil-code/lib/Language/Drasil/Code/Imperative/Build/Import.hs
@@ -18,7 +18,7 @@ import Data.List (nub)
 import System.FilePath.Posix (takeExtension, takeBaseName)
 import Text.PrettyPrint.HughesPJ (Doc)
 import Utils.Drasil (capitalize)
-import Data.Drasil.DrasilMetaCall (drasilMeta, DrasilMeta(..), watermark)
+import Metadata.Drasil.DrasilMetaCall (drasilMeta, DrasilMeta(..), watermark)
 
 -- | Holds all the needed information to run a program.
 data CodeHarness = Ch {

diff --git a/code/drasil-data/lib/Data/Drasil/Concepts/Computation.hs b/code/drasil-data/lib/Data/Drasil/Concepts/Computation.hs
@@ -8,7 +8,7 @@ import Language.Drasil.Chunk.Concept.NamedCombinators
 import Data.Drasil.Concepts.Documentation (datum, input_, literacy, output_, 
   quantity, type_, value, variable)
 import Data.Drasil.Concepts.Math (parameter)
-import Data.Drasil.Domains (compScience)
+import Metadata.Drasil.Domains (compScience)
 
 algorithm, absTolerance, relTolerance:: ConceptChunk
 algorithm = dcc "algorithm" (cn' "algorithm")

diff --git a/code/drasil-data/lib/Data/Drasil/Concepts/Documentation.hs b/code/drasil-data/lib/Data/Drasil/Concepts/Documentation.hs
@@ -11,7 +11,7 @@ import Language.Drasil hiding (organization, year, label, variable)
 import Language.Drasil.Chunk.Concept.NamedCombinators
 
 import Data.Drasil.Concepts.Math (graph, unit_)
-import Data.Drasil.Domains (documentc, softEng)
+import Metadata.Drasil.Domains (documentc, softEng)
 import Data.Drasil.TheoryConcepts (dataDefn, genDefn, inModel, thModel)
 
 import Control.Lens ((^.))

diff --git a/code/drasil-data/lib/Data/Drasil/Concepts/Math.hs b/code/drasil-data/lib/Data/Drasil/Concepts/Math.hs
@@ -3,7 +3,7 @@ module Data.Drasil.Concepts.Math where
 
 import Language.Drasil hiding (number, norm, matrix)
 import Language.Drasil.ShortHands (lX, lY, lZ)
-import Data.Drasil.Domains (mathematics)
+import Metadata.Drasil.Domains (mathematics)
 import Data.Drasil.Citations (cartesianWiki, lineSource, pointSource)
 import qualified Language.Drasil.Sentence.Combinators as S
 import Language.Drasil.Chunk.Concept.NamedCombinators

diff --git a/code/drasil-data/lib/Data/Drasil/Concepts/Physics.hs b/code/drasil-data/lib/Data/Drasil/Concepts/Physics.hs
@@ -7,7 +7,7 @@ import qualified Language.Drasil.Sentence.Combinators as S
 import qualified Language.Drasil.NounPhrase.Combinators as NP
 import Language.Drasil.Chunk.Concept.NamedCombinators
 
-import Data.Drasil.Domains (mathematics, physics)
+import Metadata.Drasil.Domains (mathematics, physics)
 import Data.Drasil.Concepts.Documentation (property, value)
 import Data.Drasil.Concepts.Math (xComp, xDir, yComp, yDir, point, axis, cartesian)
 import Control.Lens((^.)) --need for parametrization hack

diff --git a/code/drasil-data/lib/Data/Drasil/Software/Products.hs b/code/drasil-data/lib/Data/Drasil/Software/Products.hs
@@ -7,7 +7,7 @@ import Language.Drasil.Chunk.Concept.NamedCombinators
 import Data.Drasil.Concepts.Documentation (game, video, open, source)
 import Data.Drasil.Concepts.Computation (computer)
 import Data.Drasil.Concepts.Software (program)
-import Data.Drasil.Domains (progLanguage)
+import Metadata.Drasil.Domains (progLanguage)
 
 
 prodtcon :: [IdeaDict]

diff --git a/code/drasil-example/dblpend/lib/Drasil/DblPend/Concepts.hs b/code/drasil-example/dblpend/lib/Drasil/DblPend/Concepts.hs
@@ -1,7 +1,7 @@
 module Drasil.DblPend.Concepts where
 
 import Language.Drasil
-import Data.Drasil.Domains (physics)
+import Metadata.Drasil.Domains (physics)
 import Data.Drasil.Concepts.Documentation (first, second_, object)
 import Data.Drasil.Theories.Physics (newtonSLRQD)
 import Language.Drasil.Chunk.Concept.NamedCombinators (compoundNC)

diff --git a/code/drasil-example/gamephysics/lib/Drasil/GamePhysics/Concepts.hs b/code/drasil-example/gamephysics/lib/Drasil/GamePhysics/Concepts.hs
@@ -7,7 +7,7 @@ import Data.Drasil.Concepts.Math (ode)
 import Data.Drasil.Concepts.PhysicalProperties (ctrOfMass)
 import Data.Drasil.Concepts.Physics (threeD, twoD)
 import Data.Drasil.TheoryConcepts (dataDefn, genDefn, inModel, thModel)
-import Data.Drasil.Domains (physics)
+import Metadata.Drasil.Domains (physics)
 
 import Control.Lens ((^.))
 

diff --git a/code/drasil-example/sglpend/lib/Drasil/SglPend/Body.hs b/code/drasil-example/sglpend/lib/Drasil/SglPend/Body.hs
@@ -18,7 +18,7 @@ import Data.Drasil.Concepts.Math (mathcon, mathcon')
 import Data.Drasil.Concepts.Physics (physicCon, physicCon')
 import Data.Drasil.Concepts.PhysicalProperties (mass, len, physicalcon)
 import Data.Drasil.Concepts.Software (program, errMsg)
-import Data.Drasil.Domains (physics)
+import Metadata.Drasil.Domains (physics)
 import Data.Drasil.Software.Products (prodtcon)
 import Data.Drasil.Theories.Physics (newtonSLR)
 import Data.Drasil.TheoryConcepts (inModel)

diff --git a/code/drasil-example/ssp/lib/Drasil/SSP/Defs.hs b/code/drasil-example/ssp/lib/Drasil/SSP/Defs.hs
@@ -1,7 +1,7 @@
 module Drasil.SSP.Defs where --export all of this file
 
 import Language.Drasil
-import Data.Drasil.Domains (civilEng)
+import Metadata.Drasil.Domains (civilEng)
 import Language.Drasil.Chunk.Concept.NamedCombinators
 import qualified Language.Drasil.Sentence.Combinators as S
 

diff --git a/code/drasil-example/swhs/lib/Drasil/SWHS/Concepts.hs b/code/drasil-example/swhs/lib/Drasil/SWHS/Concepts.hs
@@ -8,7 +8,7 @@ import Language.Drasil.Chunk.Concept.NamedCombinators
 import Data.Drasil.Concepts.Documentation (assumption, goalStmt,
   likelyChg, physSyst, requirement, refBy, refName, srs, typUnc, unlikelyChg)
 import Data.Drasil.Concepts.Math (ode, parameter, rightSide)
-import Data.Drasil.Domains (materialEng)
+import Metadata.Drasil.Domains (materialEng)
 import Data.Drasil.TheoryConcepts (dataDefn, genDefn, inModel, thModel)
 
 con :: [ConceptChunk]

diff --git a/code/drasil-example/swhsnopcm/lib/Drasil/SWHSNoPCM/Body.hs b/code/drasil-example/swhsnopcm/lib/Drasil/SWHSNoPCM/Body.hs
@@ -34,7 +34,7 @@ import Data.Drasil.Quantities.Math (gradient, pi_, piConst, surface,
 import Data.Drasil.Quantities.PhysicalProperties (vol, mass, density)
 import Data.Drasil.Quantities.Physics (time, energy, physicscon)
 import Data.Drasil.Software.Products (prodtcon)
-import Data.Drasil.Domains (materialEng)
+import Metadata.Drasil.Domains (materialEng)
 import Data.Drasil.SI_Units (metre, kilogram, second, centigrade, joule, watt,
   fundamentals, derived)
 

diff --git a/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer.hs b/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer.hs
@@ -46,7 +46,7 @@ import Prelude hiding (break,print,last,sqrt,abs,log,exp,sin,cos,tan,asin,acos,
 import Text.PrettyPrint.HughesPJ (Doc, text, empty, render, (<>), (<+>), ($+$),
   space, brackets, parens, isEmpty, rbrace, lbrace, vcat, semi, equals, colon,
   comma)
-import Data.Drasil.DrasilMetaCall(drasilMeta, DrasilMeta(..), watermark)
+import Metadata.Drasil.DrasilMetaCall(drasilMeta, DrasilMeta(..), watermark)
 
 ----------------------------------------
 -- Syntax common to several renderers --

diff --git a/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/SwiftRenderer.hs b/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/SwiftRenderer.hs
@@ -105,7 +105,7 @@ import Data.Maybe (fromMaybe)
 import Text.PrettyPrint.HughesPJ (Doc, text, (<>), (<+>), parens, empty, equals,
   vcat, lbrace, rbrace, braces, brackets, colon, space, doubleQuotes)
 import qualified Text.PrettyPrint.HughesPJ as D (float)
-import Data.Drasil.DrasilMetaCall (drasilMeta, DrasilMeta(..), watermark)
+import Metadata.Drasil.DrasilMetaCall (drasilMeta, DrasilMeta(..), watermark)
 
 swiftExt :: String
 swiftExt = "swift"

diff --git a/...rasil-metadata/lib/Data/Drasil/Domains.hs → ...l-metadata/lib/Metadata/Drasil/Domains.hs b/...rasil-metadata/lib/Data/Drasil/Domains.hs → ...l-metadata/lib/Metadata/Drasil/Domains.hs
@@ -1,5 +1,5 @@
 -- | Defines domains of knowledge for use in Drasil.
-module Data.Drasil.Domains where
+module Metadata.Drasil.Domains where
 
 import Language.Drasil (IdeaDict, mkIdea, cn')
 

diff --git a/...il-metadata/lib/Data/Drasil/DrasilMeta.hs → ...etadata/lib/Metadata/Drasil/DrasilMeta.hs b/...il-metadata/lib/Data/Drasil/DrasilMeta.hs → ...etadata/lib/Metadata/Drasil/DrasilMeta.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE TemplateHaskellQuotes, DeriveLift, DeriveGeneric #-}
-module Data.Drasil.DrasilMeta where
+module Metadata.Drasil.DrasilMeta where
 
 import Data.Aeson (decodeFileStrict, FromJSON, ToJSON)
 import GHC.Generics (Generic)
@@ -22,7 +22,7 @@ instance FromJSON DrasilMeta
 -- | Configures drasilMeta at compile-time
 drasilMetaCfg :: Q Exp
 drasilMetaCfg = do
-  let fp = "lib/Data/Drasil/DrasilMetadata.json"
+  let fp = "lib/Metadata/Drasil/DrasilMetadata.json"
   maybeDM <- runIO (decodeFileStrict fp :: IO (Maybe DrasilMeta))
   addDependentFile fp
   [|fromMaybe (error "could not read in the drasil metadata file") maybeDM|]

diff --git a/...etadata/lib/Data/Drasil/DrasilMetaCall.hs → ...ata/lib/Metadata/Drasil/DrasilMetaCall.hs b/...etadata/lib/Data/Drasil/DrasilMetaCall.hs → ...ata/lib/Metadata/Drasil/DrasilMetaCall.hs
@@ -1,7 +1,7 @@
 {-#LANGUAGE TemplateHaskell#-}
-module Data.Drasil.DrasilMetaCall (drasilMeta, DrasilMeta(..), watermark)where
+module Metadata.Drasil.DrasilMetaCall (drasilMeta, DrasilMeta(..), watermark)where
 
-import Data.Drasil.DrasilMeta (drasilMetaCfg, DrasilMeta(..))
+import Metadata.Drasil.DrasilMeta (drasilMetaCfg, DrasilMeta(..))
 import Data.Maybe (fromMaybe)
 
 

diff --git a/...adata/lib/Data/Drasil/DrasilMetadata.json → ...a/lib/Metadata/Drasil/DrasilMetadata.json b/...adata/lib/Data/Drasil/DrasilMetadata.json → ...a/lib/Metadata/Drasil/DrasilMetadata.json
diff --git a/code/drasil-metadata/package.yaml b/code/drasil-metadata/package.yaml
@@ -23,8 +23,8 @@ ghc-options:
 library:
   source-dirs: lib
   exposed-modules:
-  - Data.Drasil.Domains
-  - Data.Drasil.DrasilMetaCall
+  - Metadata.Drasil.Domains
+  - Metadata.Drasil.DrasilMetaCall
   when:
   - condition: false
     other-modules: Paths_drasil_metadata
diff --git a/code/drasil-theory/lib/Data/Drasil/TheoryConcepts.hs b/code/drasil-theory/lib/Data/Drasil/TheoryConcepts.hs
@@ -2,7 +2,7 @@
 module Data.Drasil.TheoryConcepts where
 
 import Language.Drasil (cn', CI, commonIdeaWithDict)
-import Data.Drasil.Domains (softEng)
+import Metadata.Drasil.Domains (softEng)
 
 -- | These are internal-to-Drasil common ideas, and need to be defined at the 
 -- same time as theories.