Skip to content

drasil-code: Auto-register variables defined in Mods. #4659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
balacij wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

drasil-code: Auto-register variables defined in Mods. #4659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion code/drasil-code/lib/Language/Drasil/CodeSpec.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,11 @@ codeSpec si chs ms = CS {
els = extLibs chs
libReqs = concatMap odeLibReqs els
infoReqs = concatMap odeInfoReqs els
db' = insertAll (libReqs ++ infoReqs) $ si ^. systemdb
msReqs = map asVC $ concatMap (\(Mod _ _ _ _ l) -> l) ms
db' = insertAll libReqs
$ insertAll infoReqs
$ insertAll msReqs
$ si ^. systemdb
si' = set systemdb db' si

-- | Generates an 'OldCodeSpec' from 'System', 'Choices', and a list of 'Mod's.
Expand Down
6 changes: 2 additions & 4 deletions code/drasil-example/glassbr/lib/Drasil/GlassBR/Body.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import Drasil.DocLang (auxSpecSent, termDefnF')
import Drasil.Generator (cdb)
import qualified Drasil.DocLang.SRS as SRS (reference, assumpt, inModel)
import Language.Drasil.Chunk.Concept.NamedCombinators
import Language.Drasil.Code (Mod(..), asVC)
import qualified Language.Drasil.Sentence.Combinators as S
import Drasil.Document.Contents (enumBulletU, foldlSP, foldlSPCol)
import Drasil.Sentence.Combinators (bulletFlat, bulletNested, tAndDOnly, tAndDWAcc, noRefs,
Expand Down Expand Up @@ -46,7 +45,7 @@ import Drasil.GlassBR.LabelledContent
import Drasil.GlassBR.Goals (goals)
import Drasil.GlassBR.IMods (iMods, instModIntro)
import Drasil.GlassBR.MetaConcepts (progName)
import Drasil.GlassBR.ModuleDefs (allMods, implVars)
import Drasil.GlassBR.ModuleDefs (implVars)
import Drasil.GlassBR.References (astm2009, astm2012, astm2016, citations)
import Drasil.GlassBR.Requirements (funcReqs, funcReqsTables, nonfuncReqs)
import Drasil.GlassBR.TMods (tMods)
Expand Down Expand Up @@ -142,8 +141,7 @@ symbMap = cdb symbolsWCodeSymbols ideaDicts conceptChunks ([] :: [UnitDefn])
GB.dataDefs iMods [] tMods concIns citations labCon

symbolsWCodeSymbols :: [DefinedQuantityDict]
symbolsWCodeSymbols = map asVC (concatMap (\(Mod _ _ _ _ l) -> l) allMods)
++ implVars ++ symbols
symbolsWCodeSymbols = implVars ++ symbols

-- | Holds all references and links used in the document.
allRefs :: [Reference]
Expand Down
2 changes: 1 addition & 1 deletion code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import Drasil.GlassBR.Units (sFlawPU)
symbols :: [DefinedQuantityDict]
symbols = map dqdWr inputsWUnitsUncrtn ++ map dqdWr inputsWUncrtn ++
map dqdWr sdVector ++ tmSymbols ++ map dqdWr specParamVals ++
[dqdWr modElas] ++ interps ++ map dqdWr unitalSymbols ++
[dqdWr modElas] ++ map dqdWr unitalSymbols ++
unitless ++ map dqdWr [probBr, stressDistFac, cnstrw' nomThick, cnstrw' glassTypeCon] ++
map dqdWr derivedInputDataConstraints

Expand Down
Loading