Merge branch 'main' into PyConsts

.github/workflows/Lint.yaml

@@ -2,7 +2,7 @@ on:
   pull_request:
     branches: main
   workflow_dispatch:
-    paths: [code/drasil-**, .github/workflows/Lint.yaml]
+    paths: [code/drasil-**, .github/workflows/Lint.yaml, code/scripts/**]
 name: Linter
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -13,25 +13,47 @@ defaults:
     working-directory: code
 jobs:
   linter:
-    name: "HLint"
+    name: "Linter"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
+      # Prepare more specific paths filters
+      - uses: dorny/[email protected]
+        id: filter
+        with:
+           filters: |
+            hs:
+              - '**/*.hs'
+              - '**/*.lhs'
+            sh:
+              - '**/*.sh'
+
+      # If a [l]hs file was edited, then run HLint
       # Once we update our LTS, we can remove this step, see "Inputs": https://github.com/haskell-actions/hlint-setup
       - name: 'Install HLint system dependencies'
+        if: ${{ steps.filter.outputs.hs == 'true' }}
         run: |
           sudo apt-get update
           sudo apt-get install -y libtinfo5
 
       - name: 'Set up HLint'
+        if: ${{ steps.filter.outputs.hs == 'true' }}
         uses: haskell-actions/hlint-setup@v2
         with: # DO NOT MODIFY THE BELOW LINE MANUALLY -- code/scripts/update_default_stackage.sh is in charge of this!
           version: '3.4.1' # HLINT VERSION TIED TO CURRENT TARGET (LTS-20.26)
 
       - name: 'Run HLint'
+        if: ${{ steps.filter.outputs.hs == 'true' }}
         uses: haskell-actions/hlint-run@v2
         with: # The custom hlint-bin is necessary because we need to inject options to hlint, since hlint-run does not support it yet, see: https://github.com/haskell-actions/hlint-run/issues/20
           hlint-bin: hlint --hint=code/.hlint.yaml
           path: code/
           fail-on: status
+
+      # If a sh script was edited, then run shellcheck
+      - name: "Run ShellCheck"
+        if: ${{ steps.filter.outputs.sh == 'true' }}
+        uses: ludeeus/[email protected]
+        with:
+          scandir: './code/scripts'

code/Makefile

@@ -407,16 +407,19 @@ convertAnalyzed: ##@Analysis Convert analyzed dot graphs into SVGs.
 	@echo "Dependency graphs built, check your '$(TYPEGRAPH_FOLDER)' and '$(CLASSINST_GRAPH_FOLDER)' folders."
 
 #---------------------------------------#
-#--- HLint and Haddock Documentation ---#
+#-- Linters and Haddock Documentation --#
 #---------------------------------------#
 
-hlint: check_stack ##@HLint Run HLint through the drasil packages. Uses a local HLint installation.
+hlint: check_stack ##@Linters Run HLint through the drasil packages. Uses a local HLint installation.
 	stack install hlint
 	hlint .
 
-hot_hlint: ##@HLint Run HLint through the drasil packages. Uses the latest HLint version, downloading the binary each time.
+hot_hlint: ##@Linters Run HLint through the drasil packages. Uses the latest HLint version, downloading the binary each time.
 	curl --max-time 60 -sSL https://raw.github.com/ndmitchell/hlint/master/misc/run.sh | sh -s .
 
+shellcheck: ##@Linters Run ShellCheck static analyzer on all shell script files.
+	find . -type f -name '*.sh' -exec shellcheck {} +
+
 docs: check_stack ##@Documentation Create Haddock documentation of all Drasil modules. Set FULL=1 if you want to additionally test Haddock generation for website deployment.
 	FULL="$(FULL)" DOCS_FOLDER="$(DOCS_FOLDER)" GHC_FLAGS="$(GHCFLAGS)" sh scripts/make_docs.sh
 
@@ -555,4 +558,4 @@ help_packages: ##@Help Lists all packages.
 		echo "  $$package"; \
 	done
 
-.PHONY: help clean clean_artifacts cleanArtifacts gool code deps hlint hot_hlint analysis tex doc debug test graphs graphmod check_stack nographs graphs website deploy_code_path deploy deploy_lite all install $(GOOLTEST) $(ALL_EXPANDED_TARGETS)
+.PHONY: help clean clean_artifacts cleanArtifacts gool code deps hlint hot_hlint analysis tex doc debug test graphs graphmod check_stack nographs graphs website deploy_code_path deploy deploy_lite all install examples tracegraphs doxygen $(GOOLTEST) $(ALL_EXPANDED_TARGETS)

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

@@ -19,7 +19,7 @@ import Language.Drasil.Mod (Name)
 import Data.Map (Map)
 import qualified Data.Map as Map
 
-import GOOL.Drasil (CodeType)
+import Drasil.GOOL (CodeType)
 
 import Control.Lens ((^.))
 

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

@@ -6,7 +6,7 @@ module Language.Drasil.Code.Code (
 
 import qualified Language.Drasil as S (Space(..))
 
-import GOOL.Drasil (CodeType(..))
+import Drasil.GOOL (CodeType(..))
 
 import Text.PrettyPrint.HughesPJ (Doc)
 import Data.List.NonEmpty (toList)

code/drasil-code/lib/Language/Drasil/Code/CodeGeneration.hs

@@ -9,7 +9,7 @@ module Language.Drasil.Code.CodeGeneration (
 import Language.Drasil.Code.Code (Code(..))
 import Language.Drasil.Code.Imperative.GOOL.Data (AuxData(..))
 
-import GOOL.Drasil (FileData(..), ModData(modDoc))
+import Drasil.GOOL (FileData(..), ModData(modDoc))
 
 import Text.PrettyPrint.HughesPJ (Doc,render)
 import System.Directory (createDirectoryIfMissing)

code/drasil-code/lib/Language/Drasil/Code/Imperative/Build/Import.hs

@@ -6,7 +6,7 @@ import Language.Drasil.Code.Imperative.Build.AST (asFragment, DocConfig(..),
   BuildConfig(BuildConfig), BuildDependencies(..), Ext(..), includeExt,
   NameOpts, nameOpts, packSep, Runnable(Runnable), BuildName(..), RunType(..))
 
-import GOOL.Drasil (FileData(..), ProgData(..), GOOLState(..), headers, sources,
+import Drasil.GOOL (FileData(..), ProgData(..), GOOLState(..), headers, sources,
   mainMod)
 
 import Build.Drasil (Annotation, (+:+), genMake, makeS, MakeString, mkFile, mkRule,

code/drasil-code/lib/Language/Drasil/Code/Imperative/ConceptMatch.hs

@@ -8,7 +8,7 @@ import Language.Drasil (UID, Sentence(S), (+:+), (+:+.))
 import Language.Drasil.Choices (Choices(..), CodeConcept(..),
     MatchedConceptMap, showChs, Maps(..))
 
-import GOOL.Drasil (SValue, OOProg, MathConstant(..))
+import Drasil.GOOL (SValue, OOProg, MathConstant(..))
 
 import Prelude hiding (pi)
 import qualified Data.Map as Map (mapWithKey)

code/drasil-code/lib/Language/Drasil/Code/Imperative/Doxygen/Import.hs

@@ -4,7 +4,7 @@ module Language.Drasil.Code.Imperative.Doxygen.Import (
 
 import Utils.Drasil (blank)
 
-import GOOL.Drasil (GOOLState, headers, mainMod)
+import Drasil.GOOL (GOOLState, headers, mainMod)
 
 import Language.Drasil.Choices (Verbosity(..))
 

code/drasil-code/lib/Language/Drasil/Code/Imperative/DrasilState.hs

@@ -6,7 +6,7 @@ module Language.Drasil.Code.Imperative.DrasilState (
 ) where
 
 import Language.Drasil
-import GOOL.Drasil (ScopeTag(..), CodeType)
+import Drasil.GOOL (ScopeTag(..), CodeType)
 
 import Language.Drasil.Chunk.ConstraintMap (ConstraintCE)
 import Language.Drasil.Code.ExtLibImport (ExtLibState)

code/drasil-code/lib/Language/Drasil/Code/Imperative/FunctionCalls.hs

@@ -16,7 +16,7 @@ import Language.Drasil.Chunk.CodeDefinition (CodeDefinition)
 import Language.Drasil.Mod (Name)
 import Language.Drasil.Choices (InternalConcept(..))
 
-import GOOL.Drasil (VSType, SValue, MSStatement, OOProg, TypeSym(..),
+import Drasil.GOOL (VSType, SValue, MSStatement, OOProg, TypeSym(..),
   VariableValue(..), StatementSym(..), DeclStatement(..), convTypeOO)
 
 import Data.List ((\\), intersect)

code/drasil-code/lib/Language/Drasil/Code/Imperative/GOOL/ClassInterface.hs

@@ -14,7 +14,7 @@ import Language.Drasil.Code.DataDesc (DataDesc)
 import Language.Drasil.Mod (Name, Version)
 import Language.Drasil.Choices (Comments, ImplementationType, Verbosity)
 
-import GOOL.Drasil (ProgData, GOOLState)
+import Drasil.GOOL (ProgData, GOOLState)
 
 import Text.PrettyPrint.HughesPJ (Doc)
 

code/drasil-code/lib/Language/Drasil/Code/Imperative/GOOL/Data.hs

@@ -3,7 +3,7 @@ module Language.Drasil.Code.Imperative.GOOL.Data (AuxData(auxFilePath, auxDoc),
   ad, PackData(packProg, packAux), packD
 ) where
 
-import GOOL.Drasil (ProgData)
+import Drasil.GOOL (ProgData)
 
 import Text.PrettyPrint.HughesPJ (Doc, isEmpty)
 

code/drasil-code/lib/Language/Drasil/Code/Imperative/GOOL/LanguageRenderer/CSharpRenderer.hs

@@ -19,7 +19,7 @@ import Language.Drasil.Code.Imperative.Build.AST (BuildConfig, Runnable,
   asFragment, buildAll, nativeBinary, osClassDefault, executable, sharedLibrary)
 import Language.Drasil.Code.Imperative.Doxygen.Import (no)
 
-import GOOL.Drasil (onCodeList, csName, csVersion)
+import Drasil.GOOL (onCodeList, csName, csVersion)
 
 import Prelude hiding (break,print,(<>),sin,cos,tan,floor)
 import qualified Prelude as P ((<>))

code/drasil-code/lib/Language/Drasil/Code/Imperative/GOOL/LanguageRenderer/CppRenderer.hs

@@ -20,7 +20,7 @@ import Language.Drasil.Code.Imperative.Build.AST (BuildConfig, Runnable,
   asFragment, buildAll, cppCompiler, nativeBinary, executable, sharedLibrary)
 import Language.Drasil.Code.Imperative.Doxygen.Import (no)
 
-import GOOL.Drasil (onCodeList, cppName, cppVersion)
+import Drasil.GOOL (onCodeList, cppName, cppVersion)
 
 import Prelude hiding (break,print,(<>),sin,cos,tan,floor,const,log,exp)
 import Text.PrettyPrint.HughesPJ (Doc)

code/drasil-code/lib/Language/Drasil/Code/Imperative/GOOL/LanguageRenderer/JavaRenderer.hs

@@ -20,7 +20,7 @@ import Language.Drasil.Code.Imperative.Build.AST (BuildConfig, BuildName(..),
   mainModuleFile, packSep, withExt)
 import Language.Drasil.Code.Imperative.Doxygen.Import (yes)
 
-import GOOL.Drasil (onCodeList, jName, jVersion)
+import Drasil.GOOL (onCodeList, jName, jVersion)
 
 import Data.List (intercalate)
 import Prelude hiding (break,print,sin,cos,tan,floor,(<>))

code/drasil-code/lib/Language/Drasil/Code/Imperative/GOOL/LanguageRenderer/LanguagePolymorphic.hs

@@ -8,7 +8,7 @@ import Language.Drasil (Expr)
 
 import Database.Drasil (ChunkDB)
 
-import GOOL.Drasil (ProgData, GOOLState)
+import Drasil.GOOL (ProgData, GOOLState)
 
 import Language.Drasil.Choices (Comments, ImplementationType(..), Verbosity)
 import Language.Drasil.Code.DataDesc (DataDesc)

code/drasil-code/lib/Language/Drasil/Code/Imperative/GOOL/LanguageRenderer/PythonRenderer.hs

@@ -16,7 +16,7 @@ import Language.Drasil.Code.Imperative.GOOL.Data (AuxData(..), ad, PackData(..),
 import Language.Drasil.Code.Imperative.Build.AST (Runnable, interpMM)
 import Language.Drasil.Code.Imperative.Doxygen.Import (yes)
 
-import GOOL.Drasil (onCodeList, pyName, pyVersion)
+import Drasil.GOOL (onCodeList, pyName, pyVersion)
 
 import Prelude hiding (break,print,sin,cos,tan,floor,(<>))
 import Text.PrettyPrint.HughesPJ (Doc)

code/drasil-code/lib/Language/Drasil/Code/Imperative/GOOL/LanguageRenderer/SwiftRenderer.hs

@@ -16,7 +16,7 @@ import Language.Drasil.Code.Imperative.GOOL.Data (AuxData(..), ad, PackData(..),
 import Language.Drasil.Code.Imperative.Build.AST (BuildConfig, Runnable,
   DocConfig(..), asFragment, buildAll, nativeBinary, executable, sharedLibrary)
 
-import GOOL.Drasil (onCodeList, swiftName, swiftVersion)
+import Drasil.GOOL (onCodeList, swiftName, swiftVersion)
 
 import Prelude hiding (break,print,(<>),sin,cos,tan,floor)
 import Text.PrettyPrint.HughesPJ (Doc, empty)

code/drasil-code/lib/Language/Drasil/Code/Imperative/GenerateGOOL.hs

@@ -11,7 +11,7 @@ import Language.Drasil.Choices (Comments(..), AuxFile(..))
 import Language.Drasil.CodeSpec (CodeSpec(..))
 import Language.Drasil.Mod (Name, Description, Import)
 
-import GOOL.Drasil (SFile, VSType, SVariable, SValue, MSStatement, SMethod,
+import Drasil.GOOL (SFile, VSType, SVariable, SValue, MSStatement, SMethod,
   CSStateVar, SClass, NamedArgs, OOProg, FileSym(..), TypeElim(..),
   ValueSym(..), Argument(..), ValueExpression(..), OOValueExpression(..),
   FuncAppStatement(..), OOFuncAppStatement(..), ClassSym(..), ModuleSym(..),

code/drasil-code/lib/Language/Drasil/Code/Imperative/Generator.hs

@@ -32,7 +32,7 @@ import Language.Drasil.Choices (Choices(..), Modularity(..), Architecture(..),
 import Language.Drasil.CodeSpec (CodeSpec(..), getODE)
 import Language.Drasil.Printers (SingleLine(OneLine), sentenceDoc)
 
-import GOOL.Drasil (GSProgram, SFile, OOProg, ProgramSym(..), ScopeTag(..),
+import Drasil.GOOL (GSProgram, SFile, OOProg, ProgramSym(..), ScopeTag(..),
   ProgData(..), initialState, unCI)
 
 import System.Directory (setCurrentDirectory, createDirectoryIfMissing,

code/drasil-code/lib/Language/Drasil/Code/Imperative/Import.hs

@@ -37,7 +37,7 @@ import Language.Drasil.Mod (Func(..), FuncData(..), FuncDef(..), FuncStmt(..),
   Mod(..), Name, Description, StateVariable(..), fstdecl)
 import qualified Language.Drasil.Mod as M (Class(..))
 
-import GOOL.Drasil (Label, SFile, MSBody, MSBlock, VSType, SVariable, SValue,
+import Drasil.GOOL (Label, SFile, MSBody, MSBlock, VSType, SVariable, SValue,
   MSStatement, MSParameter, SMethod, CSStateVar, SClass, NamedArgs,
   Initializers, OOProg, PermanenceSym(..), bodyStatements, BlockSym(..),
   TypeSym(..), VariableSym(..), OOVariableSym(..), staticConst,
@@ -48,7 +48,7 @@ import GOOL.Drasil (Label, SFile, MSBody, MSBlock, VSType, SVariable, SValue,
   StringStatement(..), ControlStatement(..), ifNoElse, ScopeSym(..),
   ParameterSym(..), MethodSym(..), OOMethodSym(..), pubDVar, privDVar,
   nonInitConstructor, convTypeOO, ScopeTag(..), CodeType(..), onStateValue)
-import qualified GOOL.Drasil as C (CodeType(List, Array))
+import qualified Drasil.GOOL as C (CodeType(List, Array))
 
 import Prelude hiding (sin, cos, tan, log, exp)
 import Data.List ((\\), intersect)

code/drasil-code/lib/Language/Drasil/Code/Imperative/Logging.hs

@@ -5,7 +5,7 @@ module Language.Drasil.Code.Imperative.Logging (
 import Language.Drasil.Code.Imperative.DrasilState (GenState, DrasilState(..))
 import Language.Drasil.Choices (Logging(..))
 
-import GOOL.Drasil (Label, MSBody, MSBlock, SVariable, SValue, MSStatement,
+import Drasil.GOOL (Label, MSBody, MSBlock, SVariable, SValue, MSStatement,
   OOProg, BodySym(..), BlockSym(..), TypeSym(..), VariableSym(..),
   VariableElim(..), Literal(..), VariableValue(..), StatementSym(..),
   DeclStatement(..), IOStatement(..), lensMStoVS)

code/drasil-code/lib/Language/Drasil/Code/Imperative/Modules.hs

@@ -44,7 +44,7 @@ import Language.Drasil.CodeSpec (CodeSpec(..))
 import Language.Drasil.Expr.Development (Completeness(..))
 import Language.Drasil.Printers (SingleLine(OneLine), codeExprDoc)
 
-import GOOL.Drasil (SFile, MSBody, MSBlock, SVariable, SValue, MSStatement,
+import Drasil.GOOL (SFile, MSBody, MSBlock, SVariable, SValue, MSStatement,
   SMethod, CSStateVar, SClass, OOProg, BodySym(..), bodyStatements, oneLiner,
   BlockSym(..), PermanenceSym(..), TypeSym(..), VariableSym(..), Literal(..),
   VariableValue(..), CommandLineArgs(..), BooleanExpression(..),

code/drasil-code/lib/Language/Drasil/Code/Imperative/SpaceMatch.hs

@@ -8,7 +8,7 @@ import Language.Drasil.Code.Imperative.DrasilState (GenState, MatchedSpaces,
   addToDesignLog, addLoggedSpace)
 import Language.Drasil.Code.Lang (Lang(..))
 
-import GOOL.Drasil (CodeType(..))
+import Drasil.GOOL (CodeType(..))
 
 import Control.Monad.State (modify)
 import Text.PrettyPrint.HughesPJ (Doc, text)

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

@@ -9,7 +9,7 @@ module Language.Drasil.Mod (Class(..), StateVariable(..), Func(..),
 
 import Language.Drasil (Space, MayHaveUnit, Quantity, CodeExpr, LiteralC(..))
 import Database.Drasil (ChunkDB)
-import GOOL.Drasil (ScopeTag(..))
+import Drasil.GOOL (ScopeTag(..))
 
 import Language.Drasil.Chunk.Code (CodeVarChunk, CodeFuncChunk, codevars,
   codevars', quantvar)

code/drasil-code/test/FileTests.hs

@@ -2,7 +2,7 @@
 -- and write to files. See stable/gooltest for more details on what is generated through this.
 module FileTests (fileTests) where
 
-import GOOL.Drasil (GSProgram, MSBlock, MSStatement, SMethod, OOProg,
+import Drasil.GOOL (GSProgram, MSBlock, MSStatement, SMethod, OOProg,
   ProgramSym(..), FileSym(..), BodySym(..), BlockSym(..), TypeSym(..),
   DeclStatement(..), IOStatement(..), VariableSym(..), Literal(..),
   VariableValue(..), MethodSym(..), ModuleSym(..))

code/drasil-code/test/HelloWorld.hs

@@ -3,7 +3,7 @@
 -- Should run print statements, basic loops, math, and create a helper module without errors.
 module HelloWorld (helloWorld) where
 
-import GOOL.Drasil (GSProgram, MSBody, MSBlock, MSStatement, SMethod, SVariable,
+import Drasil.GOOL (GSProgram, MSBody, MSBlock, MSStatement, SMethod, SVariable,
   OOProg, ProgramSym(..), FileSym(..), BodySym(..), bodyStatements, oneLiner,
   BlockSym(..), listSlice, TypeSym(..), StatementSym(..), AssignStatement(..), 
   (&=), DeclStatement(..), OODeclStatement(..), IOStatement(..),

code/drasil-code/test/Helper.hs

@@ -1,7 +1,7 @@
 -- | Makes the helper file for the GOOL HelloWorld tests.
 module Helper (helper) where
 
-import GOOL.Drasil (SFile, SMethod,
+import Drasil.GOOL (SFile, SMethod,
   OOProg, FileSym(..), bodyStatements, TypeSym(..),
   DeclStatement(..), ControlStatement(..), (&=), VariableSym(..),
   Literal(..), VariableValue(..), NumericExpression(..), ScopeSym(..), ParameterSym(..), MethodSym(..),

code/drasil-code/test/Main.hs

@@ -1,7 +1,7 @@
 -- | Main module to gather all the GOOL tests and generate them.
 module Main (main) where
 
-import GOOL.Drasil (Label, OOProg, ProgramSym(..), unCI, unJC, unPC, unCSC,
+import Drasil.GOOL (Label, OOProg, ProgramSym(..), unCI, unJC, unPC, unCSC,
   unCPPC, unSC, FileData(..), ModData(..), ProgData(..), initialState)
 
 import Language.Drasil.Code (PackageSym(..), AuxiliarySym(..), AuxData(..),

code/drasil-code/test/NameGenTest.hs

@@ -1,6 +1,6 @@
 module NameGenTest (nameGenTest) where
 
-import GOOL.Drasil
+import Drasil.GOOL
 
 nameGenTest :: OOProg r => GSProgram r
 nameGenTest = prog "NameGenTest" "" [fileDoc $ buildModule "NameGenTest" [] [main, helper] []]

code/drasil-code/test/Observer.hs

@@ -1,7 +1,7 @@
 -- | Part of the PatternTest GOOL tests. Defines an Observer class.
 module Observer (observer, observerName, printNum, x) where
 
-import GOOL.Drasil (SFile, SVariable, SMethod, SClass, OOProg, FileSym(..),
+import Drasil.GOOL (SFile, SVariable, SMethod, SClass, OOProg, FileSym(..),
   PermanenceSym(..), oneLiner, TypeSym(..), IOStatement(..), VariableSym(..),
   OOVariableSym(..), Literal(..), VariableValue(..), OOVariableValue,
   ScopeSym(..), OOMethodSym(..), initializer, StateVarSym(..), ClassSym(..),

code/drasil-code/test/PatternTest.hs

@@ -2,7 +2,7 @@
 -- the Observer class both work.
 module PatternTest (patternTest) where
 
-import GOOL.Drasil (GSProgram, VSType, SVariable, SValue, SMethod, OOProg,
+import Drasil.GOOL (GSProgram, VSType, SVariable, SValue, SMethod, OOProg,
   ProgramSym(..), FileSym(..), BodySym(..), oneLiner, BlockSym(..),
   TypeSym(..), OOTypeSym(..), StatementSym(..), DeclStatement(..),
   IOStatement(..), initObserverList, addObserver, VariableSym(..),

code/drasil-code/test/VectorTest.hs

@@ -1,6 +1,6 @@
 module VectorTest (vectorTest) where
 
-import GOOL.Drasil (GSProgram, SVariable, SMethod, OOProg, ProgramSym(..),
+import Drasil.GOOL (GSProgram, SVariable, SMethod, OOProg, ProgramSym(..),
   FileSym(..), BodySym(..), BlockSym(..), TypeSym(..), VariableSym(..),
   Literal(..), VectorType(..), VectorDecl(..), VectorThunk(..),
   VectorExpression(..), DeclStatement(..), ThunkAssign(..), MethodSym(..),

code/drasil-example/projectile/lib/Drasil/Projectile/Choices.hs

@@ -11,7 +11,7 @@ import Language.Drasil.Code (Choices(..), Comments(..),
   makeConstraints, makeDocConfig, makeLogConfig, LogConfig(..), OptionalFeatures(..), 
   makeOptFeats)
 import Language.Drasil.Generate (genCode)
-import GOOL.Drasil (CodeType(..))
+import Drasil.GOOL (CodeType(..))
 import Data.Drasil.Quantities.Math (piConst)
 import Drasil.Projectile.Body (fullSI)
 import SysInfo.Drasil (SystemInformation(SI, _sys))

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

@@ -33,7 +33,7 @@ import Language.Drasil.Output.Formats(Filename, DocSpec(DocSpec), DocChoices(DC)
 import Language.Drasil.TypeCheck
 import Language.Drasil.Dump
 
-import GOOL.Drasil (unJC, unPC, unCSC, unCPPC, unSC)
+import Drasil.GOOL (unJC, unPC, unCSC, unCPPC, unSC)
 
 -- | Generate a number of artifacts based on a list of recipes.
 gen :: DocSpec -> Document -> PrintingInformation -> IO ()