drasil-system: Prefer accessing fields with lenses.

Author: balacij

code/drasil-code/lib/Language/Drasil/CodeSpec.hs

@@ -178,22 +178,21 @@ codeSpec si chs ms = CS {
 -- This function extracts various components (e.g., inputs, outputs, constraints, etc.)
 -- from 'System' to populate the 'OldCodeSpec' structure.
 oldcodeSpec :: SI.System -> Choices -> [Mod] -> OldCodeSpec
-oldcodeSpec SI.SI{ SI._sys = sys
+oldcodeSpec sys@SI.SI{ SI._sys = sysIdea
                  , SI._authors = as
-                 , SI._instModels = ims
-                 , SI._dataDefns = ddefs
                  , SI._configFiles = cfp
                  , SI._inputs = ins
                  , SI._outputs = outs
                  , SI._constraints = cs
                  , SI._constants = cnsts
                  , SI._systemdb = db } chs ms =
-  let n = programName sys
+  let ddefs = sys ^. dataDefns
+      n = programName sysIdea
       inputs' = map quantvar ins
       const' = map qtov (filter ((`Map.notMember` conceptMatch (maps chs)) . (^. uid))
         cnsts)
       derived = map qtov $ getDerivedInputs ddefs inputs' const' db
-      rels = (map qtoc (getEqModQdsFromIm ims ++ mapMaybe qdEFromDD ddefs) \\ derived)
+      rels = (map qtoc (getEqModQdsFromIm (sys ^. instModels) ++ mapMaybe qdEFromDD ddefs) \\ derived)
         ++ mapODE (getODE $ extLibs chs)
       -- TODO: When we have better DEModels, we should be deriving our ODE information
       --       directly from the instance models (ims) instead of directly from the choices.

code/drasil-docLang/lib/Drasil/DocDecl.hs

@@ -139,10 +139,10 @@ mkDocDesc sys@SI{_inputs = is, _systemdb = db} = map sec where
 
   scsSub :: SCSSub -> DL.SCSSub
   scsSub Assumptions = DL.Assumptions $ fromConcInsDB assumpDom
-  scsSub (TMs s f) = DL.TMs s f $ _theoryModels sys
-  scsSub (GDs s f dd) = DL.GDs s f (_genDefns sys) dd
-  scsSub (DDs s f dd) = DL.DDs s f (_dataDefns sys) dd
-  scsSub (IMs s f dd) = DL.IMs s f (_instModels sys) dd
+  scsSub (TMs s f)    = DL.TMs s f (sys ^. theoryModels)
+  scsSub (GDs s f dd) = DL.GDs s f (sys ^. genDefns)     dd
+  scsSub (DDs s f dd) = DL.DDs s f (sys ^. dataDefns)    dd
+  scsSub (IMs s f dd) = DL.IMs s f (sys ^. instModels)   dd
   scsSub (Constraints s c) = DL.Constraints s c
   scsSub (CorrSolnPpties c cs) = DL.CorrSolnPpties c cs
 

code/drasil-gen/lib/Language/Drasil/TypeCheck.hs

@@ -9,12 +9,13 @@ import Data.Either (isRight, rights)
 import Control.Lens ((^.))
 import Data.Bifunctor (second)
 import Data.List (partition)
-import System.Drasil (System(SI, _instModels, _dataDefns, _systemdb))
+import System.Drasil (System, HasSystem (instModels, dataDefns, systemdb))
 
 typeCheckSI :: System -> IO ()
-typeCheckSI
-  SI{_instModels = ims, _dataDefns = dds, _systemdb = chks}
-  = do
+typeCheckSI sys = do
+    let ims = sys ^. instModels
+        dds = sys ^. dataDefns
+        chks = sys ^. systemdb
     -- build a variable context (a map of UIDs to "Space"s [types])
     let cxt = M.map (\(dict, _) -> dict ^. typ) (symbolTable chks)