Moved GenDefn to drasil-theory

code/drasil-database/Database/Drasil/ChunkDB.hs

@@ -15,6 +15,7 @@ module Database.Drasil.ChunkDB
   ) where
 
 import Language.Drasil hiding (tm, sec)
+import Theory.Drasil (GenDefn)
 
 import Control.Lens ((^.), makeLenses)
 import Data.List (sortOn)

code/drasil-database/drasil-database.cabal

@@ -24,7 +24,8 @@ library
     MissingH >= 1.4.0.1,
     parsec >= 3.1.9,
     data-fix (>= 0.0.4 && <= 1.0),
-    drasil-lang >= 0.1.60
+    drasil-lang >= 0.1.60,
+    drasil-theory >= 0.1.0
   default-language: Haskell2010
   ghc-options:      -Wall -Wredundant-constraints
 

code/drasil-docLang/Drasil/DocumentLanguage.hs

@@ -13,10 +13,9 @@ import Drasil.DocumentLanguage.Definitions (Fields, ddefn, derivation, instanceM
 import Language.Drasil hiding (Manual, Vector, Verb) -- Manual - Citation name conflict. FIXME: Move to different namespace
                                                -- Vector - Name conflict (defined in file)
 import Language.Drasil.Utils (sortBySymbol)
-import Database.Drasil(SystemInformation(SI), asOrderedList, citeDB,
-  conceptinsTable, termTable, unitTable, _authors,
-  _concepts, _kind, _quants, _sys, _sysinfodb,
-  _usedinfodb)
+import Database.Drasil(SystemInformation(SI), asOrderedList, citeDB, conceptinsTable,
+  termTable, unitTable, _authors, _concepts, _kind, _quants, _sys, _sysinfodb, _usedinfodb)
+import Theory.Drasil (GenDefn)
 
 import Control.Lens ((^.), over)
 import qualified Data.Map as Map (elems)

code/drasil-docLang/Drasil/DocumentLanguage/Definitions.hs

@@ -1,7 +1,7 @@
 {-# Language GADTs #-}
 
-module Drasil.DocumentLanguage.Definitions
-  ( Fields
+module Drasil.DocumentLanguage.Definitions (
+    Fields
   , Field(..)
   , Verbosity(..)
   , tmodel
@@ -11,19 +11,19 @@ module Drasil.DocumentLanguage.Definitions
   , InclUnits(..)
   , helperRefs
   , helpToRefField
-  )where
+) where
 
 import Data.Map (keys)
 import Data.List (elem)
 import Control.Lens ((^.))
 
 import Language.Drasil
-import Database.Drasil(SystemInformation, citeDB, 
-  conceptinsLookup, conceptinsTable, datadefnLookup,
-  dataDefnTable, gendefLookup, gendefTable,
+import Database.Drasil (SystemInformation, citeDB, conceptinsLookup,
+  conceptinsTable, datadefnLookup, dataDefnTable, gendefLookup, gendefTable,
   insmodelLookup, insmodelTable, labelledconLookup, labelledcontentTable,
-  refbyLookup, refbyTable, sectionLookup, sectionTable,
-  theoryModelLookup, theoryModelTable, vars, _sysinfodb)
+  refbyLookup, refbyTable, sectionLookup, sectionTable, theoryModelLookup,
+  theoryModelTable, vars, _sysinfodb)
+import Theory.Drasil (GenDefn)
 
 import Data.Drasil.Utils (eqUnR')
 import Data.Drasil.SentenceStructures (SepType(Comma), FoldType(List), foldlList, foldlSent)

code/drasil-docLang/Drasil/DocumentLanguage/RefHelpers.hs

@@ -1,11 +1,10 @@
 {-# Language Rank2Types #-}
-module Drasil.DocumentLanguage.RefHelpers
-  ( ModelDB, tmRefDB, gdRefDB, ddRefDB, imRefDB
-  , mdb, modelsFromDB
-  ) where
+module Drasil.DocumentLanguage.RefHelpers (ModelDB, tmRefDB, gdRefDB, ddRefDB,
+  imRefDB, mdb, modelsFromDB) where
 
 import Language.Drasil
-import Database.Drasil(RefMap, simpleMap)
+import Database.Drasil (RefMap, simpleMap)
+import Theory.Drasil (GenDefn)
 
 import Data.List (sortBy)
 import Data.Function (on)

code/drasil-docLang/Drasil/ExtractDocDesc.hs

@@ -3,6 +3,7 @@ module Drasil.ExtractDocDesc (getDocDesc, egetDocDesc, ciGetDocDesc) where
 import Control.Lens((^.))
 import Drasil.DocumentLanguage
 import Language.Drasil hiding (Manual, Vector, Verb)
+import Theory.Drasil (GenDefn)
 import Data.List(transpose)
 
 egetDocDesc :: DocDesc -> [Expr]

code/drasil-docLang/Drasil/TraceTable.hs

@@ -13,7 +13,8 @@ import Data.Maybe (mapMaybe)
 
 import Language.Drasil
 import Language.Drasil.Development (lnames')
-import Database.Drasil(TraceMap, traceMap)
+import Database.Drasil (TraceMap, traceMap)
+import Theory.Drasil (GenDefn)
 
 import Drasil.DocumentLanguage
 

code/drasil-docLang/drasil-docLang.cabal

@@ -45,7 +45,8 @@ library
     data-fix (>= 0.0.4 && <= 1.0),
     drasil-lang >= 0.1.59,
     drasil-data >= 0.1.11,
-    drasil-database >= 0.1.0
+    drasil-database >= 0.1.0,
+    drasil-theory >= 0.1.0
   default-language: Haskell2010
   ghc-options:      -Wall -Wredundant-constraints
 

code/drasil-docLang/stack.yaml

@@ -40,6 +40,7 @@ packages:
 - ../drasil-data
 - ../drasil-code
 - ../drasil-database
+- ../drasil-theory
 - ./
 # Dependency packages to be pulled from upstream that are not in the resolver
 # (e.g., acme-missiles-0.3)

code/drasil-example/Drasil/GamePhysics/Body.hs

@@ -7,6 +7,7 @@ import Database.Drasil (ChunkDB, RefbyMap, ReferenceDB, SystemInformation(SI),
   TraceMap, ccss, cdb, collectUnits, generateRefbyMap, rdb, refdb, _authors,
   _concepts, _constants, _constraints, _datadefs, _definitions, _defSequence,
   _inputs, _kind, _outputs, _quants, _sys, _sysinfodb, _usedinfodb)
+import Theory.Drasil (GenDefn)
 
 import Drasil.DocLang (DerivationDisplay(..), DocDesc, DocSection(..), 
   Emphasis(..), Field(..), Fields, InclUnits(IncludeUnits), IntroSec(..), 

code/drasil-example/Drasil/GlassBR/Body.hs

@@ -9,6 +9,7 @@ import Database.Drasil (ChunkDB, RefbyMap, ReferenceDB, SystemInformation(SI),
   TraceMap, cdb, collectUnits, generateRefbyMap, rdb, refdb, _authors,
   _concepts, _constants, _constraints, _datadefs, _definitions, _defSequence,
   _inputs, _kind, _outputs, _quants, _sys, _sysinfodb, _usedinfodb)
+import Theory.Drasil (GenDefn)
 
 import Drasil.DocLang (AppndxSec(..), AuxConstntSec(..), DerivationDisplay(..), 
   DocDesc, DocSection(..), Field(..), Fields, GSDSec(GSDProg2), GSDSub(..), 

code/drasil-example/Drasil/NoPCM/Body.hs

@@ -8,6 +8,7 @@ import Database.Drasil (Block(Parallel), ChunkDB, RefbyMap, ReferenceDB,
   rdb, refdb, _authors, _concepts, _constants, _constraints, _datadefs,
   _definitions, _defSequence, _inputs, _kind, _outputs, _quants, _sys,
   _sysinfodb, _usedinfodb)
+import Theory.Drasil (GenDefn)
 
 import Control.Lens ((^.))
 import qualified Data.Map as Map

code/drasil-example/Drasil/NoPCM/GenDefs.hs

@@ -1,6 +1,7 @@
 module Drasil.NoPCM.GenDefs (rocTempSimp, swhsGDs) where
 
 import Language.Drasil
+import Theory.Drasil (GenDefn, gd)
 
 import Data.Drasil.Concepts.Math (rOfChng, unit_)
 import Data.Drasil.Concepts.Thermodynamics (temp)
@@ -27,7 +28,7 @@ swhsGDs :: [GenDefn]
 swhsGDs = [nwtnCooling, rocTempSimp] 
 
 rocTempSimp :: GenDefn
-rocTempSimp = gd' rocTempSimpRC (Nothing :: Maybe UnitDefn) roc_temp_simp_deriv 
+rocTempSimp = gd rocTempSimpRC (Nothing :: Maybe UnitDefn) roc_temp_simp_deriv 
   [{-S "FIXME: no sources"-}] "rocTempSimp" [rocTempSimp_desc]
 
 roc_temp_simp_deriv :: Derivation

code/drasil-example/Drasil/SSP/Body.hs

@@ -8,6 +8,7 @@ import Database.Drasil (Block(Parallel), ChunkDB, RefbyMap, ReferenceDB,
   rdb, refdb, _authors, _concepts, _constants, _constraints, _datadefs,
   _definitions, _defSequence, _inputs, _kind, _outputs, _quants, _sys,
   _sysinfodb, _usedinfodb)
+import Theory.Drasil (GenDefn)
 
 import Control.Lens ((^.))
 import Prelude hiding (sin, cos, tan)

code/drasil-example/Drasil/SSP/GenDefs.hs

@@ -5,6 +5,7 @@ module Drasil.SSP.GenDefs (normForcEq, bsShrFEq, resShr, mobShr,
 
 import Prelude hiding (sin, cos, tan)
 import Language.Drasil
+import Theory.Drasil (GenDefn, gd)
 
 import Drasil.DocLang.SRS as SRS (physSyst)
 
@@ -42,23 +43,23 @@ generalDefinitions = [normForcEqGD, bsShrFEqGD, resShrGD, mobShrGD,
  effNormFGD, resShearWOGD, mobShearWOGD, normShrRGD, momentEqlGD]
 
 normForcEqGD, bsShrFEqGD, resShrGD, mobShrGD, effNormFGD, resShearWOGD, mobShearWOGD, normShrRGD, momentEqlGD :: GenDefn
-normForcEqGD = gd' normForcEq (getUnit totNrmForce)   [nmFEq_deriv]    
+normForcEqGD = gd normForcEq (getUnit totNrmForce)   [nmFEq_deriv]    
   [makeCite chen2005]                      "normForcEq"  [nmFEq_desc]
-bsShrFEqGD   = gd' bsShrFEq   (getUnit mobShrI)       [bShFEq_deriv]
+bsShrFEqGD   = gd bsShrFEq   (getUnit mobShrI)       [bShFEq_deriv]
   [makeCite chen2005]                      "bsShrFEq"    [bShFEq_desc]
-resShrGD     = gd' resShr     (getUnit shrResI)       [resShr_deriv]   
+resShrGD     = gd resShr     (getUnit shrResI)       [resShr_deriv]   
   [makeCite chen2005]                      "resShr"      [resShr_desc]
-mobShrGD     = gd' mobShr     (getUnit mobShrI)       [mobShr_deriv]   
+mobShrGD     = gd mobShr     (getUnit mobShrI)       [mobShr_deriv]   
   [makeCite chen2005]                      "mobShr"      [mobShr_desc]
-effNormFGD   = gd' effNormF   (getUnit nrmFSubWat)    [effNormF_deriv] 
+effNormFGD   = gd effNormF   (getUnit nrmFSubWat)    [effNormF_deriv] 
   [makeCite chen2005]                      "effNormF"    [effNormF_desc]
-resShearWOGD = gd' resShearWO (getUnit shearRNoIntsl) []         
+resShearWOGD = gd resShearWO (getUnit shearRNoIntsl) []         
   (map makeCite[chen2005, karchewski2012]) "resShearWO"  [resShearWO_desc]
-mobShearWOGD = gd' mobShearWO (getUnit shearFNoIntsl) []
+mobShearWOGD = gd mobShearWO (getUnit shearFNoIntsl) []
   (map makeCite[chen2005, karchewski2012]) "mobShearWO"  [mobShearWO_desc]
-normShrRGD   = gd' normShrR   (getUnit intShrForce)   [] 
+normShrRGD   = gd normShrR   (getUnit intShrForce)   [] 
   [makeCite chen2005]                      "normShrR"    [nmShrR_desc]
-momentEqlGD  = gd' momentEql  (Just newton)           [momEql_deriv]  
+momentEqlGD  = gd momentEql  (Just newton)           [momEql_deriv]  
   [makeCite chen2005]                      "momentEql"   [momEql_desc]
 
 --

code/drasil-example/Drasil/SWHS/Body.hs

@@ -8,6 +8,7 @@ import Database.Drasil (Block, ChunkDB, RefbyMap, ReferenceDB,
   getIdeaDict, rdb, refdb, _authors, _concepts, _constants, _constraints,
   _datadefs, _definitions, _defSequence, _inputs, _kind, _outputs, _quants,
   _sys, _sysinfodb, _usedinfodb)
+import Theory.Drasil (GenDefn)
 
 import Control.Lens ((^.))
 import qualified Data.Map as Map

code/drasil-example/Drasil/SWHS/GenDefs.hs

@@ -4,6 +4,7 @@ module Drasil.SWHS.GenDefs (swhsGDs, nwtnCooling, rocTempSimp,
 import Prelude hiding (sin, cos, tan)
 
 import Language.Drasil
+import Theory.Drasil (GenDefn, gd)
 
 import Data.Drasil.Concepts.Math (equation, rate, rOfChng, unit_)
 import Data.Drasil.Concepts.Thermodynamics (lawConvCooling)
@@ -40,10 +41,10 @@ swhsGDs = [nwtnCooling, rocTempSimp]
 
 -- FIXME: page reference
 nwtnCooling, rocTempSimp :: GenDefn
-nwtnCooling = gd' nwtnCoolingRC (Just thermalFlux) ([] :: Derivation) 
+nwtnCooling = gd nwtnCoolingRC (Just thermalFlux) ([] :: Derivation) 
   [makeCite incroperaEtAl2007 {- +:+ sParen (S "pg. 8") -}] "nwtnCooling" [nwtnCooling_desc]
 
-rocTempSimp = gd' rocTempSimpRC (Nothing :: Maybe UnitDefn) roc_temp_simp_deriv [] -- FIXME: no sources
+rocTempSimp = gd rocTempSimpRC (Nothing :: Maybe UnitDefn) roc_temp_simp_deriv [] -- FIXME: no sources
                  "rocTempSimp" [rocTempSimp_desc]
 
 --

code/drasil-example/drasil-example.cabal

@@ -61,7 +61,8 @@ executable glassbr
     drasil-database >= 0.1.0,
     drasil-printers >= 0.1.8,
     drasil-gen >= 0.1.3,
-    drasil-docLang >= 0.1.23
+    drasil-docLang >= 0.1.23,
+    drasil-theory >= 0.1.0
   default-language: Haskell2010
   ghc-options:      -Wall -Wredundant-constraints
 
@@ -109,7 +110,8 @@ executable nopcm
     drasil-database >= 0.1.0,
     drasil-printers >= 0.1.8,
     drasil-gen >= 0.1.3,
-    drasil-docLang >= 0.1.23
+    drasil-docLang >= 0.1.23,
+    drasil-theory >= 0.1.0
   default-language: Haskell2010
   ghc-options:      -Wall -Wredundant-constraints
 
@@ -146,7 +148,8 @@ executable swhs
     drasil-database >= 0.1.0,
     drasil-printers >= 0.1.8,
     drasil-gen >= 0.1.3,
-    drasil-docLang >= 0.1.23
+    drasil-docLang >= 0.1.23,
+    drasil-theory >= 0.1.0
   default-language: Haskell2010
   ghc-options:      -Wall -Wredundant-constraints
 
@@ -185,7 +188,8 @@ executable ssp
     drasil-database >= 0.1.0,
     drasil-printers >= 0.1.8,
     drasil-gen >= 0.1.3,
-    drasil-docLang >= 0.1.23
+    drasil-docLang >= 0.1.23,
+    drasil-theory >= 0.1.0
   default-language: Haskell2010
   ghc-options:      -Wall -Wredundant-constraints
 
@@ -218,7 +222,8 @@ executable chipmunkdocs
     drasil-database >= 0.1.0,
     drasil-printers >= 0.1.8,
     drasil-gen >= 0.1.3,
-    drasil-docLang >= 0.1.23
+    drasil-docLang >= 0.1.23,
+    drasil-theory >= 0.1.0
   default-language: Haskell2010
   ghc-options:      -Wall -Wredundant-constraints
 

code/drasil-example/stack.yaml

@@ -43,6 +43,7 @@ packages:
 - ../drasil-gen
 - ../drasil-docLang
 - ../drasil-database
+- ../drasil-theory
 - ./
 # Dependency packages to be pulled from upstream that are not in the resolver
 # (e.g., acme-missiles-0.3)

code/drasil-lang/Language/Drasil.hs

@@ -51,7 +51,7 @@ module Language.Drasil (
   -- Chunk.Concept.Core
   , sDom
   -- Chunk.CommonIdea
-  , commonIdea, CI, getAcc, getAccStr, commonIdeaWithDict
+  , commonIdea, CI, getAcc, getAccStr, commonIdeaWithDict, prependAbrv
   -- Chunk.NamedIdea
   , NamedChunk, short, nc, IdeaDict , mkIdea
   , nw -- bad name (historical)
@@ -66,8 +66,6 @@ module Language.Drasil (
   , QDefinition, fromEqn, fromEqn', equat, ec
   -- Chunk.DataDefinition
   , DataDefinition, mkQuantDef, mkDD, qdFromDD
-  -- Chunk.GenDefn
-  , GenDefn, gd', gd''
   -- Chunk.InstanceModel
   , InstanceModel
   , inCons, outCons, imOutput, imInputs, im', im''
@@ -149,7 +147,7 @@ module Language.Drasil (
   -- Reference
   , makeRef2S, makeCite, makeCiteS, makeRef2
   -- Label.Type
-  , getAdd
+  , getAdd, prepend
   , LblType(RP, Citation, URI), IRefProg(..)
   -- Development.Sentence
   , introduceAbb, phrase, plural, phrase's, plural's, at_start, at_start'
@@ -242,7 +240,6 @@ import Language.Drasil.Constraint (physc, sfwrc, enumc, isPhysC, isSfwrC,
 import Language.Drasil.Chunk.DefinedQuantity
 import Language.Drasil.Chunk.Eq (QDefinition, fromEqn, fromEqn', equat, ec)
 import Language.Drasil.Chunk.DataDefinition (DataDefinition, mkQuantDef, mkDD, qdFromDD)
-import Language.Drasil.Chunk.GenDefn
 import Language.Drasil.Chunk.InstanceModel
 import Language.Drasil.Chunk.NamedIdea
 import Language.Drasil.Chunk.Quantity
@@ -280,7 +277,7 @@ import Language.Drasil.People (People, Person, person, HasName(..), manyNames
   , person', personWM, personWM', mononym, name, nameStr, rendPersLFM, 
   rendPersLFM', rendPersLFM'', comparePeople)
 import Language.Drasil.RefProg(Reference(Reference))
-import Language.Drasil.Label.Type (getAdd, LblType(RP, Citation, URI), IRefProg(..))
+import Language.Drasil.Label.Type (getAdd, LblType(RP, Citation, URI), IRefProg(..), prepend)
 
 import Language.Drasil.UnitLang (USymb(US))
 import Language.Drasil.Uncertainty.Core(Uncertainty, uncty)

code/drasil-lang/Language/Drasil/Chunk/README.md

@@ -1,6 +1,6 @@
 ----------------------------------------------------------
 ### Quick Summary of Folder Structure and File Contents
-Last updated: May 1, 2019
+Last updated: May 13, 2019
 ----------------------------------------------------------
 
 **Concept**
@@ -20,19 +20,16 @@ Constrained.hs
   - Defines ConstrainedChunk and ConstrConcept data types
 
 DataDefinition.hs
-  - Defines DataDefinition data type and constructors
+  - Defines DataDefinition data type and constructors *TODO: Move from drasil-lang to drasil-theory*
 
 DefinedQuantity.hs
   - Defines DefinedQuantityDict data type and constructors
 
 Eq.hs
   - Defines QDefinition data type (quantity with units and defining equations)
 
-GenDefn.hs
-  - General Definition chunks *TODO: Move from drasil-lang to drasil-docLang*
-
 InstanceModel.hs
-  - Instance model chunks *TODO: Move from drasil-lang to drasil-docLang*
+  - Instance model chunks *TODO: Move from drasil-lang to drasil-theory*
 
 NamedIdea.hs
   - NamedChunk and IdeaDict data types
@@ -50,7 +47,7 @@ Relation.hs
 
 Theory.hs
   - `Theory` class definition
-  - TheoryChunk and TheoryModel data types *TODO: Move from drasil-lang to drasil-docLang*
+  - TheoryChunk and TheoryModel data types *TODO: Move from drasil-lang to drasil-theory*
 
 UncertainQuantity.hs
   - `UncertainQuantity` class definition

code/drasil-lang/drasil-lang.cabal

@@ -21,7 +21,6 @@ library
     , Language.Drasil.Chunk.DataDefinition
     , Language.Drasil.Chunk.DefinedQuantity
     , Language.Drasil.Chunk.Eq
-    , Language.Drasil.Chunk.GenDefn
     , Language.Drasil.Chunk.InstanceModel
     , Language.Drasil.Chunk.NamedIdea
     , Language.Drasil.Chunk.Quantity