From e091e348711379bc0277451688b21c4f5fc75424 Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Sat, 23 Jan 2021 17:55:38 -0500 Subject: [PATCH 01/13] 2292 : WIP : Proof of concept --- code/drasil-build/drasil-build.cabal | 58 +++--- code/drasil-build/drasil-build.cabal.bak | 29 +++ code/drasil-build/package.yaml | 32 ++++ code/drasil-build/stack.yaml | 46 ++--- code/drasil-data/drasil-data.cabal | 122 +++++++------ code/drasil-data/drasil-data.cabal.bak | 59 ++++++ code/drasil-data/package.yaml | 69 +++++++ code/drasil-data/stack.yaml | 68 ++++--- code/drasil-database/drasil-database.cabal | 67 ++++--- .../drasil-database/drasil-database.cabal.bak | 35 ++++ code/drasil-database/package.yaml | 41 +++++ code/drasil-database/stack.yaml | 49 ++--- code/drasil-gool/drasil-gool.cabal | 101 ++++++----- code/drasil-gool/drasil-gool.cabal.bak | 51 ++++++ code/drasil-gool/package.yaml | 42 +++++ code/drasil-gool/stack.yaml | 73 ++++++++ code/drasil-lang/drasil-lang.cabal | 168 ++++++++++-------- code/drasil-lang/drasil-lang.cabal.bak | 85 +++++++++ code/drasil-lang/package.yaml | 44 +++++ code/drasil-lang/stack.yaml | 46 ++--- code/drasil-printers/drasil-printers.cabal | 106 ++++++----- .../drasil-printers/drasil-printers.cabal.bak | 55 ++++++ code/drasil-printers/package.yaml | 43 +++++ code/drasil-printers/stack.yaml | 53 +++--- code/drasil-theory/drasil-theory.cabal | 69 ++++--- code/drasil-theory/drasil-theory.cabal.bak | 36 ++++ code/drasil-theory/package.yaml | 40 +++++ code/drasil-theory/stack.yaml | 50 +++--- code/drasil-utils/drasil-utils.cabal | 82 +++++---- code/drasil-utils/drasil-utils.cabal.bak | 41 +++++ code/drasil-utils/package.yaml | 42 +++++ code/drasil-utils/stack.yaml | 57 +++--- 32 files changed, 1459 insertions(+), 500 deletions(-) create mode 100644 code/drasil-build/drasil-build.cabal.bak create mode 100644 code/drasil-build/package.yaml create mode 100644 code/drasil-data/drasil-data.cabal.bak create mode 100644 code/drasil-data/package.yaml create mode 100644 code/drasil-database/drasil-database.cabal.bak create mode 100644 code/drasil-database/package.yaml create mode 100644 code/drasil-gool/drasil-gool.cabal.bak create mode 100644 code/drasil-gool/package.yaml create mode 100644 code/drasil-gool/stack.yaml create mode 100644 code/drasil-lang/drasil-lang.cabal.bak create mode 100644 code/drasil-lang/package.yaml create mode 100644 code/drasil-printers/drasil-printers.cabal.bak create mode 100644 code/drasil-printers/package.yaml create mode 100644 code/drasil-theory/drasil-theory.cabal.bak create mode 100644 code/drasil-theory/package.yaml create mode 100644 code/drasil-utils/drasil-utils.cabal.bak create mode 100644 code/drasil-utils/package.yaml diff --git a/code/drasil-build/drasil-build.cabal b/code/drasil-build/drasil-build.cabal index 6fd0a3eaa2..a59d5f9353 100644 --- a/code/drasil-build/drasil-build.cabal +++ b/code/drasil-build/drasil-build.cabal @@ -1,29 +1,41 @@ -Name: drasil-build -Version: 0.1.1 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +cabal-version: 1.12 + +-- This file has been generated from package.yaml by hpack version 0.33.0. +-- +-- see: https://github.com/sol/hpack +-- +-- hash: 5f845373759a553ff299a5c24284b6e4331e9bd3f54d48ac1e45b043bcdd2b7b + +name: drasil-build +version: 0.1.1.0 +synopsis: A framework for code and document generation for scientific software - Build System SubPackage +description: Please see the README on GitHub at +homepage: https://jacquescarette.github.io/Drasil/ +bug-reports: https://github.com/JacquesCarette/Drasil/issues +author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +maintainer: Jacques Carette +license: BSD3 build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Build System SubPackage + +source-repository head + type: git + location: https://github.com/JacquesCarette/Drasil library exposed-modules: - Build.Drasil + Build.Drasil other-modules: - Build.Drasil.Make.AST, - Build.Drasil.Make.Helpers, - Build.Drasil.Make.Import, - Build.Drasil.Make.MakeString, - Build.Drasil.Make.Print - - Build-Depends: - base >= 4.7, - pretty >= 1.1.1.1, - drasil-lang >= 0.1.52 + Build.Drasil.Make.AST + Build.Drasil.Make.Helpers + Build.Drasil.Make.Import + Build.Drasil.Make.MakeString + Build.Drasil.Make.Print + Paths_drasil_build + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints + build-depends: + base >=4.7 && <5 + , drasil-lang + , pretty >=1.1.1.1 default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: build diff --git a/code/drasil-build/drasil-build.cabal.bak b/code/drasil-build/drasil-build.cabal.bak new file mode 100644 index 0000000000..6fd0a3eaa2 --- /dev/null +++ b/code/drasil-build/drasil-build.cabal.bak @@ -0,0 +1,29 @@ +Name: drasil-build +Version: 0.1.1 +Cabal-Version: >= 1.18 +Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +build-type: Simple +Synopsis: A framework for code and document generation for scientific software - Build System SubPackage + +library + exposed-modules: + Build.Drasil + other-modules: + Build.Drasil.Make.AST, + Build.Drasil.Make.Helpers, + Build.Drasil.Make.Import, + Build.Drasil.Make.MakeString, + Build.Drasil.Make.Print + + Build-Depends: + base >= 4.7, + pretty >= 1.1.1.1, + drasil-lang >= 0.1.52 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + + +source-repository head + type: git + location: git://github.com/JacquesCarette/Drasil.git + subdir: build diff --git a/code/drasil-build/package.yaml b/code/drasil-build/package.yaml new file mode 100644 index 0000000000..decccc68d7 --- /dev/null +++ b/code/drasil-build/package.yaml @@ -0,0 +1,32 @@ +name: drasil-build +version: 0.1.1.0 +license: BSD3 +author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" +maintainer: "Jacques Carette" +synopsis: A framework for code and document generation for scientific software - Build System SubPackage +github: JacquesCarette/Drasil +homepage: https://jacquescarette.github.io/Drasil/ + +extra-source-files: [] + +# Metadata used when publishing your package +# category: Web + +# To avoid duplicated efforts in documentation and dealing with the +# complications of embedding Haddock markup inside cabal files, it is +# common to point users to the README.md file. +description: Please see the README on GitHub at + +dependencies: +- base >= 4.7 && < 5 +- pretty >= 1.1.1.1 +- drasil-lang + +ghc-options: +- -Wall +- -Wredundant-constraints + +library: + source-dirs: ./ + exposed-modules: + - Build.Drasil diff --git a/code/drasil-build/stack.yaml b/code/drasil-build/stack.yaml index 7d191452f2..025e49c55c 100644 --- a/code/drasil-build/stack.yaml +++ b/code/drasil-build/stack.yaml @@ -11,11 +11,14 @@ # resolver: lts-3.5 # resolver: nightly-2015-09-21 # resolver: ghc-7.10.2 -# resolver: ghcjs-0.1.0_ghc-7.10.2 -# resolver: -# name: custom-snapshot -# location: "./custom-snapshot.yaml" -resolver: lts-11.2 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# resolver: ./custom-snapshot.yaml +# resolver: https://example.com/snapshots/2018-01-01.yaml +resolver: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. @@ -23,24 +26,25 @@ resolver: lts-11.2 # packages: # - some-directory # - https://example.com/foo/bar/baz-0.0.2.tar.gz -# - location: -# git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# extra-dep: true -# subdirs: -# - auto-update -# - wai -# -# A package marked 'extra-dep: true' will only be built if demanded by a -# non-dependency (i.e. a user package), and its test suites and benchmarks -# will not be run. This is useful for tweaking upstream packages. +# subdirs: +# - auto-update +# - wai packages: - . - ../drasil-lang -# Dependency packages to be pulled from upstream that are not in the resolver -# (e.g., acme-missiles-0.3) -# extra-deps: [] + +# Dependency packages to be pulled from upstream that are not in the resolver. +# These entries can reference officially published versions as well as +# forks / in-progress versions pinned to a git hash. For example: +# +# extra-deps: +# - acme-missiles-0.3 +# - git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# +extra-deps: +- unicode-names-3.2.0.0@sha256:fef7241d93170e26265e84553090253a5e8ee207645d47cf271816f5834d07d2,470 +- unicode-properties-3.2.0.0@sha256:239766a6ac4322329353f6b9cd546024fd8c5f0235c8e32b3cba2d6bd245a699,1000 # Override default flag values for local packages and extra-deps # flags: {} @@ -53,7 +57,7 @@ packages: # # Require a specific version of stack, using version ranges # require-stack-version: -any # Default -# require-stack-version: ">=1.6" +# require-stack-version: ">=2.5" # # Override the architecture used by stack, especially useful on Windows # arch: i386 diff --git a/code/drasil-data/drasil-data.cabal b/code/drasil-data/drasil-data.cabal index 9f29faa554..5473cc5ced 100644 --- a/code/drasil-data/drasil-data.cabal +++ b/code/drasil-data/drasil-data.cabal @@ -1,59 +1,73 @@ -Name: drasil-data -Version: 0.1.13 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +cabal-version: 1.12 + +-- This file has been generated from package.yaml by hpack version 0.33.0. +-- +-- see: https://github.com/sol/hpack +-- +-- hash: a6d10569cbbcd36bfa4fa593ee019f5c698b1db77a390122fd2201499e4c4d9a + +name: drasil-data +version: 0.1.13.0 +synopsis: A framework for code and document generation for scientific software - Data System SubPackage +description: Please see the README on GitHub at +homepage: https://jacquescarette.github.io/Drasil/ +bug-reports: https://github.com/JacquesCarette/Drasil/issues +author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +maintainer: Jacques Carette +license: BSD3 build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Data SubPackage + +source-repository head + type: git + location: https://github.com/JacquesCarette/Drasil library exposed-modules: - Data.Drasil.People - Data.Drasil.Citations - Data.Drasil.Constraints - Data.Drasil.SI_Units - Data.Drasil.Concepts.Computation - Data.Drasil.Concepts.Documentation - Data.Drasil.Concepts.Thermodynamics - Data.Drasil.Concepts.PhysicalProperties - Data.Drasil.Concepts.Education - Data.Drasil.Concepts.Physics - Data.Drasil.Concepts.Software - Data.Drasil.Concepts.Math - Data.Drasil.Concepts.SolidMechanics - Data.Drasil.ExternalLibraries.ODELibraries - Data.Drasil.Software.Products - Data.Drasil.Quantities.Thermodynamics - Data.Drasil.Quantities.PhysicalProperties - Data.Drasil.Quantities.Physics - Data.Drasil.Quantities.Math - Data.Drasil.Quantities.SolidMechanics - Data.Drasil.Units.Thermodynamics - Data.Drasil.Units.PhysicalProperties - Data.Drasil.Units.Physics - Data.Drasil.Units.SolidMechanics - Data.Drasil.Theories.Physics - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - data-fix (>= 0.0.4 && <= 1.0), - Decimal >= 0.5.1, - drasil-code >= 0.1.9, - drasil-gool >= 0.1.1, - drasil-lang >= 0.1.56, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 + Data.Drasil.People + Data.Drasil.Citations + Data.Drasil.Constraints + Data.Drasil.SI_Units + Data.Drasil.Concepts.Computation + Data.Drasil.Concepts.Documentation + Data.Drasil.Concepts.Thermodynamics + Data.Drasil.Concepts.PhysicalProperties + Data.Drasil.Concepts.Education + Data.Drasil.Concepts.Physics + Data.Drasil.Concepts.Software + Data.Drasil.Concepts.Math + Data.Drasil.Concepts.SolidMechanics + Data.Drasil.ExternalLibraries.ODELibraries + Data.Drasil.Software.Products + Data.Drasil.Quantities.Thermodynamics + Data.Drasil.Quantities.PhysicalProperties + Data.Drasil.Quantities.Physics + Data.Drasil.Quantities.Math + Data.Drasil.Quantities.SolidMechanics + Data.Drasil.Units.Thermodynamics + Data.Drasil.Units.PhysicalProperties + Data.Drasil.Units.Physics + Data.Drasil.Units.SolidMechanics + Data.Drasil.Theories.Physics + other-modules: + Paths_drasil_data + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints + build-depends: + Decimal >=0.5.1 + , MissingH >=1.4.0.1 + , base >=4.7 && <5 + , containers >=0.5.5.1 + , data-fix (>=0.0.4 && <=1.0) + , directory >=1.2.6.2 + , drasil-code + , drasil-gool + , drasil-lang + , drasil-theory + , drasil-utils + , lens >=4.12 + , mtl >=2.2.1 + , parsec >=3.1.9 + , pretty >=1.1.1.1 + , split >=0.2.3.1 default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-data/drasil-data.cabal.bak b/code/drasil-data/drasil-data.cabal.bak new file mode 100644 index 0000000000..9f29faa554 --- /dev/null +++ b/code/drasil-data/drasil-data.cabal.bak @@ -0,0 +1,59 @@ +Name: drasil-data +Version: 0.1.13 +Cabal-Version: >= 1.18 +Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +build-type: Simple +Synopsis: A framework for code and document generation for scientific software - Data SubPackage + +library + exposed-modules: + Data.Drasil.People + Data.Drasil.Citations + Data.Drasil.Constraints + Data.Drasil.SI_Units + Data.Drasil.Concepts.Computation + Data.Drasil.Concepts.Documentation + Data.Drasil.Concepts.Thermodynamics + Data.Drasil.Concepts.PhysicalProperties + Data.Drasil.Concepts.Education + Data.Drasil.Concepts.Physics + Data.Drasil.Concepts.Software + Data.Drasil.Concepts.Math + Data.Drasil.Concepts.SolidMechanics + Data.Drasil.ExternalLibraries.ODELibraries + Data.Drasil.Software.Products + Data.Drasil.Quantities.Thermodynamics + Data.Drasil.Quantities.PhysicalProperties + Data.Drasil.Quantities.Physics + Data.Drasil.Quantities.Math + Data.Drasil.Quantities.SolidMechanics + Data.Drasil.Units.Thermodynamics + Data.Drasil.Units.PhysicalProperties + Data.Drasil.Units.Physics + Data.Drasil.Units.SolidMechanics + Data.Drasil.Theories.Physics + + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + split >= 0.2.3.1, + MissingH >= 1.4.0.1, + parsec >= 3.1.9, + data-fix (>= 0.0.4 && <= 1.0), + Decimal >= 0.5.1, + drasil-code >= 0.1.9, + drasil-gool >= 0.1.1, + drasil-lang >= 0.1.56, + drasil-theory >= 0.1.0, + drasil-utils >= 0.1.0 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + +source-repository head + type: git + location: git://github.com/JacquesCarette/Drasil.git + subdir: code diff --git a/code/drasil-data/package.yaml b/code/drasil-data/package.yaml new file mode 100644 index 0000000000..106d9212e2 --- /dev/null +++ b/code/drasil-data/package.yaml @@ -0,0 +1,69 @@ +name: drasil-data +version: 0.1.13.0 +license: BSD3 +author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" +maintainer: "Jacques Carette" +synopsis: A framework for code and document generation for scientific software - Data System SubPackage +github: JacquesCarette/Drasil +homepage: https://jacquescarette.github.io/Drasil/ + +extra-source-files: [] + +# Metadata used when publishing your package +# category: Web + +# To avoid duplicated efforts in documentation and dealing with the +# complications of embedding Haddock markup inside cabal files, it is +# common to point users to the README.md file. +description: Please see the README on GitHub at + +dependencies: +- base >= 4.7 && < 5 +- lens >= 4.12 +- containers >= 0.5.5.1 +- pretty >= 1.1.1.1 +- mtl >= 2.2.1 +- directory >= 1.2.6.2 +- split >= 0.2.3.1 +- MissingH >= 1.4.0.1 +- parsec >= 3.1.9 +- data-fix (>= 0.0.4 && <= 1.0) +- Decimal >= 0.5.1 +- drasil-code +- drasil-gool +- drasil-lang +- drasil-theory +- drasil-utils + +ghc-options: +- -Wall +- -Wredundant-constraints + +library: + source-dirs: ./ + exposed-modules: + - Data.Drasil.People + - Data.Drasil.Citations + - Data.Drasil.Constraints + - Data.Drasil.SI_Units + - Data.Drasil.Concepts.Computation + - Data.Drasil.Concepts.Documentation + - Data.Drasil.Concepts.Thermodynamics + - Data.Drasil.Concepts.PhysicalProperties + - Data.Drasil.Concepts.Education + - Data.Drasil.Concepts.Physics + - Data.Drasil.Concepts.Software + - Data.Drasil.Concepts.Math + - Data.Drasil.Concepts.SolidMechanics + - Data.Drasil.ExternalLibraries.ODELibraries + - Data.Drasil.Software.Products + - Data.Drasil.Quantities.Thermodynamics + - Data.Drasil.Quantities.PhysicalProperties + - Data.Drasil.Quantities.Physics + - Data.Drasil.Quantities.Math + - Data.Drasil.Quantities.SolidMechanics + - Data.Drasil.Units.Thermodynamics + - Data.Drasil.Units.PhysicalProperties + - Data.Drasil.Units.Physics + - Data.Drasil.Units.SolidMechanics + - Data.Drasil.Theories.Physics diff --git a/code/drasil-data/stack.yaml b/code/drasil-data/stack.yaml index 9396add03e..6afd8e09ec 100644 --- a/code/drasil-data/stack.yaml +++ b/code/drasil-data/stack.yaml @@ -2,7 +2,7 @@ # # Some commonly used options have been documented as comments in this file. # For advanced use and comprehensive documentation of the format, please see: -# http://docs.haskellstack.org/en/stable/yaml_configuration/ +# https://docs.haskellstack.org/en/stable/yaml_configuration/ # Resolver to choose a 'specific' stackage snapshot or a compiler version. # A snapshot resolver dictates the compiler version and the set of packages @@ -11,11 +11,14 @@ # resolver: lts-3.5 # resolver: nightly-2015-09-21 # resolver: ghc-7.10.2 -# resolver: ghcjs-0.1.0_ghc-7.10.2 -# resolver: -# name: custom-snapshot -# location: "./custom-snapshot.yaml" -resolver: lts-11.2 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# resolver: ./custom-snapshot.yaml +# resolver: https://example.com/snapshots/2018-01-01.yaml +resolver: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. @@ -23,39 +26,46 @@ resolver: lts-11.2 # packages: # - some-directory # - https://example.com/foo/bar/baz-0.0.2.tar.gz -# - location: -# git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# extra-dep: true -# subdirs: -# - auto-update -# - wai -# -# A package marked 'extra-dep: true' will only be built if demanded by a -# non-dependency (i.e. a user package), and its test suites and benchmarks -# will not be run. This is useful for tweaking upstream packages. +# subdirs: +# - auto-update +# - wai packages: -- '.' -- ../drasil-lang/ -- ../drasil-code/ -- ../drasil-utils/ -# Dependency packages to be pulled from upstream that are not in the resolver -# (e.g., acme-missiles-0.3) -extra-deps: [] +- . +- ../drasil-code +- ../drasil-gool +- ../drasil-lang +- ../drasil-theory +- ../drasil-utils +# depends for drasil-code.... TODO: check if I can remove these packages lists for sub-dependencies! +- ../drasil-build +- ../drasil-database +- ../drasil-printers + +# Dependency packages to be pulled from upstream that are not in the resolver. +# These entries can reference officially published versions as well as +# forks / in-progress versions pinned to a git hash. For example: +# +# extra-deps: +# - acme-missiles-0.3 +# - git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# +extra-deps: +- unicode-names-3.2.0.0@sha256:fef7241d93170e26265e84553090253a5e8ee207645d47cf271816f5834d07d2,470 +- unicode-properties-3.2.0.0@sha256:239766a6ac4322329353f6b9cd546024fd8c5f0235c8e32b3cba2d6bd245a699,1000 # Override default flag values for local packages and extra-deps -flags: {} +# flags: {} # Extra package databases containing global packages -extra-package-dbs: [] +# extra-package-dbs: [] # Control whether we use the GHC we find on the path # system-ghc: true # # Require a specific version of stack, using version ranges # require-stack-version: -any # Default -# require-stack-version: ">=1.4" +# require-stack-version: ">=2.5" # # Override the architecture used by stack, especially useful on Windows # arch: i386 @@ -66,4 +76,4 @@ extra-package-dbs: [] # extra-lib-dirs: [/path/to/dir] # # Allow a newer minor version of GHC than the snapshot specifies -# compiler-check: newer-minor \ No newline at end of file +# compiler-check: newer-minor diff --git a/code/drasil-database/drasil-database.cabal b/code/drasil-database/drasil-database.cabal index 018fa61f1f..a135653c77 100644 --- a/code/drasil-database/drasil-database.cabal +++ b/code/drasil-database/drasil-database.cabal @@ -1,35 +1,48 @@ -Name: drasil-database -Version: 0.1.1 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +cabal-version: 1.12 + +-- This file has been generated from package.yaml by hpack version 0.33.0. +-- +-- see: https://github.com/sol/hpack +-- +-- hash: 7e82e4bbfd3e9357b3b10c93b3a35273dc5bc6b0eed1516f3406e2fa519f6f74 + +name: drasil-database +version: 0.1.1.0 +synopsis: A framework for code and document generation for scientific software - Database SubPackage +description: Please see the README on GitHub at +homepage: https://jacquescarette.github.io/Drasil/ +bug-reports: https://github.com/JacquesCarette/Drasil/issues +author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +maintainer: Jacques Carette +license: BSD3 build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Database SubPackage + +source-repository head + type: git + location: https://github.com/JacquesCarette/Drasil library exposed-modules: Database.Drasil other-modules: Database.Drasil.ChunkDB - , Database.Drasil.ChunkDB.GetChunk - , Database.Drasil.SystemInformation - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - data-fix (>= 0.0.4 && <= 1.0), - drasil-lang >= 0.1.60, - drasil-theory >= 0.1.0 + Database.Drasil.ChunkDB.GetChunk + Database.Drasil.SystemInformation + Paths_drasil_database + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints + build-depends: + MissingH >=1.4.0.1 + , base >=4.7 && <5 + , containers >=0.5.5.1 + , data-fix (>=0.0.4 && <=1.0) + , directory >=1.2.6.2 + , drasil-lang + , drasil-theory + , lens >=4.12 + , mtl >=2.2.1 + , parsec >=3.1.9 + , pretty >=1.1.1.1 + , split >=0.2.3.1 default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: database diff --git a/code/drasil-database/drasil-database.cabal.bak b/code/drasil-database/drasil-database.cabal.bak new file mode 100644 index 0000000000..018fa61f1f --- /dev/null +++ b/code/drasil-database/drasil-database.cabal.bak @@ -0,0 +1,35 @@ +Name: drasil-database +Version: 0.1.1 +Cabal-Version: >= 1.18 +Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +build-type: Simple +Synopsis: A framework for code and document generation for scientific software - Database SubPackage + +library + exposed-modules: + Database.Drasil + other-modules: + Database.Drasil.ChunkDB + , Database.Drasil.ChunkDB.GetChunk + , Database.Drasil.SystemInformation + + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + split >= 0.2.3.1, + MissingH >= 1.4.0.1, + parsec >= 3.1.9, + data-fix (>= 0.0.4 && <= 1.0), + drasil-lang >= 0.1.60, + drasil-theory >= 0.1.0 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + +source-repository head + type: git + location: git://github.com/JacquesCarette/Drasil.git + subdir: database diff --git a/code/drasil-database/package.yaml b/code/drasil-database/package.yaml new file mode 100644 index 0000000000..147cf0ef1e --- /dev/null +++ b/code/drasil-database/package.yaml @@ -0,0 +1,41 @@ +name: drasil-database +version: 0.1.1.0 +license: BSD3 +author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" +maintainer: "Jacques Carette" +synopsis: A framework for code and document generation for scientific software - Database SubPackage +github: JacquesCarette/Drasil +homepage: https://jacquescarette.github.io/Drasil/ + +extra-source-files: [] + +# Metadata used when publishing your package +# category: Web + +# To avoid duplicated efforts in documentation and dealing with the +# complications of embedding Haddock markup inside cabal files, it is +# common to point users to the README.md file. +description: Please see the README on GitHub at + +dependencies: +- base >= 4.7 && < 5 +- lens >= 4.12 +- containers >= 0.5.5.1 +- pretty >= 1.1.1.1 +- mtl >= 2.2.1 +- directory >= 1.2.6.2 +- split >= 0.2.3.1 +- MissingH >= 1.4.0.1 +- parsec >= 3.1.9 +- data-fix (>= 0.0.4 && <= 1.0) +- drasil-lang +- drasil-theory + +ghc-options: +- -Wall +- -Wredundant-constraints + +library: + source-dirs: ./ + exposed-modules: + - Database.Drasil diff --git a/code/drasil-database/stack.yaml b/code/drasil-database/stack.yaml index 591ec330b9..6dbf006c38 100644 --- a/code/drasil-database/stack.yaml +++ b/code/drasil-database/stack.yaml @@ -11,11 +11,14 @@ # resolver: lts-3.5 # resolver: nightly-2015-09-21 # resolver: ghc-7.10.2 -# resolver: ghcjs-0.1.0_ghc-7.10.2 -# resolver: -# name: custom-snapshot -# location: "./custom-snapshot.yaml" -resolver: lts-11.2 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# resolver: ./custom-snapshot.yaml +# resolver: https://example.com/snapshots/2018-01-01.yaml +resolver: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. @@ -23,24 +26,26 @@ resolver: lts-11.2 # packages: # - some-directory # - https://example.com/foo/bar/baz-0.0.2.tar.gz -# - location: -# git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# extra-dep: true -# subdirs: -# - auto-update -# - wai -# -# A package marked 'extra-dep: true' will only be built if demanded by a -# non-dependency (i.e. a user package), and its test suites and benchmarks -# will not be run. This is useful for tweaking upstream packages. +# subdirs: +# - auto-update +# - wai packages: +- . - ../drasil-lang -- ./ -# Dependency packages to be pulled from upstream that are not in the resolver -# (e.g., acme-missiles-0.3) -# extra-deps: [] +- ../drasil-theory + +# Dependency packages to be pulled from upstream that are not in the resolver. +# These entries can reference officially published versions as well as +# forks / in-progress versions pinned to a git hash. For example: +# +# extra-deps: +# - acme-missiles-0.3 +# - git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# +extra-deps: +- unicode-names-3.2.0.0@sha256:fef7241d93170e26265e84553090253a5e8ee207645d47cf271816f5834d07d2,470 +- unicode-properties-3.2.0.0@sha256:239766a6ac4322329353f6b9cd546024fd8c5f0235c8e32b3cba2d6bd245a699,1000 # Override default flag values for local packages and extra-deps # flags: {} @@ -53,7 +58,7 @@ packages: # # Require a specific version of stack, using version ranges # require-stack-version: -any # Default -# require-stack-version: ">=1.6" +# require-stack-version: ">=2.5" # # Override the architecture used by stack, especially useful on Windows # arch: i386 diff --git a/code/drasil-gool/drasil-gool.cabal b/code/drasil-gool/drasil-gool.cabal index 00643f3089..f5294f061a 100644 --- a/code/drasil-gool/drasil-gool.cabal +++ b/code/drasil-gool/drasil-gool.cabal @@ -1,51 +1,66 @@ -Name: drasil-gool -Version: 0.1.1 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith, Brooks MacLachlan +cabal-version: 1.12 + +-- This file has been generated from package.yaml by hpack version 0.33.0. +-- +-- see: https://github.com/sol/hpack +-- +-- hash: d4a7ae9ca32d4daa390a2291caa2231b5e5574a222825f5c072e55f21a81456f + +name: drasil-gool +version: 0.1.1.0 +synopsis: A framework for code and document generation for scientific software - GOOL SubPackage +description: Please see the README on GitHub at +homepage: https://jacquescarette.github.io/Drasil/ +bug-reports: https://github.com/JacquesCarette/Drasil/issues +author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith, Brooks MacLachlan +maintainer: Jacques Carette +license: BSD3 build-type: Simple -Synopsis: A framework for code and document generation for scientific software - GOOL SubPackage + +source-repository head + type: git + location: https://github.com/JacquesCarette/Drasil library exposed-modules: GOOL.Drasil other-modules: + GOOL.Drasil.AST + GOOL.Drasil.Classes + GOOL.Drasil.ClassInterface + GOOL.Drasil.CodeAnalysis + GOOL.Drasil.CodeInfo GOOL.Drasil.CodeType - , GOOL.Drasil.AST - , GOOL.Drasil.Classes - , GOOL.Drasil.Helpers - , GOOL.Drasil.CodeAnalysis - , GOOL.Drasil.CodeInfo - , GOOL.Drasil.LanguageRenderer.Constructors - , GOOL.Drasil.LanguageRenderer.LanguagePolymorphic - , GOOL.Drasil.LanguageRenderer.CommonPseudoOO - , GOOL.Drasil.LanguageRenderer.CLike - , GOOL.Drasil.LanguageRenderer.Macros - , GOOL.Drasil.LanguageRenderer - , GOOL.Drasil.LanguageRenderer.JavaRenderer - , GOOL.Drasil.LanguageRenderer.PythonRenderer - , GOOL.Drasil.LanguageRenderer.CSharpRenderer - , GOOL.Drasil.LanguageRenderer.CppRenderer - , GOOL.Drasil.LanguageRenderer.SwiftRenderer - , GOOL.Drasil.State - , GOOL.Drasil.ClassInterface - , GOOL.Drasil.RendererClasses - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - filepath >= 1.4.1, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - data-ordlist >= 0.4.7.0, - composition >= 1.0.2.1, - drasil-utils >= 0.1.1 + GOOL.Drasil.Helpers + GOOL.Drasil.LanguageRenderer + GOOL.Drasil.LanguageRenderer.CLike + GOOL.Drasil.LanguageRenderer.CommonPseudoOO + GOOL.Drasil.LanguageRenderer.Constructors + GOOL.Drasil.LanguageRenderer.CppRenderer + GOOL.Drasil.LanguageRenderer.CSharpRenderer + GOOL.Drasil.LanguageRenderer.JavaRenderer + GOOL.Drasil.LanguageRenderer.LanguagePolymorphic + GOOL.Drasil.LanguageRenderer.Macros + GOOL.Drasil.LanguageRenderer.PythonRenderer + GOOL.Drasil.LanguageRenderer.SwiftRenderer + GOOL.Drasil.RendererClasses + GOOL.Drasil.State + Paths_drasil_gool + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints + build-depends: + MissingH >=1.4.0.1 + , base >=4.7 && <5 + , composition + , containers >=0.5.5.1 + , data-fix (>=0.0.4 && <=1.0) + , data-ordlist >=0.4.7.0 + , directory >=1.2.6.2 + , drasil-utils + , filepath >=1.4.1 + , lens >=4.12 + , mtl >=2.2.1 + , pretty >=1.1.1.1 + , split >=0.2.3.1 default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-gool/drasil-gool.cabal.bak b/code/drasil-gool/drasil-gool.cabal.bak new file mode 100644 index 0000000000..00643f3089 --- /dev/null +++ b/code/drasil-gool/drasil-gool.cabal.bak @@ -0,0 +1,51 @@ +Name: drasil-gool +Version: 0.1.1 +Cabal-Version: >= 1.18 +Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith, Brooks MacLachlan +build-type: Simple +Synopsis: A framework for code and document generation for scientific software - GOOL SubPackage + +library + exposed-modules: + GOOL.Drasil + other-modules: + GOOL.Drasil.CodeType + , GOOL.Drasil.AST + , GOOL.Drasil.Classes + , GOOL.Drasil.Helpers + , GOOL.Drasil.CodeAnalysis + , GOOL.Drasil.CodeInfo + , GOOL.Drasil.LanguageRenderer.Constructors + , GOOL.Drasil.LanguageRenderer.LanguagePolymorphic + , GOOL.Drasil.LanguageRenderer.CommonPseudoOO + , GOOL.Drasil.LanguageRenderer.CLike + , GOOL.Drasil.LanguageRenderer.Macros + , GOOL.Drasil.LanguageRenderer + , GOOL.Drasil.LanguageRenderer.JavaRenderer + , GOOL.Drasil.LanguageRenderer.PythonRenderer + , GOOL.Drasil.LanguageRenderer.CSharpRenderer + , GOOL.Drasil.LanguageRenderer.CppRenderer + , GOOL.Drasil.LanguageRenderer.SwiftRenderer + , GOOL.Drasil.State + , GOOL.Drasil.ClassInterface + , GOOL.Drasil.RendererClasses + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + filepath >= 1.4.1, + split >= 0.2.3.1, + MissingH >= 1.4.0.1, + data-ordlist >= 0.4.7.0, + composition >= 1.0.2.1, + drasil-utils >= 0.1.1 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + +source-repository head + type: git + location: git://github.com/JacquesCarette/Drasil.git + subdir: code diff --git a/code/drasil-gool/package.yaml b/code/drasil-gool/package.yaml new file mode 100644 index 0000000000..3746101bbf --- /dev/null +++ b/code/drasil-gool/package.yaml @@ -0,0 +1,42 @@ +name: drasil-gool +version: 0.1.1.0 +license: BSD3 +author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith, Brooks MacLachlan" +maintainer: "Jacques Carette" +synopsis: A framework for code and document generation for scientific software - GOOL SubPackage +github: JacquesCarette/Drasil +homepage: https://jacquescarette.github.io/Drasil/ + +extra-source-files: [] + +# Metadata used when publishing your package +# category: Web + +# To avoid duplicated efforts in documentation and dealing with the +# complications of embedding Haddock markup inside cabal files, it is +# common to point users to the README.md file. +description: Please see the README on GitHub at + +dependencies: +- base >= 4.7 && < 5 +- lens >= 4.12 +- containers >= 0.5.5.1 +- pretty >= 1.1.1.1 +- mtl >= 2.2.1 +- directory >= 1.2.6.2 +- filepath >= 1.4.1 +- split >= 0.2.3.1 +- MissingH >= 1.4.0.1 +- data-fix (>= 0.0.4 && <= 1.0) +- data-ordlist >= 0.4.7.0 +- composition +- drasil-utils + +ghc-options: +- -Wall +- -Wredundant-constraints + +library: + source-dirs: ./ + exposed-modules: + - GOOL.Drasil diff --git a/code/drasil-gool/stack.yaml b/code/drasil-gool/stack.yaml new file mode 100644 index 0000000000..1496dab7a6 --- /dev/null +++ b/code/drasil-gool/stack.yaml @@ -0,0 +1,73 @@ +# This file was automatically generated by 'stack init' +# +# Some commonly used options have been documented as comments in this file. +# For advanced use and comprehensive documentation of the format, please see: +# https://docs.haskellstack.org/en/stable/yaml_configuration/ + +# Resolver to choose a 'specific' stackage snapshot or a compiler version. +# A snapshot resolver dictates the compiler version and the set of packages +# to be used for project dependencies. For example: +# +# resolver: lts-3.5 +# resolver: nightly-2015-09-21 +# resolver: ghc-7.10.2 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# resolver: ./custom-snapshot.yaml +# resolver: https://example.com/snapshots/2018-01-01.yaml +resolver: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml + +# User packages to be built. +# Various formats can be used as shown in the example below. +# +# packages: +# - some-directory +# - https://example.com/foo/bar/baz-0.0.2.tar.gz +# subdirs: +# - auto-update +# - wai +packages: +- . +- ../drasil-lang +- ../drasil-theory +- ../drasil-utils + +# Dependency packages to be pulled from upstream that are not in the resolver. +# These entries can reference officially published versions as well as +# forks / in-progress versions pinned to a git hash. For example: +# +# extra-deps: +# - acme-missiles-0.3 +# - git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# +extra-deps: +- unicode-names-3.2.0.0@sha256:fef7241d93170e26265e84553090253a5e8ee207645d47cf271816f5834d07d2,470 +- unicode-properties-3.2.0.0@sha256:239766a6ac4322329353f6b9cd546024fd8c5f0235c8e32b3cba2d6bd245a699,1000 + +# Override default flag values for local packages and extra-deps +# flags: {} + +# Extra package databases containing global packages +# extra-package-dbs: [] + +# Control whether we use the GHC we find on the path +# system-ghc: true +# +# Require a specific version of stack, using version ranges +# require-stack-version: -any # Default +# require-stack-version: ">=2.5" +# +# Override the architecture used by stack, especially useful on Windows +# arch: i386 +# arch: x86_64 +# +# Extra directories used by stack for building +# extra-include-dirs: [/path/to/dir] +# extra-lib-dirs: [/path/to/dir] +# +# Allow a newer minor version of GHC than the snapshot specifies +# compiler-check: newer-minor diff --git a/code/drasil-lang/drasil-lang.cabal b/code/drasil-lang/drasil-lang.cabal index a3c637d7db..dd67a55393 100644 --- a/code/drasil-lang/drasil-lang.cabal +++ b/code/drasil-lang/drasil-lang.cabal @@ -1,85 +1,99 @@ -Name: drasil-lang -Version: 0.1.60 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +cabal-version: 1.12 + +-- This file has been generated from package.yaml by hpack version 0.33.0. +-- +-- see: https://github.com/sol/hpack +-- +-- hash: 8591dd00de867f264a114edd2dbe1324059d0b1a4e0b17bf855e1d106cbe7c8f + +name: drasil-lang +version: 0.1.60.0 +synopsis: A framework for code and document generation for scientific software - Language SubPackage +description: Please see the README on GitHub at +homepage: https://jacquescarette.github.io/Drasil/ +bug-reports: https://github.com/JacquesCarette/Drasil/issues +author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +maintainer: Jacques Carette +license: BSD3 build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Language SubPackage + +source-repository head + type: git + location: https://github.com/JacquesCarette/Drasil library exposed-modules: + Data.Drasil.IdeaDicts Language.Drasil - , Language.Drasil.Development - , Data.Drasil.IdeaDicts - , Language.Drasil.ShortHands + Language.Drasil.Development + Language.Drasil.ShortHands other-modules: Language.Drasil.Chunk.Citation - , Language.Drasil.Chunk.CommonIdea - , Language.Drasil.Chunk.Concept - , Language.Drasil.Chunk.Concept.Core - , Language.Drasil.Chunk.Constrained - , Language.Drasil.Chunk.DefinedQuantity - , Language.Drasil.Chunk.Eq - , Language.Drasil.Chunk.NamedArgument - , Language.Drasil.Chunk.NamedIdea - , Language.Drasil.Chunk.Quantity - , Language.Drasil.Chunk.Relation - , Language.Drasil.Chunk.UncertainQuantity - , Language.Drasil.Chunk.Unital - , Language.Drasil.Chunk.Unitary - , Language.Drasil.Chunk.UnitaryConcept - , Language.Drasil.Chunk.UnitDefn - , Language.Drasil.Classes - , Language.Drasil.Classes.Core - , Language.Drasil.Classes.Citations - , Language.Drasil.Classes.Document - , Language.Drasil.Constraint - , Language.Drasil.Data.Citation - , Language.Drasil.Data.Date - , Language.Drasil.Document - , Language.Drasil.Document.Core - , Language.Drasil.Expr - , Language.Drasil.Expr.Extract - , Language.Drasil.Expr.Math - , Language.Drasil.Expr.Precedence - , Language.Drasil.Label.Type - , Language.Drasil.Misc - , Language.Drasil.NounPhrase - , Language.Drasil.NounPhrase.Core - , Language.Drasil.People - , Language.Drasil.Reference - , Language.Drasil.RefProg - , Language.Drasil.Sentence.Extract - , Language.Drasil.ShortName - , Language.Drasil.Space - , Language.Drasil.Sentence - , Language.Drasil.Stages - , Language.Drasil.Symbol - , Language.Drasil.Symbol.Helpers - , Language.Drasil.UID - , Language.Drasil.Uncertainty - , Language.Drasil.Uncertainty.Core - , Language.Drasil.Unicode - , Language.Drasil.UnitLang - , Language.Drasil.Derivation - , Language.Drasil.Development.Sentence - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - data-fix (>= 0.0.4 && <= 1.0), - unicode-names >= 3.2.0.0, - unicode-properties >= 3.2.0.0 + Language.Drasil.Chunk.CommonIdea + Language.Drasil.Chunk.Concept + Language.Drasil.Chunk.Concept.Core + Language.Drasil.Chunk.Constrained + Language.Drasil.Chunk.DefinedQuantity + Language.Drasil.Chunk.Eq + Language.Drasil.Chunk.NamedArgument + Language.Drasil.Chunk.NamedIdea + Language.Drasil.Chunk.Quantity + Language.Drasil.Chunk.Relation + Language.Drasil.Chunk.UncertainQuantity + Language.Drasil.Chunk.Unital + Language.Drasil.Chunk.Unitary + Language.Drasil.Chunk.UnitaryConcept + Language.Drasil.Chunk.UnitDefn + Language.Drasil.Classes + Language.Drasil.Classes.Citations + Language.Drasil.Classes.Core + Language.Drasil.Classes.Document + Language.Drasil.Constraint + Language.Drasil.Data.Citation + Language.Drasil.Data.Date + Language.Drasil.Derivation + Language.Drasil.Development.Sentence + Language.Drasil.Document + Language.Drasil.Document.Core + Language.Drasil.Expr + Language.Drasil.Expr.Extract + Language.Drasil.Expr.Math + Language.Drasil.Expr.Precedence + Language.Drasil.Label.Type + Language.Drasil.Misc + Language.Drasil.NounPhrase + Language.Drasil.NounPhrase.Core + Language.Drasil.People + Language.Drasil.Reference + Language.Drasil.RefProg + Language.Drasil.Sentence + Language.Drasil.Sentence.Extract + Language.Drasil.ShortName + Language.Drasil.Space + Language.Drasil.Stages + Language.Drasil.Symbol + Language.Drasil.Symbol.Helpers + Language.Drasil.UID + Language.Drasil.Uncertainty + Language.Drasil.Uncertainty.Core + Language.Drasil.Unicode + Language.Drasil.UnitLang + Language.Drasil.URI.AST + Paths_drasil_lang + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints + build-depends: + MissingH >=1.4.0.1 + , base >=4.7 && <5 + , containers >=0.5.5.1 + , data-fix (>=0.0.4 && <=1.0) + , directory >=1.2.6.2 + , lens >=4.12 + , mtl >=2.2.1 + , parsec >=3.1.9 + , pretty >=1.1.1.1 + , split >=0.2.3.1 + , unicode-names >=3.2.0.0 + , unicode-properties >=3.2.0.0 default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-lang/drasil-lang.cabal.bak b/code/drasil-lang/drasil-lang.cabal.bak new file mode 100644 index 0000000000..a3c637d7db --- /dev/null +++ b/code/drasil-lang/drasil-lang.cabal.bak @@ -0,0 +1,85 @@ +Name: drasil-lang +Version: 0.1.60 +Cabal-Version: >= 1.18 +Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +build-type: Simple +Synopsis: A framework for code and document generation for scientific software - Language SubPackage + +library + exposed-modules: + Language.Drasil + , Language.Drasil.Development + , Data.Drasil.IdeaDicts + , Language.Drasil.ShortHands + other-modules: + Language.Drasil.Chunk.Citation + , Language.Drasil.Chunk.CommonIdea + , Language.Drasil.Chunk.Concept + , Language.Drasil.Chunk.Concept.Core + , Language.Drasil.Chunk.Constrained + , Language.Drasil.Chunk.DefinedQuantity + , Language.Drasil.Chunk.Eq + , Language.Drasil.Chunk.NamedArgument + , Language.Drasil.Chunk.NamedIdea + , Language.Drasil.Chunk.Quantity + , Language.Drasil.Chunk.Relation + , Language.Drasil.Chunk.UncertainQuantity + , Language.Drasil.Chunk.Unital + , Language.Drasil.Chunk.Unitary + , Language.Drasil.Chunk.UnitaryConcept + , Language.Drasil.Chunk.UnitDefn + , Language.Drasil.Classes + , Language.Drasil.Classes.Core + , Language.Drasil.Classes.Citations + , Language.Drasil.Classes.Document + , Language.Drasil.Constraint + , Language.Drasil.Data.Citation + , Language.Drasil.Data.Date + , Language.Drasil.Document + , Language.Drasil.Document.Core + , Language.Drasil.Expr + , Language.Drasil.Expr.Extract + , Language.Drasil.Expr.Math + , Language.Drasil.Expr.Precedence + , Language.Drasil.Label.Type + , Language.Drasil.Misc + , Language.Drasil.NounPhrase + , Language.Drasil.NounPhrase.Core + , Language.Drasil.People + , Language.Drasil.Reference + , Language.Drasil.RefProg + , Language.Drasil.Sentence.Extract + , Language.Drasil.ShortName + , Language.Drasil.Space + , Language.Drasil.Sentence + , Language.Drasil.Stages + , Language.Drasil.Symbol + , Language.Drasil.Symbol.Helpers + , Language.Drasil.UID + , Language.Drasil.Uncertainty + , Language.Drasil.Uncertainty.Core + , Language.Drasil.Unicode + , Language.Drasil.UnitLang + , Language.Drasil.Derivation + , Language.Drasil.Development.Sentence + + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + split >= 0.2.3.1, + MissingH >= 1.4.0.1, + parsec >= 3.1.9, + data-fix (>= 0.0.4 && <= 1.0), + unicode-names >= 3.2.0.0, + unicode-properties >= 3.2.0.0 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + +source-repository head + type: git + location: git://github.com/JacquesCarette/Drasil.git + subdir: code diff --git a/code/drasil-lang/package.yaml b/code/drasil-lang/package.yaml new file mode 100644 index 0000000000..2824ae64b3 --- /dev/null +++ b/code/drasil-lang/package.yaml @@ -0,0 +1,44 @@ +name: drasil-lang +version: 0.1.60.0 +license: BSD3 +author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" +maintainer: "Jacques Carette" +synopsis: A framework for code and document generation for scientific software - Language SubPackage +github: JacquesCarette/Drasil +homepage: https://jacquescarette.github.io/Drasil/ + +extra-source-files: [] + +# Metadata used when publishing your package +# category: Web + +# To avoid duplicated efforts in documentation and dealing with the +# complications of embedding Haddock markup inside cabal files, it is +# common to point users to the README.md file. +description: Please see the README on GitHub at + +dependencies: +- base >= 4.7 && < 5 +- lens >= 4.12 +- containers >= 0.5.5.1 +- pretty >= 1.1.1.1 +- mtl >= 2.2.1 +- directory >= 1.2.6.2 +- split >= 0.2.3.1 +- MissingH >= 1.4.0.1 +- parsec >= 3.1.9 +- data-fix (>= 0.0.4 && <= 1.0) +- unicode-names >= 3.2.0.0 +- unicode-properties >= 3.2.0.0 + +ghc-options: +- -Wall +- -Wredundant-constraints + +library: + source-dirs: ./ + exposed-modules: + - Data.Drasil.IdeaDicts + - Language.Drasil + - Language.Drasil.Development + - Language.Drasil.ShortHands diff --git a/code/drasil-lang/stack.yaml b/code/drasil-lang/stack.yaml index df575a3065..620e39f51f 100644 --- a/code/drasil-lang/stack.yaml +++ b/code/drasil-lang/stack.yaml @@ -11,11 +11,14 @@ # resolver: lts-3.5 # resolver: nightly-2015-09-21 # resolver: ghc-7.10.2 -# resolver: ghcjs-0.1.0_ghc-7.10.2 -# resolver: -# name: custom-snapshot -# location: "./custom-snapshot.yaml" -resolver: lts-11.2 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# resolver: ./custom-snapshot.yaml +# resolver: https://example.com/snapshots/2018-01-01.yaml +resolver: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. @@ -23,23 +26,24 @@ resolver: lts-11.2 # packages: # - some-directory # - https://example.com/foo/bar/baz-0.0.2.tar.gz -# - location: -# git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# extra-dep: true -# subdirs: -# - auto-update -# - wai -# -# A package marked 'extra-dep: true' will only be built if demanded by a -# non-dependency (i.e. a user package), and its test suites and benchmarks -# will not be run. This is useful for tweaking upstream packages. +# subdirs: +# - auto-update +# - wai packages: - . -# Dependency packages to be pulled from upstream that are not in the resolver -# (e.g., acme-missiles-0.3) -# extra-deps: [] + +# Dependency packages to be pulled from upstream that are not in the resolver. +# These entries can reference officially published versions as well as +# forks / in-progress versions pinned to a git hash. For example: +# +# extra-deps: +# - acme-missiles-0.3 +# - git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# +extra-deps: +- unicode-names-3.2.0.0@sha256:fef7241d93170e26265e84553090253a5e8ee207645d47cf271816f5834d07d2,470 +- unicode-properties-3.2.0.0@sha256:239766a6ac4322329353f6b9cd546024fd8c5f0235c8e32b3cba2d6bd245a699,1000 # Override default flag values for local packages and extra-deps # flags: {} @@ -52,7 +56,7 @@ packages: # # Require a specific version of stack, using version ranges # require-stack-version: -any # Default -# require-stack-version: ">=1.6" +# require-stack-version: ">=2.5" # # Override the architecture used by stack, especially useful on Windows # arch: i386 diff --git a/code/drasil-printers/drasil-printers.cabal b/code/drasil-printers/drasil-printers.cabal index 61ae0701c4..607f43e321 100644 --- a/code/drasil-printers/drasil-printers.cabal +++ b/code/drasil-printers/drasil-printers.cabal @@ -1,55 +1,67 @@ -Name: drasil-printers -Version: 0.1.10 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +cabal-version: 1.12 + +-- This file has been generated from package.yaml by hpack version 0.33.0. +-- +-- see: https://github.com/sol/hpack +-- +-- hash: 50c94568d0af4ca381a2b497c6b22bfcb03c5418f18e9acaaaf6900245b2b421 + +name: drasil-printers +version: 0.1.10.0 +synopsis: A framework for code and document generation for scientific software - Printers SubPackage +description: Please see the README on GitHub at +homepage: https://jacquescarette.github.io/Drasil/ +bug-reports: https://github.com/JacquesCarette/Drasil/issues +author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +maintainer: Jacques Carette +license: BSD3 build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Printers SubPackage + +source-repository head + type: git + location: https://github.com/JacquesCarette/Drasil library exposed-modules: Language.Drasil.Printers other-modules: Language.Drasil.Config - , Language.Drasil.Format - , Language.Drasil.Output.Formats - , Language.Drasil.HTML.CSS - , Language.Drasil.HTML.Helpers - , Language.Drasil.HTML.Print - , Language.Drasil.HTML.Monad - , Language.Drasil.Markdown.CreateMd - , Language.Drasil.Plain.Helpers - , Language.Drasil.Plain.Print - , Language.Drasil.Printing.Helpers - , Language.Drasil.Printing.AST - , Language.Drasil.Printing.Citation - , Language.Drasil.Printing.Import - , Language.Drasil.Printing.LayoutObj - , Language.Drasil.Printing.PrintingInformation - , Language.Drasil.TeX.Helpers - , Language.Drasil.TeX.Print - , Language.Drasil.TeX.Monad - , Language.Drasil.TeX.Preamble - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - data-fix (>= 0.0.4 && <= 1.0), - drasil-lang >= 0.1.59, - drasil-utils >= 0.1.0, - drasil-build >= 0.1.1, - drasil-database >= 0.1.0 + Language.Drasil.Format + Language.Drasil.HTML.CSS + Language.Drasil.HTML.Helpers + Language.Drasil.HTML.Monad + Language.Drasil.HTML.Print + Language.Drasil.Markdown.CreateMd + Language.Drasil.Output.Formats + Language.Drasil.Plain.Helpers + Language.Drasil.Plain.Print + Language.Drasil.Printing.AST + Language.Drasil.Printing.Citation + Language.Drasil.Printing.Helpers + Language.Drasil.Printing.Import + Language.Drasil.Printing.LayoutObj + Language.Drasil.Printing.PrintingInformation + Language.Drasil.TeX.Helpers + Language.Drasil.TeX.Monad + Language.Drasil.TeX.Preamble + Language.Drasil.TeX.Print + Paths_drasil_printers + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints + build-depends: + MissingH >=1.4.0.1 + , base >=4.7 && <5 + , containers >=0.5.5.1 + , data-fix (>=0.0.4 && <=1.0) + , directory >=1.2.6.2 + , drasil-build + , drasil-database + , drasil-lang + , drasil-utils + , lens >=4.12 + , mtl >=2.2.1 + , parsec >=3.1.9 + , pretty >=1.1.1.1 + , split >=0.2.3.1 default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-printers/drasil-printers.cabal.bak b/code/drasil-printers/drasil-printers.cabal.bak new file mode 100644 index 0000000000..61ae0701c4 --- /dev/null +++ b/code/drasil-printers/drasil-printers.cabal.bak @@ -0,0 +1,55 @@ +Name: drasil-printers +Version: 0.1.10 +Cabal-Version: >= 1.18 +Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +build-type: Simple +Synopsis: A framework for code and document generation for scientific software - Printers SubPackage + +library + exposed-modules: + Language.Drasil.Printers + other-modules: + Language.Drasil.Config + , Language.Drasil.Format + , Language.Drasil.Output.Formats + , Language.Drasil.HTML.CSS + , Language.Drasil.HTML.Helpers + , Language.Drasil.HTML.Print + , Language.Drasil.HTML.Monad + , Language.Drasil.Markdown.CreateMd + , Language.Drasil.Plain.Helpers + , Language.Drasil.Plain.Print + , Language.Drasil.Printing.Helpers + , Language.Drasil.Printing.AST + , Language.Drasil.Printing.Citation + , Language.Drasil.Printing.Import + , Language.Drasil.Printing.LayoutObj + , Language.Drasil.Printing.PrintingInformation + , Language.Drasil.TeX.Helpers + , Language.Drasil.TeX.Print + , Language.Drasil.TeX.Monad + , Language.Drasil.TeX.Preamble + + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + split >= 0.2.3.1, + MissingH >= 1.4.0.1, + parsec >= 3.1.9, + data-fix (>= 0.0.4 && <= 1.0), + drasil-lang >= 0.1.59, + drasil-utils >= 0.1.0, + drasil-build >= 0.1.1, + drasil-database >= 0.1.0 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + + +source-repository head + type: git + location: git://github.com/JacquesCarette/Drasil.git + subdir: code diff --git a/code/drasil-printers/package.yaml b/code/drasil-printers/package.yaml new file mode 100644 index 0000000000..091f51105d --- /dev/null +++ b/code/drasil-printers/package.yaml @@ -0,0 +1,43 @@ +name: drasil-printers +version: 0.1.10.0 +license: BSD3 +author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" +maintainer: "Jacques Carette" +synopsis: A framework for code and document generation for scientific software - Printers SubPackage +github: JacquesCarette/Drasil +homepage: https://jacquescarette.github.io/Drasil/ + +extra-source-files: [] + +# Metadata used when publishing your package +# category: Web + +# To avoid duplicated efforts in documentation and dealing with the +# complications of embedding Haddock markup inside cabal files, it is +# common to point users to the README.md file. +description: Please see the README on GitHub at + +dependencies: +- base >= 4.7 && < 5 +- lens >= 4.12 +- containers >= 0.5.5.1 +- pretty >= 1.1.1.1 +- mtl >= 2.2.1 +- directory >= 1.2.6.2 +- split >= 0.2.3.1 +- MissingH >= 1.4.0.1 +- parsec >= 3.1.9 +- data-fix (>= 0.0.4 && <= 1.0) +- drasil-build +- drasil-database +- drasil-lang +- drasil-utils + +ghc-options: +- -Wall +- -Wredundant-constraints + +library: + source-dirs: ./ + exposed-modules: + - Language.Drasil.Printers diff --git a/code/drasil-printers/stack.yaml b/code/drasil-printers/stack.yaml index 984bb489a0..b188271297 100644 --- a/code/drasil-printers/stack.yaml +++ b/code/drasil-printers/stack.yaml @@ -11,11 +11,14 @@ # resolver: lts-3.5 # resolver: nightly-2015-09-21 # resolver: ghc-7.10.2 -# resolver: ghcjs-0.1.0_ghc-7.10.2 -# resolver: -# name: custom-snapshot -# location: "./custom-snapshot.yaml" -resolver: lts-11.2 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# resolver: ./custom-snapshot.yaml +# resolver: https://example.com/snapshots/2018-01-01.yaml +resolver: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. @@ -23,27 +26,29 @@ resolver: lts-11.2 # packages: # - some-directory # - https://example.com/foo/bar/baz-0.0.2.tar.gz -# - location: -# git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# extra-dep: true -# subdirs: -# - auto-update -# - wai -# -# A package marked 'extra-dep: true' will only be built if demanded by a -# non-dependency (i.e. a user package), and its test suites and benchmarks -# will not be run. This is useful for tweaking upstream packages. +# subdirs: +# - auto-update +# - wai packages: -- ../drasil-lang -- ../drasil-data +- . - ../drasil-build - ../drasil-database -- ./ -# Dependency packages to be pulled from upstream that are not in the resolver -# (e.g., acme-missiles-0.3) -# extra-deps: [] +- ../drasil-lang +- ../drasil-utils +- ../drasil-theory + +# Dependency packages to be pulled from upstream that are not in the resolver. +# These entries can reference officially published versions as well as +# forks / in-progress versions pinned to a git hash. For example: +# +# extra-deps: +# - acme-missiles-0.3 +# - git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# +extra-deps: +- unicode-names-3.2.0.0@sha256:fef7241d93170e26265e84553090253a5e8ee207645d47cf271816f5834d07d2,470 +- unicode-properties-3.2.0.0@sha256:239766a6ac4322329353f6b9cd546024fd8c5f0235c8e32b3cba2d6bd245a699,1000 # Override default flag values for local packages and extra-deps # flags: {} @@ -56,7 +61,7 @@ packages: # # Require a specific version of stack, using version ranges # require-stack-version: -any # Default -# require-stack-version: ">=1.6" +# require-stack-version: ">=2.5" # # Override the architecture used by stack, especially useful on Windows # arch: i386 diff --git a/code/drasil-theory/drasil-theory.cabal b/code/drasil-theory/drasil-theory.cabal index d1cd4c2bdc..0b1ff329e9 100644 --- a/code/drasil-theory/drasil-theory.cabal +++ b/code/drasil-theory/drasil-theory.cabal @@ -1,36 +1,49 @@ -Name: drasil-theory -Version: 0.1.0 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +cabal-version: 1.12 + +-- This file has been generated from package.yaml by hpack version 0.33.0. +-- +-- see: https://github.com/sol/hpack +-- +-- hash: f0acc47d370c39ad9c04dfb274d7693b5187fe8056274da68391e72bec9b838b + +name: drasil-theory +version: 0.1.0.0 +synopsis: A framework for code and document generation for scientific software - Theory SubPackage +description: Please see the README on GitHub at +homepage: https://jacquescarette.github.io/Drasil/ +bug-reports: https://github.com/JacquesCarette/Drasil/issues +author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +maintainer: Jacques Carette +license: BSD3 build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Theory SubPackage + +source-repository head + type: git + location: https://github.com/JacquesCarette/Drasil library exposed-modules: Theory.Drasil other-modules: Theory.Drasil.Classes - , Theory.Drasil.DataDefinition - , Theory.Drasil.GenDefn - , Theory.Drasil.InstanceModel - , Theory.Drasil.Theory - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - data-fix (>= 0.0.4 && <= 1.0), - drasil-lang >= 0.1.60 + Theory.Drasil.DataDefinition + Theory.Drasil.GenDefn + Theory.Drasil.InstanceModel + Theory.Drasil.Theory + Paths_drasil_theory + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints + build-depends: + MissingH >=1.4.0.1 + , base >=4.7 && <5 + , containers >=0.5.5.1 + , data-fix (>=0.0.4 && <=1.0) + , directory >=1.2.6.2 + , drasil-lang + , lens >=4.12 + , mtl >=2.2.1 + , parsec >=3.1.9 + , pretty >=1.1.1.1 + , split >=0.2.3.1 default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-theory/drasil-theory.cabal.bak b/code/drasil-theory/drasil-theory.cabal.bak new file mode 100644 index 0000000000..d1cd4c2bdc --- /dev/null +++ b/code/drasil-theory/drasil-theory.cabal.bak @@ -0,0 +1,36 @@ +Name: drasil-theory +Version: 0.1.0 +Cabal-Version: >= 1.18 +Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +build-type: Simple +Synopsis: A framework for code and document generation for scientific software - Theory SubPackage + +library + exposed-modules: + Theory.Drasil + other-modules: + Theory.Drasil.Classes + , Theory.Drasil.DataDefinition + , Theory.Drasil.GenDefn + , Theory.Drasil.InstanceModel + , Theory.Drasil.Theory + + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + split >= 0.2.3.1, + MissingH >= 1.4.0.1, + parsec >= 3.1.9, + data-fix (>= 0.0.4 && <= 1.0), + drasil-lang >= 0.1.60 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + +source-repository head + type: git + location: git://github.com/JacquesCarette/Drasil.git + subdir: code diff --git a/code/drasil-theory/package.yaml b/code/drasil-theory/package.yaml new file mode 100644 index 0000000000..33dfb55cc9 --- /dev/null +++ b/code/drasil-theory/package.yaml @@ -0,0 +1,40 @@ +name: drasil-theory +version: 0.1.0.0 +license: BSD3 +author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" +maintainer: "Jacques Carette" +synopsis: A framework for code and document generation for scientific software - Theory SubPackage +github: JacquesCarette/Drasil +homepage: https://jacquescarette.github.io/Drasil/ + +extra-source-files: [] + +# Metadata used when publishing your package +# category: Web + +# To avoid duplicated efforts in documentation and dealing with the +# complications of embedding Haddock markup inside cabal files, it is +# common to point users to the README.md file. +description: Please see the README on GitHub at + +dependencies: +- base >= 4.7 && < 5 +- lens >= 4.12 +- containers >= 0.5.5.1 +- pretty >= 1.1.1.1 +- mtl >= 2.2.1 +- directory >= 1.2.6.2 +- split >= 0.2.3.1 +- MissingH >= 1.4.0.1 +- parsec >= 3.1.9 +- data-fix (>= 0.0.4 && <= 1.0) +- drasil-lang + +ghc-options: +- -Wall +- -Wredundant-constraints + +library: + source-dirs: ./ + exposed-modules: + - Theory.Drasil diff --git a/code/drasil-theory/stack.yaml b/code/drasil-theory/stack.yaml index 1a54147805..111756ef82 100644 --- a/code/drasil-theory/stack.yaml +++ b/code/drasil-theory/stack.yaml @@ -11,11 +11,14 @@ # resolver: lts-3.5 # resolver: nightly-2015-09-21 # resolver: ghc-7.10.2 -# resolver: ghcjs-0.1.0_ghc-7.10.2 -# resolver: -# name: custom-snapshot -# location: "./custom-snapshot.yaml" -resolver: lts-11.2 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# resolver: ./custom-snapshot.yaml +# resolver: https://example.com/snapshots/2018-01-01.yaml +resolver: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. @@ -23,24 +26,25 @@ resolver: lts-11.2 # packages: # - some-directory # - https://example.com/foo/bar/baz-0.0.2.tar.gz -# - location: -# git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# extra-dep: true -# subdirs: -# - auto-update -# - wai -# -# A package marked 'extra-dep: true' will only be built if demanded by a -# non-dependency (i.e. a user package), and its test suites and benchmarks -# will not be run. This is useful for tweaking upstream packages. +# subdirs: +# - auto-update +# - wai packages: -- drasil-lang/ -- ./ -# Dependency packages to be pulled from upstream that are not in the resolver -# (e.g., acme-missiles-0.3) -# extra-deps: [] +- . +- ../drasil-lang/ + +# Dependency packages to be pulled from upstream that are not in the resolver. +# These entries can reference officially published versions as well as +# forks / in-progress versions pinned to a git hash. For example: +# +# extra-deps: +# - acme-missiles-0.3 +# - git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# +extra-deps: +- unicode-names-3.2.0.0@sha256:fef7241d93170e26265e84553090253a5e8ee207645d47cf271816f5834d07d2,470 +- unicode-properties-3.2.0.0@sha256:239766a6ac4322329353f6b9cd546024fd8c5f0235c8e32b3cba2d6bd245a699,1000 # Override default flag values for local packages and extra-deps # flags: {} @@ -53,7 +57,7 @@ packages: # # Require a specific version of stack, using version ranges # require-stack-version: -any # Default -# require-stack-version: ">=1.6" +# require-stack-version: ">=2.5" # # Override the architecture used by stack, especially useful on Windows # arch: i386 diff --git a/code/drasil-utils/drasil-utils.cabal b/code/drasil-utils/drasil-utils.cabal index 8ad700c871..8006bfd653 100644 --- a/code/drasil-utils/drasil-utils.cabal +++ b/code/drasil-utils/drasil-utils.cabal @@ -1,41 +1,53 @@ -Name: drasil-utils -Version: 0.1.1 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +cabal-version: 1.12 + +-- This file has been generated from package.yaml by hpack version 0.33.0. +-- +-- see: https://github.com/sol/hpack +-- +-- hash: f1f37c423fba2052457c0613f886254999e20582bf93f1ae2bd89b69faac29a7 + +name: drasil-utils +version: 0.1.1.0 +synopsis: A framework for code and document generation for scientific software - Utils SubPackage +description: Please see the README on GitHub at +homepage: https://jacquescarette.github.io/Drasil/ +bug-reports: https://github.com/JacquesCarette/Drasil/issues +author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +maintainer: Jacques Carette +license: BSD3 build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Utils SubPackage + +source-repository head + type: git + location: https://github.com/JacquesCarette/Drasil library exposed-modules: - Utils.Drasil - + Utils.Drasil other-modules: - Utils.Drasil.Contents - , Utils.Drasil.Document - , Utils.Drasil.English - , Utils.Drasil.Fold - , Utils.Drasil.Misc - , Utils.Drasil.Phrase - , Utils.Drasil.Sentence - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - data-fix (>= 0.0.4 && <= 1.0), - Decimal >= 0.5.1, - drasil-lang >= 0.1.56, - drasil-theory >= 0.1.0 + Utils.Drasil.Contents + Utils.Drasil.Document + Utils.Drasil.English + Utils.Drasil.Fold + Utils.Drasil.Misc + Utils.Drasil.Phrase + Utils.Drasil.Sentence + Paths_drasil_utils + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints + build-depends: + Decimal >=0.5.1 + , MissingH >=1.4.0.1 + , base >=4.7 && <5 + , containers >=0.5.5.1 + , data-fix (>=0.0.4 && <=1.0) + , directory >=1.2.6.2 + , drasil-lang + , drasil-theory + , lens >=4.12 + , mtl >=2.2.1 + , parsec >=3.1.9 + , pretty >=1.1.1.1 + , split >=0.2.3.1 default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-utils/drasil-utils.cabal.bak b/code/drasil-utils/drasil-utils.cabal.bak new file mode 100644 index 0000000000..8ad700c871 --- /dev/null +++ b/code/drasil-utils/drasil-utils.cabal.bak @@ -0,0 +1,41 @@ +Name: drasil-utils +Version: 0.1.1 +Cabal-Version: >= 1.18 +Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +build-type: Simple +Synopsis: A framework for code and document generation for scientific software - Utils SubPackage + +library + exposed-modules: + Utils.Drasil + + other-modules: + Utils.Drasil.Contents + , Utils.Drasil.Document + , Utils.Drasil.English + , Utils.Drasil.Fold + , Utils.Drasil.Misc + , Utils.Drasil.Phrase + , Utils.Drasil.Sentence + + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + split >= 0.2.3.1, + MissingH >= 1.4.0.1, + parsec >= 3.1.9, + data-fix (>= 0.0.4 && <= 1.0), + Decimal >= 0.5.1, + drasil-lang >= 0.1.56, + drasil-theory >= 0.1.0 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + +source-repository head + type: git + location: git://github.com/JacquesCarette/Drasil.git + subdir: code diff --git a/code/drasil-utils/package.yaml b/code/drasil-utils/package.yaml new file mode 100644 index 0000000000..08428dbd67 --- /dev/null +++ b/code/drasil-utils/package.yaml @@ -0,0 +1,42 @@ +name: drasil-utils +version: 0.1.1.0 +license: BSD3 +author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" +maintainer: "Jacques Carette" +synopsis: A framework for code and document generation for scientific software - Utils SubPackage +github: JacquesCarette/Drasil +homepage: https://jacquescarette.github.io/Drasil/ + +extra-source-files: [] + +# Metadata used when publishing your package +# category: Web + +# To avoid duplicated efforts in documentation and dealing with the +# complications of embedding Haddock markup inside cabal files, it is +# common to point users to the README.md file. +description: Please see the README on GitHub at + +dependencies: +- base >= 4.7 && < 5 +- lens >= 4.12 +- containers >= 0.5.5.1 +- pretty >= 1.1.1.1 +- mtl >= 2.2.1 +- directory >= 1.2.6.2 +- split >= 0.2.3.1 +- MissingH >= 1.4.0.1 +- parsec >= 3.1.9 +- data-fix (>= 0.0.4 && <= 1.0) +- Decimal >= 0.5.1 +- drasil-lang +- drasil-theory + +ghc-options: +- -Wall +- -Wredundant-constraints + +library: + source-dirs: ./ + exposed-modules: + - Utils.Drasil diff --git a/code/drasil-utils/stack.yaml b/code/drasil-utils/stack.yaml index b2a4800a8b..56419d6783 100644 --- a/code/drasil-utils/stack.yaml +++ b/code/drasil-utils/stack.yaml @@ -2,7 +2,7 @@ # # Some commonly used options have been documented as comments in this file. # For advanced use and comprehensive documentation of the format, please see: -# http://docs.haskellstack.org/en/stable/yaml_configuration/ +# https://docs.haskellstack.org/en/stable/yaml_configuration/ # Resolver to choose a 'specific' stackage snapshot or a compiler version. # A snapshot resolver dictates the compiler version and the set of packages @@ -11,11 +11,14 @@ # resolver: lts-3.5 # resolver: nightly-2015-09-21 # resolver: ghc-7.10.2 -# resolver: ghcjs-0.1.0_ghc-7.10.2 -# resolver: -# name: custom-snapshot -# location: "./custom-snapshot.yaml" -resolver: lts-11.2 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# resolver: ./custom-snapshot.yaml +# resolver: https://example.com/snapshots/2018-01-01.yaml +resolver: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. @@ -23,37 +26,39 @@ resolver: lts-11.2 # packages: # - some-directory # - https://example.com/foo/bar/baz-0.0.2.tar.gz -# - location: -# git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# extra-dep: true -# subdirs: -# - auto-update -# - wai -# -# A package marked 'extra-dep: true' will only be built if demanded by a -# non-dependency (i.e. a user package), and its test suites and benchmarks -# will not be run. This is useful for tweaking upstream packages. +# subdirs: +# - auto-update +# - wai packages: -- '.' +- . - ../drasil-lang/ -# Dependency packages to be pulled from upstream that are not in the resolver -# (e.g., acme-missiles-0.3) -extra-deps: [] +- ../drasil-theory/ + +# Dependency packages to be pulled from upstream that are not in the resolver. +# These entries can reference officially published versions as well as +# forks / in-progress versions pinned to a git hash. For example: +# +# extra-deps: +# - acme-missiles-0.3 +# - git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# +extra-deps: +- unicode-names-3.2.0.0@sha256:fef7241d93170e26265e84553090253a5e8ee207645d47cf271816f5834d07d2,470 +- unicode-properties-3.2.0.0@sha256:239766a6ac4322329353f6b9cd546024fd8c5f0235c8e32b3cba2d6bd245a699,1000 # Override default flag values for local packages and extra-deps -flags: {} +# flags: {} # Extra package databases containing global packages -extra-package-dbs: [] +# extra-package-dbs: [] # Control whether we use the GHC we find on the path # system-ghc: true # # Require a specific version of stack, using version ranges # require-stack-version: -any # Default -# require-stack-version: ">=1.4" +# require-stack-version: ">=2.5" # # Override the architecture used by stack, especially useful on Windows # arch: i386 @@ -64,4 +69,4 @@ extra-package-dbs: [] # extra-lib-dirs: [/path/to/dir] # # Allow a newer minor version of GHC than the snapshot specifies -# compiler-check: newer-minor \ No newline at end of file +# compiler-check: newer-minor From 38624de9b3dfae0a1e7cd6e308483853dccc7a74 Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Sat, 23 Jan 2021 22:12:36 -0500 Subject: [PATCH 02/13] 2292 : WIP : few more conversions --- code/drasil-code/Language/Drasil/Code/AST.hs | 5 +- code/drasil-code/drasil-code.cabal | 316 ++++++++++--------- code/drasil-code/drasil-code.cabal.bak | 160 ++++++++++ code/drasil-code/package.yaml | 61 ++++ code/drasil-code/stack.yaml | 52 +-- code/drasil-docLang/drasil-docLang.cabal | 117 ++++--- code/drasil-docLang/drasil-docLang.cabal.bak | 60 ++++ code/drasil-docLang/package.yaml | 49 +++ code/drasil-docLang/stack.yaml | 58 ++-- code/drasil-gen/drasil-gen.cabal | 73 +++-- code/drasil-gen/drasil-gen.cabal.bak | 35 ++ code/drasil-gen/package.yaml | 44 +++ code/drasil-gen/stack.yaml | 52 +-- code/drasil-utils/stack.yaml | 4 +- 14 files changed, 786 insertions(+), 300 deletions(-) create mode 100644 code/drasil-code/drasil-code.cabal.bak create mode 100644 code/drasil-code/package.yaml create mode 100644 code/drasil-docLang/drasil-docLang.cabal.bak create mode 100644 code/drasil-docLang/package.yaml create mode 100644 code/drasil-gen/drasil-gen.cabal.bak create mode 100644 code/drasil-gen/package.yaml diff --git a/code/drasil-code/Language/Drasil/Code/AST.hs b/code/drasil-code/Language/Drasil/Code/AST.hs index 97b8239e74..64a52caa29 100644 --- a/code/drasil-code/Language/Drasil/Code/AST.hs +++ b/code/drasil-code/Language/Drasil/Code/AST.hs @@ -33,7 +33,10 @@ data Visibility = Public | Private data Objective where - Calculation :: EqChunk -> Objective + -- TODO: Double check that this is the correct correction -- Jason Balaci + -- Remember: Changed EqChunk to QDefinition + + Calculation :: QDefinition -> Objective Call :: Function -> [Expr] -> Objective GetInput :: (Quantity c) => c -> Objective PrintOutput :: Output -> Objective diff --git a/code/drasil-code/drasil-code.cabal b/code/drasil-code/drasil-code.cabal index d04eb84a16..ac38a3a35b 100644 --- a/code/drasil-code/drasil-code.cabal +++ b/code/drasil-code/drasil-code.cabal @@ -1,160 +1,184 @@ -Name: drasil-code -Version: 0.1.9 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +cabal-version: 1.12 + +-- This file has been generated from package.yaml by hpack version 0.33.0. +-- +-- see: https://github.com/sol/hpack +-- +-- hash: b6618c3d3c5fa45e4ccec9bb470180364427a953ef1cdf14b3277b4a1ff19a40 + +name: drasil-code +version: 0.1.9.0 +synopsis: A framework for code and document generation for scientific software - Code SubPackage +description: Please see the README on GitHub at +homepage: https://jacquescarette.github.io/Drasil/ +bug-reports: https://github.com/JacquesCarette/Drasil/issues +author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +maintainer: Jacques Carette +license: BSD3 build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Code SubPackage + +source-repository head + type: git + location: https://github.com/JacquesCarette/Drasil library exposed-modules: Language.Drasil.Code other-modules: + Language.Drasil.Choices Language.Drasil.Chunk.Code - , Language.Drasil.Chunk.CodeDefinition - , Language.Drasil.Chunk.Parameter - , Language.Drasil.Code.Code - , Language.Drasil.Code.CodeQuantityDicts - , Language.Drasil.Code.DataDesc - , Language.Drasil.Code.ExternalLibrary - , Language.Drasil.Code.ExternalLibraryCall - , Language.Drasil.Code.ExtLibImport - , Language.Drasil.Code.Lang - , Language.Drasil.Code.Imperative.Build.AST - , Language.Drasil.Code.Imperative.Build.Import - , Language.Drasil.Code.Imperative.ConceptMatch - , Language.Drasil.Code.Imperative.SpaceMatch - , Language.Drasil.Code.Imperative.Doxygen.Import - , Language.Drasil.Code.Imperative.ReadInput - , Language.Drasil.Code.Imperative.WriteInput - , Language.Drasil.Code.Imperative.WriteReadMe - , Language.Drasil.Code.Imperative.GOOL.Data - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.LanguagePolymorphic - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.JavaRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.PythonRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CSharpRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CppRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.SwiftRenderer - , Language.Drasil.Code.Imperative.GOOL.ClassInterface - , Language.Drasil.Code.Imperative.Comments - , Language.Drasil.Code.Imperative.Descriptions - , Language.Drasil.Code.Imperative.FunctionCalls - , Language.Drasil.Code.Imperative.GenerateGOOL - , Language.Drasil.Code.Imperative.Generator - , Language.Drasil.Code.Imperative.GenODE - , Language.Drasil.Code.Imperative.Helpers - , Language.Drasil.Code.Imperative.Import - , Language.Drasil.Code.Imperative.Logging - , Language.Drasil.Code.Imperative.Modules - , Language.Drasil.Code.Imperative.Parameters - , Language.Drasil.Code.Imperative.DrasilState - , Language.Drasil.Code.CodeGeneration - , Language.Drasil.Data.ODEInfo - , Language.Drasil.Data.ODELibPckg - , Language.Drasil.Choices - , Language.Drasil.CodeExpr - , Language.Drasil.CodeSpec - , Language.Drasil.Mod - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - filepath >= 1.4.1, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - drasil-lang >= 0.1.52, - drasil-utils >= 0.1.1, - drasil-build >= 0.1.1, - drasil-theory >= 0.1.0, - drasil-database >= 0.1.0, - drasil-printers >= 0.1.10, - drasil-gool >= 0.1.0 + Language.Drasil.Chunk.CodeDefinition + Language.Drasil.Chunk.Parameter + Language.Drasil.Code.AST + Language.Drasil.Code.Code + Language.Drasil.Code.CodeGeneration + Language.Drasil.Code.CodeQuantityDicts + Language.Drasil.Code.DataDesc + Language.Drasil.Code.ExternalLibrary + Language.Drasil.Code.ExternalLibraryCall + Language.Drasil.Code.ExtLibImport + Language.Drasil.Code.Imperative.Build.AST + Language.Drasil.Code.Imperative.Build.Import + Language.Drasil.Code.Imperative.Comments + Language.Drasil.Code.Imperative.ConceptMatch + Language.Drasil.Code.Imperative.Descriptions + Language.Drasil.Code.Imperative.Doxygen.Import + Language.Drasil.Code.Imperative.DrasilState + Language.Drasil.Code.Imperative.FunctionCalls + Language.Drasil.Code.Imperative.GenerateGOOL + Language.Drasil.Code.Imperative.Generator + Language.Drasil.Code.Imperative.GenODE + Language.Drasil.Code.Imperative.GOOL.ClassInterface + Language.Drasil.Code.Imperative.GOOL.Data + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CppRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CSharpRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.JavaRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.LanguagePolymorphic + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.PythonRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.SwiftRenderer + Language.Drasil.Code.Imperative.Helpers + Language.Drasil.Code.Imperative.Import + Language.Drasil.Code.Imperative.Logging + Language.Drasil.Code.Imperative.Modules + Language.Drasil.Code.Imperative.Parameters + Language.Drasil.Code.Imperative.ReadInput + Language.Drasil.Code.Imperative.SpaceMatch + Language.Drasil.Code.Imperative.WriteInput + Language.Drasil.Code.Imperative.WriteReadMe + Language.Drasil.Code.Lang + Language.Drasil.CodeExpr + Language.Drasil.CodeSpec + Language.Drasil.Data.ODEInfo + Language.Drasil.Data.ODELibPckg + Language.Drasil.Mod + Test.FileTests + Test.HelloWorld + Test.Helper + Test.Main + Test.Observer + Test.PatternTest + Paths_drasil_code + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints + build-depends: + MissingH >=1.4.0.1 + , base >=4.7 && <5 + , containers >=0.5.5.1 + , directory >=1.2.6.2 + , drasil-build + , drasil-database + , drasil-gool + , drasil-lang + , drasil-printers + , drasil-theory + , drasil-utils + , filepath >=1.4.1 + , lens >=4.12 + , mtl >=2.2.1 + , parsec >=3.1.9 + , pretty >=1.1.1.1 + , split >=0.2.3.1 default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints executable codegenTest - hs-source-dirs: . main-is: Test/Main.hs other-modules: + Language.Drasil.Choices + Language.Drasil.Chunk.Code + Language.Drasil.Chunk.CodeDefinition + Language.Drasil.Chunk.Parameter + Language.Drasil.Code + Language.Drasil.Code.AST + Language.Drasil.Code.Code + Language.Drasil.Code.CodeGeneration + Language.Drasil.Code.CodeQuantityDicts + Language.Drasil.Code.DataDesc + Language.Drasil.Code.ExternalLibrary + Language.Drasil.Code.ExternalLibraryCall + Language.Drasil.Code.ExtLibImport + Language.Drasil.Code.Imperative.Build.AST + Language.Drasil.Code.Imperative.Build.Import + Language.Drasil.Code.Imperative.Comments + Language.Drasil.Code.Imperative.ConceptMatch + Language.Drasil.Code.Imperative.Descriptions + Language.Drasil.Code.Imperative.Doxygen.Import + Language.Drasil.Code.Imperative.DrasilState + Language.Drasil.Code.Imperative.FunctionCalls + Language.Drasil.Code.Imperative.GenerateGOOL + Language.Drasil.Code.Imperative.Generator + Language.Drasil.Code.Imperative.GenODE + Language.Drasil.Code.Imperative.GOOL.ClassInterface + Language.Drasil.Code.Imperative.GOOL.Data + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CppRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CSharpRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.JavaRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.LanguagePolymorphic + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.PythonRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.SwiftRenderer + Language.Drasil.Code.Imperative.Helpers + Language.Drasil.Code.Imperative.Import + Language.Drasil.Code.Imperative.Logging + Language.Drasil.Code.Imperative.Modules + Language.Drasil.Code.Imperative.Parameters + Language.Drasil.Code.Imperative.ReadInput + Language.Drasil.Code.Imperative.SpaceMatch + Language.Drasil.Code.Imperative.WriteInput + Language.Drasil.Code.Imperative.WriteReadMe + Language.Drasil.Code.Lang + Language.Drasil.CodeExpr + Language.Drasil.CodeSpec + Language.Drasil.Data.ODEInfo + Language.Drasil.Data.ODELibPckg + Language.Drasil.Mod + Test.FileTests Test.HelloWorld - , Test.FileTests - , Test.PatternTest - , Test.Observer - , Test.Helper - , Language.Drasil.Code - , Language.Drasil.Chunk.Code - , Language.Drasil.Chunk.CodeDefinition - , Language.Drasil.Chunk.Parameter - , Language.Drasil.Code.Code - , Language.Drasil.Code.CodeQuantityDicts - , Language.Drasil.Code.DataDesc - , Language.Drasil.Code.ExternalLibrary - , Language.Drasil.Code.ExternalLibraryCall - , Language.Drasil.Code.ExtLibImport - , Language.Drasil.Code.Lang - , Language.Drasil.Code.Imperative.Build.AST - , Language.Drasil.Code.Imperative.Build.Import - , Language.Drasil.Code.Imperative.ConceptMatch - , Language.Drasil.Code.Imperative.SpaceMatch - , Language.Drasil.Code.Imperative.Doxygen.Import - , Language.Drasil.Code.Imperative.ReadInput - , Language.Drasil.Code.Imperative.WriteInput - , Language.Drasil.Code.Imperative.WriteReadMe - , Language.Drasil.Code.Imperative.GOOL.Data - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.LanguagePolymorphic - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.JavaRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.PythonRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CSharpRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CppRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.SwiftRenderer - , Language.Drasil.Code.Imperative.GOOL.ClassInterface - , Language.Drasil.Code.Imperative.Comments - , Language.Drasil.Code.Imperative.Descriptions - , Language.Drasil.Code.Imperative.FunctionCalls - , Language.Drasil.Code.Imperative.GenerateGOOL - , Language.Drasil.Code.Imperative.Generator - , Language.Drasil.Code.Imperative.GenODE - , Language.Drasil.Code.Imperative.Helpers - , Language.Drasil.Code.Imperative.Import - , Language.Drasil.Code.Imperative.Logging - , Language.Drasil.Code.Imperative.Modules - , Language.Drasil.Code.Imperative.Parameters - , Language.Drasil.Code.Imperative.DrasilState - , Language.Drasil.Code.CodeGeneration - , Language.Drasil.Data.ODEInfo - , Language.Drasil.Data.ODELibPckg - , Language.Drasil.Choices - , Language.Drasil.CodeExpr - , Language.Drasil.CodeSpec - , Language.Drasil.Mod - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - filepath >= 1.4.1, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - drasil-lang >= 0.1.52, - drasil-utils >= 0.1.1, - drasil-build >= 0.1.1, - drasil-theory >= 0.1.0, - drasil-database >= 0.1.0, - drasil-printers >= 0.1.10, - drasil-gool >= 0.1.0 + Test.Helper + Test.Observer + Test.PatternTest + Paths_drasil_code + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N -O2 -Wall -Wredundant-constraints -main-is Test.Main + build-depends: + MissingH >=1.4.0.1 + , base >=4.7 && <5 + , containers >=0.5.5.1 + , directory >=1.2.6.2 + , drasil-build + , drasil-code + , drasil-database + , drasil-gool + , drasil-lang + , drasil-printers + , drasil-theory + , drasil-utils + , filepath >=1.4.1 + , lens >=4.12 + , mtl >=2.2.1 + , parsec >=3.1.9 + , pretty >=1.1.1.1 + , split >=0.2.3.1 default-language: Haskell2010 - ghc-options: -Wall -O2 -Wredundant-constraints -main-is Test.Main - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-code/drasil-code.cabal.bak b/code/drasil-code/drasil-code.cabal.bak new file mode 100644 index 0000000000..d04eb84a16 --- /dev/null +++ b/code/drasil-code/drasil-code.cabal.bak @@ -0,0 +1,160 @@ +Name: drasil-code +Version: 0.1.9 +Cabal-Version: >= 1.18 +Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +build-type: Simple +Synopsis: A framework for code and document generation for scientific software - Code SubPackage + +library + exposed-modules: + Language.Drasil.Code + other-modules: + Language.Drasil.Chunk.Code + , Language.Drasil.Chunk.CodeDefinition + , Language.Drasil.Chunk.Parameter + , Language.Drasil.Code.Code + , Language.Drasil.Code.CodeQuantityDicts + , Language.Drasil.Code.DataDesc + , Language.Drasil.Code.ExternalLibrary + , Language.Drasil.Code.ExternalLibraryCall + , Language.Drasil.Code.ExtLibImport + , Language.Drasil.Code.Lang + , Language.Drasil.Code.Imperative.Build.AST + , Language.Drasil.Code.Imperative.Build.Import + , Language.Drasil.Code.Imperative.ConceptMatch + , Language.Drasil.Code.Imperative.SpaceMatch + , Language.Drasil.Code.Imperative.Doxygen.Import + , Language.Drasil.Code.Imperative.ReadInput + , Language.Drasil.Code.Imperative.WriteInput + , Language.Drasil.Code.Imperative.WriteReadMe + , Language.Drasil.Code.Imperative.GOOL.Data + , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.LanguagePolymorphic + , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer + , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.JavaRenderer + , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.PythonRenderer + , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CSharpRenderer + , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CppRenderer + , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.SwiftRenderer + , Language.Drasil.Code.Imperative.GOOL.ClassInterface + , Language.Drasil.Code.Imperative.Comments + , Language.Drasil.Code.Imperative.Descriptions + , Language.Drasil.Code.Imperative.FunctionCalls + , Language.Drasil.Code.Imperative.GenerateGOOL + , Language.Drasil.Code.Imperative.Generator + , Language.Drasil.Code.Imperative.GenODE + , Language.Drasil.Code.Imperative.Helpers + , Language.Drasil.Code.Imperative.Import + , Language.Drasil.Code.Imperative.Logging + , Language.Drasil.Code.Imperative.Modules + , Language.Drasil.Code.Imperative.Parameters + , Language.Drasil.Code.Imperative.DrasilState + , Language.Drasil.Code.CodeGeneration + , Language.Drasil.Data.ODEInfo + , Language.Drasil.Data.ODELibPckg + , Language.Drasil.Choices + , Language.Drasil.CodeExpr + , Language.Drasil.CodeSpec + , Language.Drasil.Mod + + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + filepath >= 1.4.1, + split >= 0.2.3.1, + MissingH >= 1.4.0.1, + parsec >= 3.1.9, + drasil-lang >= 0.1.52, + drasil-utils >= 0.1.1, + drasil-build >= 0.1.1, + drasil-theory >= 0.1.0, + drasil-database >= 0.1.0, + drasil-printers >= 0.1.10, + drasil-gool >= 0.1.0 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + +executable codegenTest + hs-source-dirs: . + main-is: Test/Main.hs + other-modules: + Test.HelloWorld + , Test.FileTests + , Test.PatternTest + , Test.Observer + , Test.Helper + , Language.Drasil.Code + , Language.Drasil.Chunk.Code + , Language.Drasil.Chunk.CodeDefinition + , Language.Drasil.Chunk.Parameter + , Language.Drasil.Code.Code + , Language.Drasil.Code.CodeQuantityDicts + , Language.Drasil.Code.DataDesc + , Language.Drasil.Code.ExternalLibrary + , Language.Drasil.Code.ExternalLibraryCall + , Language.Drasil.Code.ExtLibImport + , Language.Drasil.Code.Lang + , Language.Drasil.Code.Imperative.Build.AST + , Language.Drasil.Code.Imperative.Build.Import + , Language.Drasil.Code.Imperative.ConceptMatch + , Language.Drasil.Code.Imperative.SpaceMatch + , Language.Drasil.Code.Imperative.Doxygen.Import + , Language.Drasil.Code.Imperative.ReadInput + , Language.Drasil.Code.Imperative.WriteInput + , Language.Drasil.Code.Imperative.WriteReadMe + , Language.Drasil.Code.Imperative.GOOL.Data + , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.LanguagePolymorphic + , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer + , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.JavaRenderer + , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.PythonRenderer + , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CSharpRenderer + , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CppRenderer + , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.SwiftRenderer + , Language.Drasil.Code.Imperative.GOOL.ClassInterface + , Language.Drasil.Code.Imperative.Comments + , Language.Drasil.Code.Imperative.Descriptions + , Language.Drasil.Code.Imperative.FunctionCalls + , Language.Drasil.Code.Imperative.GenerateGOOL + , Language.Drasil.Code.Imperative.Generator + , Language.Drasil.Code.Imperative.GenODE + , Language.Drasil.Code.Imperative.Helpers + , Language.Drasil.Code.Imperative.Import + , Language.Drasil.Code.Imperative.Logging + , Language.Drasil.Code.Imperative.Modules + , Language.Drasil.Code.Imperative.Parameters + , Language.Drasil.Code.Imperative.DrasilState + , Language.Drasil.Code.CodeGeneration + , Language.Drasil.Data.ODEInfo + , Language.Drasil.Data.ODELibPckg + , Language.Drasil.Choices + , Language.Drasil.CodeExpr + , Language.Drasil.CodeSpec + , Language.Drasil.Mod + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + filepath >= 1.4.1, + split >= 0.2.3.1, + MissingH >= 1.4.0.1, + parsec >= 3.1.9, + drasil-lang >= 0.1.52, + drasil-utils >= 0.1.1, + drasil-build >= 0.1.1, + drasil-theory >= 0.1.0, + drasil-database >= 0.1.0, + drasil-printers >= 0.1.10, + drasil-gool >= 0.1.0 + default-language: Haskell2010 + ghc-options: -Wall -O2 -Wredundant-constraints -main-is Test.Main + +source-repository head + type: git + location: git://github.com/JacquesCarette/Drasil.git + subdir: code diff --git a/code/drasil-code/package.yaml b/code/drasil-code/package.yaml new file mode 100644 index 0000000000..39dd32afa6 --- /dev/null +++ b/code/drasil-code/package.yaml @@ -0,0 +1,61 @@ +name: drasil-code +version: 0.1.9.0 +license: BSD3 +author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" +maintainer: "Jacques Carette" +synopsis: A framework for code and document generation for scientific software - Code SubPackage +github: JacquesCarette/Drasil +homepage: https://jacquescarette.github.io/Drasil/ + +extra-source-files: [] + +# Metadata used when publishing your package +# category: Web + +# To avoid duplicated efforts in documentation and dealing with the +# complications of embedding Haddock markup inside cabal files, it is +# common to point users to the README.md file. +description: Please see the README on GitHub at + +dependencies: +- base >= 4.7 && < 5 +- lens >= 4.12 +- containers >= 0.5.5.1 +- pretty >= 1.1.1.1 +- mtl >= 2.2.1 +- directory >= 1.2.6.2 +- filepath >= 1.4.1 +- split >= 0.2.3.1 +- MissingH >= 1.4.0.1 +- parsec >= 3.1.9 +- drasil-lang +- drasil-utils +- drasil-build +- drasil-theory +- drasil-database +- drasil-printers +- drasil-gool + +ghc-options: +- -Wall +- -Wredundant-constraints + +library: + source-dirs: ./ + exposed-modules: + - Language.Drasil.Code + +executables: + codegenTest: + main: Test/Main.hs + source-dirs: ./ + ghc-options: + - -threaded + - -rtsopts + - -with-rtsopts=-N + - -O2 + - -Wall + - -Wredundant-constraints + - -main-is Test.Main + dependencies: + - drasil-code diff --git a/code/drasil-code/stack.yaml b/code/drasil-code/stack.yaml index 3f8e9d7434..e3c3b27fcb 100644 --- a/code/drasil-code/stack.yaml +++ b/code/drasil-code/stack.yaml @@ -11,11 +11,14 @@ # resolver: lts-3.5 # resolver: nightly-2015-09-21 # resolver: ghc-7.10.2 -# resolver: ghcjs-0.1.0_ghc-7.10.2 -# resolver: -# name: custom-snapshot -# location: "./custom-snapshot.yaml" -resolver: lts-11.2 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# resolver: ./custom-snapshot.yaml +# resolver: https://example.com/snapshots/2018-01-01.yaml +resolver: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. @@ -23,26 +26,31 @@ resolver: lts-11.2 # packages: # - some-directory # - https://example.com/foo/bar/baz-0.0.2.tar.gz -# - location: -# git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# extra-dep: true -# subdirs: -# - auto-update -# - wai -# -# A package marked 'extra-dep: true' will only be built if demanded by a -# non-dependency (i.e. a user package), and its test suites and benchmarks -# will not be run. This is useful for tweaking upstream packages. +# subdirs: +# - auto-update +# - wai packages: +- . - ../drasil-lang +- ../drasil-theory - ../drasil-build - ../drasil-database -- ./ -# Dependency packages to be pulled from upstream that are not in the resolver -# (e.g., acme-missiles-0.3) -# extra-deps: [] +- ../drasil-gool +- ../drasil-printers +- ../drasil-utils + +# Dependency packages to be pulled from upstream that are not in the resolver. +# These entries can reference officially published versions as well as +# forks / in-progress versions pinned to a git hash. For example: +# +# extra-deps: +# - acme-missiles-0.3 +# - git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# +extra-deps: +- unicode-names-3.2.0.0@sha256:fef7241d93170e26265e84553090253a5e8ee207645d47cf271816f5834d07d2,470 +- unicode-properties-3.2.0.0@sha256:239766a6ac4322329353f6b9cd546024fd8c5f0235c8e32b3cba2d6bd245a699,1000 # Override default flag values for local packages and extra-deps # flags: {} @@ -55,7 +63,7 @@ packages: # # Require a specific version of stack, using version ranges # require-stack-version: -any # Default -# require-stack-version: ">=1.6" +# require-stack-version: ">=2.5" # # Override the architecture used by stack, especially useful on Windows # arch: i386 diff --git a/code/drasil-docLang/drasil-docLang.cabal b/code/drasil-docLang/drasil-docLang.cabal index 6d2fec443c..46ff9bac44 100644 --- a/code/drasil-docLang/drasil-docLang.cabal +++ b/code/drasil-docLang/drasil-docLang.cabal @@ -1,60 +1,73 @@ -Name: drasil-docLang -Version: 0.1.26 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +cabal-version: 1.12 + +-- This file has been generated from package.yaml by hpack version 0.33.0. +-- +-- see: https://github.com/sol/hpack +-- +-- hash: 2a2a97deb4c346d6f7928b9e26155e153851775ae691be7fda6251d8a154f7f8 + +name: drasil-docLang +version: 0.1.26.0 +synopsis: A framework for code and document generation for scientific software - Document Language SubPackage +description: Please see the README on GitHub at +homepage: https://jacquescarette.github.io/Drasil/ +bug-reports: https://github.com/JacquesCarette/Drasil/issues +author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +maintainer: Jacques Carette +license: BSD3 build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Document Language SubPackage + +source-repository head + type: git + location: https://github.com/JacquesCarette/Drasil library exposed-modules: Drasil.DocLang - , Drasil.DocLang.SRS - , Drasil.DocumentLanguage.Units + Drasil.DocLang.SRS + Drasil.DocumentLanguage.Units other-modules: Drasil.DocDecl - , Drasil.DocumentLanguage - , Drasil.ExtractDocDesc - , Drasil.TraceTable - , Drasil.DocumentLanguage.Core - , Drasil.DocumentLanguage.Definitions - , Drasil.DocumentLanguage.RefHelpers - , Drasil.DocumentLanguage.TraceabilityMatrix - , Drasil.DocumentLanguage.Labels - , Drasil.Sections.AuxiliaryConstants - , Drasil.Sections.GeneralSystDesc - , Drasil.Sections.Introduction - , Drasil.Sections.ReferenceMaterial - , Drasil.Sections.Requirements - , Drasil.Sections.SpecificSystemDescription - , Drasil.Sections.Stakeholders - , Drasil.Sections.TableOfAbbAndAcronyms - , Drasil.Sections.TableOfSymbols - , Drasil.Sections.TableOfUnits - , Drasil.Sections.TraceabilityMandGs - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - transformers >= 0.4.2.0, - multiplate >= 0.0.2, - data-fix (>= 0.0.4 && <= 1.0), - drasil-lang >= 0.1.59, - drasil-data >= 0.1.13, - drasil-database >= 0.1.1, - drasil-printers >= 0.1.8, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 + Drasil.DocumentLanguage + Drasil.DocumentLanguage.Core + Drasil.DocumentLanguage.Definitions + Drasil.DocumentLanguage.Labels + Drasil.DocumentLanguage.RefHelpers + Drasil.DocumentLanguage.TraceabilityMatrix + Drasil.ExtractDocDesc + Drasil.Sections.AuxiliaryConstants + Drasil.Sections.GeneralSystDesc + Drasil.Sections.Introduction + Drasil.Sections.ReferenceMaterial + Drasil.Sections.Requirements + Drasil.Sections.SpecificSystemDescription + Drasil.Sections.Stakeholders + Drasil.Sections.TableOfAbbAndAcronyms + Drasil.Sections.TableOfSymbols + Drasil.Sections.TableOfUnits + Drasil.Sections.TraceabilityMandGs + Drasil.TraceTable + Paths_drasil_docLang + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints + build-depends: + MissingH >=1.4.0.1 + , base >=4.7 && <5 + , containers >=0.5.5.1 + , data-fix (>=0.0.4 && <=1.0) + , directory >=1.2.6.2 + , drasil-data + , drasil-database + , drasil-lang + , drasil-printers + , drasil-theory + , drasil-utils + , lens >=4.12 + , mtl >=2.2.1 + , multiplate >=0.0.2 + , parsec >=3.1.9 + , pretty >=1.1.1.1 + , split >=0.2.3.1 + , transformers >=0.4.2.0 default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-docLang/drasil-docLang.cabal.bak b/code/drasil-docLang/drasil-docLang.cabal.bak new file mode 100644 index 0000000000..6d2fec443c --- /dev/null +++ b/code/drasil-docLang/drasil-docLang.cabal.bak @@ -0,0 +1,60 @@ +Name: drasil-docLang +Version: 0.1.26 +Cabal-Version: >= 1.18 +Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +build-type: Simple +Synopsis: A framework for code and document generation for scientific software - Document Language SubPackage + +library + exposed-modules: + Drasil.DocLang + , Drasil.DocLang.SRS + , Drasil.DocumentLanguage.Units + other-modules: + Drasil.DocDecl + , Drasil.DocumentLanguage + , Drasil.ExtractDocDesc + , Drasil.TraceTable + , Drasil.DocumentLanguage.Core + , Drasil.DocumentLanguage.Definitions + , Drasil.DocumentLanguage.RefHelpers + , Drasil.DocumentLanguage.TraceabilityMatrix + , Drasil.DocumentLanguage.Labels + , Drasil.Sections.AuxiliaryConstants + , Drasil.Sections.GeneralSystDesc + , Drasil.Sections.Introduction + , Drasil.Sections.ReferenceMaterial + , Drasil.Sections.Requirements + , Drasil.Sections.SpecificSystemDescription + , Drasil.Sections.Stakeholders + , Drasil.Sections.TableOfAbbAndAcronyms + , Drasil.Sections.TableOfSymbols + , Drasil.Sections.TableOfUnits + , Drasil.Sections.TraceabilityMandGs + + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + split >= 0.2.3.1, + MissingH >= 1.4.0.1, + parsec >= 3.1.9, + transformers >= 0.4.2.0, + multiplate >= 0.0.2, + data-fix (>= 0.0.4 && <= 1.0), + drasil-lang >= 0.1.59, + drasil-data >= 0.1.13, + drasil-database >= 0.1.1, + drasil-printers >= 0.1.8, + drasil-theory >= 0.1.0, + drasil-utils >= 0.1.0 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + +source-repository head + type: git + location: git://github.com/JacquesCarette/Drasil.git + subdir: code diff --git a/code/drasil-docLang/package.yaml b/code/drasil-docLang/package.yaml new file mode 100644 index 0000000000..3ad511de6a --- /dev/null +++ b/code/drasil-docLang/package.yaml @@ -0,0 +1,49 @@ +name: drasil-docLang +version: 0.1.26.0 +license: BSD3 +author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" +maintainer: "Jacques Carette" +synopsis: A framework for code and document generation for scientific software - Document Language SubPackage +github: JacquesCarette/Drasil +homepage: https://jacquescarette.github.io/Drasil/ + +extra-source-files: [] + +# Metadata used when publishing your package +# category: Web + +# To avoid duplicated efforts in documentation and dealing with the +# complications of embedding Haddock markup inside cabal files, it is +# common to point users to the README.md file. +description: Please see the README on GitHub at + +dependencies: +- base >= 4.7 && < 5 +- lens >= 4.12 +- containers >= 0.5.5.1 +- pretty >= 1.1.1.1 +- mtl >= 2.2.1 +- directory >= 1.2.6.2 +- split >= 0.2.3.1 +- MissingH >= 1.4.0.1 +- parsec >= 3.1.9 +- transformers >= 0.4.2.0 +- multiplate >= 0.0.2 +- data-fix (>= 0.0.4 && <= 1.0) +- drasil-lang +- drasil-data +- drasil-database +- drasil-printers +- drasil-theory +- drasil-utils + +ghc-options: +- -Wall +- -Wredundant-constraints + +library: + source-dirs: ./ + exposed-modules: + - Drasil.DocLang + - Drasil.DocLang.SRS + - Drasil.DocumentLanguage.Units diff --git a/code/drasil-docLang/stack.yaml b/code/drasil-docLang/stack.yaml index 32c72c9320..1715fb3769 100644 --- a/code/drasil-docLang/stack.yaml +++ b/code/drasil-docLang/stack.yaml @@ -11,11 +11,14 @@ # resolver: lts-3.5 # resolver: nightly-2015-09-21 # resolver: ghc-7.10.2 -# resolver: ghcjs-0.1.0_ghc-7.10.2 -# resolver: -# name: custom-snapshot -# location: "./custom-snapshot.yaml" -resolver: lts-11.2 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# resolver: ./custom-snapshot.yaml +# resolver: https://example.com/snapshots/2018-01-01.yaml +resolver: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. @@ -23,29 +26,34 @@ resolver: lts-11.2 # packages: # - some-directory # - https://example.com/foo/bar/baz-0.0.2.tar.gz -# - location: -# git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# extra-dep: true -# subdirs: -# - auto-update -# - wai -# -# A package marked 'extra-dep: true' will only be built if demanded by a -# non-dependency (i.e. a user package), and its test suites and benchmarks -# will not be run. This is useful for tweaking upstream packages. +# subdirs: +# - auto-update +# - wai packages: -- ../drasil-lang -- ../drasil-data +- . +- ../drasil-build - ../drasil-code +- ../drasil-data - ../drasil-database +- ../drasil-gool +- ../drasil-lang +- ../drasil-printers - ../drasil-theory - ../drasil-utils -- ./ -# Dependency packages to be pulled from upstream that are not in the resolver -# (e.g., acme-missiles-0.3) -# extra-deps: [] + +# Dependency packages to be pulled from upstream that are not in the resolver. +# These entries can reference officially published versions as well as +# forks / in-progress versions pinned to a git hash. For example: +# +# extra-deps: +# - acme-missiles-0.3 +# - git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# +extra-deps: +- unicode-names-3.2.0.0@sha256:fef7241d93170e26265e84553090253a5e8ee207645d47cf271816f5834d07d2,470 +- unicode-properties-3.2.0.0@sha256:239766a6ac4322329353f6b9cd546024fd8c5f0235c8e32b3cba2d6bd245a699,1000 +- multiplate-0.0.3@sha256:5d2ffc50d23c55008100b7a8b70f77b5fcce08c6f23822c5a6adc5b5b9356a32,1311 # Override default flag values for local packages and extra-deps # flags: {} @@ -58,7 +66,7 @@ packages: # # Require a specific version of stack, using version ranges # require-stack-version: -any # Default -# require-stack-version: ">=1.6" +# require-stack-version: ">=2.5" # # Override the architecture used by stack, especially useful on Windows # arch: i386 @@ -69,4 +77,4 @@ packages: # extra-lib-dirs: [/path/to/dir] # # Allow a newer minor version of GHC than the snapshot specifies -# compiler-check: newer-minor \ No newline at end of file +# compiler-check: newer-minor diff --git a/code/drasil-gen/drasil-gen.cabal b/code/drasil-gen/drasil-gen.cabal index 811727f73e..f1c1b13fce 100644 --- a/code/drasil-gen/drasil-gen.cabal +++ b/code/drasil-gen/drasil-gen.cabal @@ -1,35 +1,48 @@ -Name: drasil-gen -Version: 0.1.3 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +cabal-version: 1.12 + +-- This file has been generated from package.yaml by hpack version 0.33.0. +-- +-- see: https://github.com/sol/hpack +-- +-- hash: 9a1e40bf9dbbb070190c04f7eaae5ef530bcaab1801dcb5b7f25a10d687952ea + +name: drasil-gen +version: 0.1.3.0 +synopsis: A framework for code and document generation for scientific software - Utils SubPackage +description: Please see the README on GitHub at +homepage: https://jacquescarette.github.io/Drasil/ +bug-reports: https://github.com/JacquesCarette/Drasil/issues +author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +maintainer: Jacques Carette +license: BSD3 build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Generate SubPackage + +source-repository head + type: git + location: https://github.com/JacquesCarette/Drasil library exposed-modules: - Language.Drasil.Generate - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - time >= 1.8.0.2, - drasil-lang >= 0.1.59, - drasil-gool >= 0.1.0, - drasil-build >= 0.1.0, - drasil-code >= 0.1.9, - drasil-printers >= 0.1.8 + Language.Drasil.Generate + other-modules: + Paths_drasil_gen + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints + build-depends: + MissingH >=1.4.0.1 + , base >=4.7 && <5 + , containers >=0.5.5.1 + , directory >=1.2.6.2 + , drasil-build + , drasil-code + , drasil-gool + , drasil-lang + , drasil-printers + , lens >=4.12 + , mtl >=2.2.1 + , parsec >=3.1.9 + , pretty >=1.1.1.1 + , split >=0.2.3.1 + , time >=1.8.0.2 default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-gen/drasil-gen.cabal.bak b/code/drasil-gen/drasil-gen.cabal.bak new file mode 100644 index 0000000000..811727f73e --- /dev/null +++ b/code/drasil-gen/drasil-gen.cabal.bak @@ -0,0 +1,35 @@ +Name: drasil-gen +Version: 0.1.3 +Cabal-Version: >= 1.18 +Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +build-type: Simple +Synopsis: A framework for code and document generation for scientific software - Generate SubPackage + +library + exposed-modules: + Language.Drasil.Generate + + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + split >= 0.2.3.1, + MissingH >= 1.4.0.1, + parsec >= 3.1.9, + time >= 1.8.0.2, + drasil-lang >= 0.1.59, + drasil-gool >= 0.1.0, + drasil-build >= 0.1.0, + drasil-code >= 0.1.9, + drasil-printers >= 0.1.8 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + + +source-repository head + type: git + location: git://github.com/JacquesCarette/Drasil.git + subdir: code diff --git a/code/drasil-gen/package.yaml b/code/drasil-gen/package.yaml new file mode 100644 index 0000000000..82ccfd737d --- /dev/null +++ b/code/drasil-gen/package.yaml @@ -0,0 +1,44 @@ +name: drasil-gen +version: 0.1.3.0 +license: BSD3 +author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" +maintainer: "Jacques Carette" +synopsis: A framework for code and document generation for scientific software - Utils SubPackage +github: JacquesCarette/Drasil +homepage: https://jacquescarette.github.io/Drasil/ + +extra-source-files: [] + +# Metadata used when publishing your package +# category: Web + +# To avoid duplicated efforts in documentation and dealing with the +# complications of embedding Haddock markup inside cabal files, it is +# common to point users to the README.md file. +description: Please see the README on GitHub at + +dependencies: +- base >= 4.7 && < 5 +- lens >= 4.12 +- containers >= 0.5.5.1 +- pretty >= 1.1.1.1 +- mtl >= 2.2.1 +- directory >= 1.2.6.2 +- split >= 0.2.3.1 +- MissingH >= 1.4.0.1 +- parsec >= 3.1.9 +- time >= 1.8.0.2 +- drasil-lang +- drasil-gool +- drasil-build +- drasil-code +- drasil-printers + +ghc-options: +- -Wall +- -Wredundant-constraints + +library: + source-dirs: ./ + exposed-modules: + - Language.Drasil.Generate diff --git a/code/drasil-gen/stack.yaml b/code/drasil-gen/stack.yaml index 2e37d83e2e..bb760bf025 100644 --- a/code/drasil-gen/stack.yaml +++ b/code/drasil-gen/stack.yaml @@ -11,11 +11,14 @@ # resolver: lts-3.5 # resolver: nightly-2015-09-21 # resolver: ghc-7.10.2 -# resolver: ghcjs-0.1.0_ghc-7.10.2 -# resolver: -# name: custom-snapshot -# location: "./custom-snapshot.yaml" -resolver: lts-11.2 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# resolver: ./custom-snapshot.yaml +# resolver: https://example.com/snapshots/2018-01-01.yaml +resolver: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. @@ -23,27 +26,32 @@ resolver: lts-11.2 # packages: # - some-directory # - https://example.com/foo/bar/baz-0.0.2.tar.gz -# - location: -# git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# extra-dep: true -# subdirs: -# - auto-update -# - wai -# -# A package marked 'extra-dep: true' will only be built if demanded by a -# non-dependency (i.e. a user package), and its test suites and benchmarks -# will not be run. This is useful for tweaking upstream packages. +# subdirs: +# - auto-update +# - wai packages: - . -- ../drasil-lang - ../drasil-build - ../drasil-code +- ../drasil-database +- ../drasil-gool +- ../drasil-lang - ../drasil-printers -# Dependency packages to be pulled from upstream that are not in the resolver -# (e.g., acme-missiles-0.3) -# extra-deps: [] +- ../drasil-theory +- ../drasil-utils + +# Dependency packages to be pulled from upstream that are not in the resolver. +# These entries can reference officially published versions as well as +# forks / in-progress versions pinned to a git hash. For example: +# +# extra-deps: +# - acme-missiles-0.3 +# - git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# +extra-deps: +- unicode-names-3.2.0.0@sha256:fef7241d93170e26265e84553090253a5e8ee207645d47cf271816f5834d07d2,470 +- unicode-properties-3.2.0.0@sha256:239766a6ac4322329353f6b9cd546024fd8c5f0235c8e32b3cba2d6bd245a699,1000 # Override default flag values for local packages and extra-deps # flags: {} @@ -56,7 +64,7 @@ packages: # # Require a specific version of stack, using version ranges # require-stack-version: -any # Default -# require-stack-version: ">=1.6" +# require-stack-version: ">=2.5" # # Override the architecture used by stack, especially useful on Windows # arch: i386 diff --git a/code/drasil-utils/stack.yaml b/code/drasil-utils/stack.yaml index 56419d6783..5cf8245201 100644 --- a/code/drasil-utils/stack.yaml +++ b/code/drasil-utils/stack.yaml @@ -31,8 +31,8 @@ resolver: # - wai packages: - . -- ../drasil-lang/ -- ../drasil-theory/ +- ../drasil-lang +- ../drasil-theory # Dependency packages to be pulled from upstream that are not in the resolver. # These entries can reference officially published versions as well as From 41251a2353debad1bdaad3d3b5d4143a8c3aa0b6 Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Sat, 23 Jan 2021 23:26:26 -0500 Subject: [PATCH 03/13] 2292 : WIP : 2/6 examples --- .../Drasil/GlassBR/Assumptions.hs | 8 +- code/drasil-example/Drasil/GlassBR/Body.hs | 28 +- code/drasil-example/Drasil/GlassBR/Changes.hs | 8 +- .../drasil-example/Drasil/GlassBR/Concepts.hs | 2 +- .../drasil-example/Drasil/GlassBR/DataDefs.hs | 14 +- code/drasil-example/Drasil/GlassBR/Figures.hs | 6 +- code/drasil-example/Drasil/GlassBR/Goals.hs | 6 +- code/drasil-example/Drasil/GlassBR/IMods.hs | 10 +- code/drasil-example/Drasil/GlassBR/Main.hs | 4 +- .../Drasil/GlassBR/ModuleDefs.hs | 2 +- .../Drasil/GlassBR/References.hs | 2 +- .../Drasil/GlassBR/Requirements.hs | 14 +- code/drasil-example/Drasil/GlassBR/Symbols.hs | 8 +- code/drasil-example/Drasil/GlassBR/TMods.hs | 10 +- code/drasil-example/Drasil/GlassBR/Unitals.hs | 8 +- code/drasil-example/Drasil/GlassBR/Units.hs | 2 +- code/drasil-example/Drasil/HGHC/Body.hs | 4 +- .../Drasil/HGHC/HeatTransfer.hs | 2 +- code/drasil-example/Drasil/HGHC/Main.hs | 2 +- code/drasil-example/drasil-example.cabal | 409 ++++-------------- code/drasil-example/drasil-example.cabal.bak | 336 ++++++++++++++ code/drasil-example/package.yaml | 64 +++ code/drasil-example/stack.yaml | 61 +-- 23 files changed, 586 insertions(+), 424 deletions(-) create mode 100644 code/drasil-example/drasil-example.cabal.bak create mode 100644 code/drasil-example/package.yaml diff --git a/code/drasil-example/Drasil/GlassBR/Assumptions.hs b/code/drasil-example/Drasil/GlassBR/Assumptions.hs index 0a532181ce..28c4bc4cf8 100644 --- a/code/drasil-example/Drasil/GlassBR/Assumptions.hs +++ b/code/drasil-example/Drasil/GlassBR/Assumptions.hs @@ -1,4 +1,4 @@ -module Drasil.GlassBR.Assumptions (assumpGT, assumpGC, assumpES, assumpSV, +module Assumptions (assumpGT, assumpGC, assumpES, assumpSV, assumpGL, assumpBC, assumpRT, assumpLDFC, assumptionConstants, assumptions) where @@ -11,10 +11,10 @@ import Data.Drasil.Concepts.Documentation as Doc (assumpDom, condition, import Data.Drasil.Concepts.Math (calculation, surface, shape) import Data.Drasil.Concepts.PhysicalProperties (materialProprty) -import Drasil.GlassBR.Concepts (beam, cantilever, edge, glaSlab, glass, glassBR, +import Concepts (beam, cantilever, edge, glaSlab, glass, glassBR, lShareFac, plane, responseTy) -import Drasil.GlassBR.References (astm2009) -import Drasil.GlassBR.Unitals (constantK, constantLoadDur, +import References (astm2009) +import Unitals (constantK, constantLoadDur, constantLoadSF, constantM, constantModElas, explosion, lateral, lDurFac, loadDur) diff --git a/code/drasil-example/Drasil/GlassBR/Body.hs b/code/drasil-example/Drasil/GlassBR/Body.hs index 88c489ae3a..c47f5815b4 100644 --- a/code/drasil-example/Drasil/GlassBR/Body.hs +++ b/code/drasil-example/Drasil/GlassBR/Body.hs @@ -1,4 +1,4 @@ -module Drasil.GlassBR.Body where +module Body where import Control.Lens ((^.)) import Language.Drasil hiding (Symbol(..), organization, section) @@ -47,20 +47,20 @@ import Data.Drasil.People (mCampidelli, nikitha, spencerSmith) import Data.Drasil.SI_Units (kilogram, metre, newton, pascal, second, fundamentals, derived) -import Drasil.GlassBR.Assumptions (assumptionConstants, assumptions) -import Drasil.GlassBR.Changes (likelyChgs, unlikelyChgs) -import Drasil.GlassBR.Concepts (acronyms, blastRisk, glaPlane, glaSlab, glassBR, +import Assumptions (assumptionConstants, assumptions) +import Changes (likelyChgs, unlikelyChgs) +import Concepts (acronyms, blastRisk, glaPlane, glaSlab, glassBR, ptOfExplsn, con, con') -import Drasil.GlassBR.DataDefs (qDefns, configFp) -import qualified Drasil.GlassBR.DataDefs as GB (dataDefs) -import Drasil.GlassBR.Figures -import Drasil.GlassBR.Goals (goals) -import Drasil.GlassBR.IMods (symb, iMods, instModIntro) -import Drasil.GlassBR.References (astm2009, astm2012, astm2016, citations, rbrtsn2012) -import Drasil.GlassBR.Requirements (funcReqs, inReqDesc, funcReqsTables, nonfuncReqs) -import Drasil.GlassBR.Symbols (symbolsForTable, thisSymbols) -import Drasil.GlassBR.TMods (tMods) -import Drasil.GlassBR.Unitals (blast, blastTy, bomb, explosion, constants, +import DataDefs (qDefns, configFp) +import qualified DataDefs as GB (dataDefs) +import Figures +import Goals (goals) +import IMods (symb, iMods, instModIntro) +import References (astm2009, astm2012, astm2016, citations, rbrtsn2012) +import Requirements (funcReqs, inReqDesc, funcReqsTables, nonfuncReqs) +import Symbols (symbolsForTable, thisSymbols) +import TMods (tMods) +import Unitals (blast, blastTy, bomb, explosion, constants, constrained, inputDataConstraints, inputs, outputs, specParamVals, glassTy, glassTypes, glBreakage, lateralLoad, load, loadTypes, pbTol, probBr, stressDistFac, probBreak, sD, termsWithAccDefn, termsWithDefsOnly, terms) diff --git a/code/drasil-example/Drasil/GlassBR/Changes.hs b/code/drasil-example/Drasil/GlassBR/Changes.hs index 721b3d9758..7f9b44e913 100644 --- a/code/drasil-example/Drasil/GlassBR/Changes.hs +++ b/code/drasil-example/Drasil/GlassBR/Changes.hs @@ -1,4 +1,4 @@ -module Drasil.GlassBR.Changes (likelyChgs, unlikelyChgs) where +module Changes (likelyChgs, unlikelyChgs) where --A list of likely and unlikely changes for GlassBR @@ -10,10 +10,10 @@ import Data.Drasil.Concepts.Documentation (condition, goal, input_, likeChgDom, import Data.Drasil.Concepts.Math (calculation) import Data.Drasil.Concepts.PhysicalProperties (flexure) -import Drasil.GlassBR.Assumptions (assumpGC, assumpES, assumpSV, assumpGL, +import Assumptions (assumpGC, assumpES, assumpSV, assumpGL, assumpBC, assumpRT, assumpLDFC, assumptionConstants) -import Drasil.GlassBR.Concepts (blastRisk, glaSlab, glass) -import Drasil.GlassBR.Unitals (explosion, lite) +import Concepts (blastRisk, glaSlab, glass) +import Unitals (explosion, lite) {--LIKELY CHANGES--} diff --git a/code/drasil-example/Drasil/GlassBR/Concepts.hs b/code/drasil-example/Drasil/GlassBR/Concepts.hs index 42a627b09b..ce1aa9d3d3 100644 --- a/code/drasil-example/Drasil/GlassBR/Concepts.hs +++ b/code/drasil-example/Drasil/GlassBR/Concepts.hs @@ -1,4 +1,4 @@ -module Drasil.GlassBR.Concepts where --whole file is used +module Concepts where --whole file is used import Language.Drasil import Utils.Drasil diff --git a/code/drasil-example/Drasil/GlassBR/DataDefs.hs b/code/drasil-example/Drasil/GlassBR/DataDefs.hs index 4d9d8f3022..f2faf39f39 100644 --- a/code/drasil-example/Drasil/GlassBR/DataDefs.hs +++ b/code/drasil-example/Drasil/GlassBR/DataDefs.hs @@ -1,4 +1,4 @@ -module Drasil.GlassBR.DataDefs (aspRat, dataDefs, dimLL, qDefns, glaTyFac, +module DataDefs (aspRat, dataDefs, dimLL, qDefns, glaTyFac, hFromt, loadDF, nonFL, risk, standOffDis, strDisFac, tolPre, tolStrDisFac, eqTNTWDD, probOfBreak, calofCapacity, calofDemand, pbTolUsr, qRef,configFp) where @@ -17,12 +17,12 @@ import Data.Drasil.Concepts.PhysicalProperties (dimension) import Data.Drasil.Citations (campidelli) -import Drasil.GlassBR.Assumptions (assumpSV, assumpLDFC) -import Drasil.GlassBR.Concepts (annealed, fullyT, glass, heatS) -import Drasil.GlassBR.Figures (demandVsSDFig, dimlessloadVsARFig) -import Drasil.GlassBR.ModuleDefs (interpY, interpZ) -import Drasil.GlassBR.References (astm2009, beasonEtAl1998) -import Drasil.GlassBR.Unitals (actualThicknesses, aspectRatio, charWeight, +import Assumptions (assumpSV, assumpLDFC) +import Concepts (annealed, fullyT, glass, heatS) +import Figures (demandVsSDFig, dimlessloadVsARFig) +import ModuleDefs (interpY, interpZ) +import References (astm2009, beasonEtAl1998) +import Unitals (actualThicknesses, aspectRatio, charWeight, demand, demandq, dimlessLoad, eqTNTWeight, gTF, glassType, glassTypeCon, glassTypeFactors, lDurFac, lRe, loadDur, loadSF, minThick, modElas, nomThick, nominalThicknesses, nonFactorL, pbTol, plateLen, plateWidth, probBr, riskFun, diff --git a/code/drasil-example/Drasil/GlassBR/Figures.hs b/code/drasil-example/Drasil/GlassBR/Figures.hs index 8eea8817d8..0ecff9b3cf 100644 --- a/code/drasil-example/Drasil/GlassBR/Figures.hs +++ b/code/drasil-example/Drasil/GlassBR/Figures.hs @@ -1,4 +1,4 @@ -module Drasil.GlassBR.Figures where +module Figures where import Control.Lens((^.)) @@ -8,8 +8,8 @@ import Utils.Drasil import Data.Drasil.Concepts.Documentation (assumption, item, physicalSystem, requirement, section_, sysCont, traceyMatrix) -import Drasil.GlassBR.Concepts (aR, stdOffDist) -import Drasil.GlassBR.Unitals (aspectRatio, charWeight, demand, demandq, +import Concepts (aR, stdOffDist) +import Unitals (aspectRatio, charWeight, demand, demandq, dimlessLoad, lateralLoad, sD, stressDistFac) resourcePath :: String diff --git a/code/drasil-example/Drasil/GlassBR/Goals.hs b/code/drasil-example/Drasil/GlassBR/Goals.hs index 802fc1f7f7..eab7fd65b6 100644 --- a/code/drasil-example/Drasil/GlassBR/Goals.hs +++ b/code/drasil-example/Drasil/GlassBR/Goals.hs @@ -1,4 +1,4 @@ -module Drasil.GlassBR.Goals (goals, willBreakGS) where +module Goals (goals, willBreakGS) where import Language.Drasil import Utils.Drasil @@ -6,8 +6,8 @@ import Utils.Drasil import Data.Drasil.Concepts.Documentation (goalStmtDom, userInput) import Data.Drasil.Concepts.Thermodynamics (degree_') -import Drasil.GlassBR.Concepts (glaSlab) -import Drasil.GlassBR.Unitals (explosion) +import Concepts (glaSlab) +import Unitals (explosion) goals :: [ConceptInstance] goals = [willBreakGS] diff --git a/code/drasil-example/Drasil/GlassBR/IMods.hs b/code/drasil-example/Drasil/GlassBR/IMods.hs index 2f6bea7319..bee77ecf62 100644 --- a/code/drasil-example/Drasil/GlassBR/IMods.hs +++ b/code/drasil-example/Drasil/GlassBR/IMods.hs @@ -1,15 +1,15 @@ -module Drasil.GlassBR.IMods (symb, iMods, pbIsSafe, lrIsSafe, instModIntro) where +module IMods (symb, iMods, pbIsSafe, lrIsSafe, instModIntro) where import Prelude hiding (exp) import Language.Drasil import Theory.Drasil (InstanceModel, imNoDeriv, qwC) import Utils.Drasil -import Drasil.GlassBR.DataDefs (probOfBreak, calofCapacity, calofDemand, +import DataDefs (probOfBreak, calofCapacity, calofDemand, pbTolUsr, qRef) -import Drasil.GlassBR.Goals (willBreakGS) -import Drasil.GlassBR.References (astm2009) -import Drasil.GlassBR.Unitals (charWeight, demand, demandq, isSafeLR, isSafePb, +import Goals (willBreakGS) +import References (astm2009) +import Unitals (charWeight, demand, demandq, isSafeLR, isSafePb, lRe, pbTol, plateLen, plateWidth, probBr, standOffDist) import Data.Drasil.Concepts.Documentation (goal) diff --git a/code/drasil-example/Drasil/GlassBR/Main.hs b/code/drasil-example/Drasil/GlassBR/Main.hs index 9c398b93b1..4ed5cebbe2 100644 --- a/code/drasil-example/Drasil/GlassBR/Main.hs +++ b/code/drasil-example/Drasil/GlassBR/Main.hs @@ -10,8 +10,8 @@ import Language.Drasil.Code (Choices(..), CodeSpec, codeSpec, Comments(..), import Language.Drasil.Generate (gen, genCode) import Language.Drasil.Printers (DocSpec(DocSpec), DocType(SRS, Website)) -import Drasil.GlassBR.Body (si, srs, printSetting) -import Drasil.GlassBR.ModuleDefs (allMods) +import Body (si, srs, printSetting) +import ModuleDefs (allMods) code :: CodeSpec code = codeSpec si choices allMods diff --git a/code/drasil-example/Drasil/GlassBR/ModuleDefs.hs b/code/drasil-example/Drasil/GlassBR/ModuleDefs.hs index 4c792aeceb..86679fd1ab 100644 --- a/code/drasil-example/Drasil/GlassBR/ModuleDefs.hs +++ b/code/drasil-example/Drasil/GlassBR/ModuleDefs.hs @@ -2,7 +2,7 @@ -- when 'name' and 'nameCT' both appear, 'name' is the Haskell function and -- 'nameCT' is the "Code Template" that 'name' builds. -module Drasil.GlassBR.ModuleDefs (allMods, implVars, interpY, interpZ) where +module ModuleDefs (allMods, implVars, interpY, interpZ) where import Language.Drasil import Language.Drasil.ShortHands diff --git a/code/drasil-example/Drasil/GlassBR/References.hs b/code/drasil-example/Drasil/GlassBR/References.hs index d6258ac1ac..c26c56d444 100644 --- a/code/drasil-example/Drasil/GlassBR/References.hs +++ b/code/drasil-example/Drasil/GlassBR/References.hs @@ -1,4 +1,4 @@ -module Drasil.GlassBR.References where +module References where import Language.Drasil diff --git a/code/drasil-example/Drasil/GlassBR/Requirements.hs b/code/drasil-example/Drasil/GlassBR/Requirements.hs index 6e9007477e..221dd6e7ad 100644 --- a/code/drasil-example/Drasil/GlassBR/Requirements.hs +++ b/code/drasil-example/Drasil/GlassBR/Requirements.hs @@ -1,4 +1,4 @@ -module Drasil.GlassBR.Requirements (funcReqs, funcReqsTables, inReqDesc, nonfuncReqs) where +module Requirements (funcReqs, funcReqsTables, inReqDesc, nonfuncReqs) where import Control.Lens ((^.)) @@ -19,13 +19,13 @@ import Data.Drasil.Concepts.Software (errMsg) import Data.Drasil.IdeaDicts (dataDefn, genDefn, inModel, thModel) -import Drasil.GlassBR.Assumptions (assumpSV, assumpGL, assumptionConstants) -import Drasil.GlassBR.Concepts (glass) -import Drasil.GlassBR.DataDefs (aspRat, dimLL, glaTyFac, hFromt, loadDF, nonFL, +import Assumptions (assumpSV, assumpGL, assumptionConstants) +import Concepts (glass) +import DataDefs (aspRat, dimLL, glaTyFac, hFromt, loadDF, nonFL, risk, standOffDis, strDisFac, tolPre, tolStrDisFac) -import Drasil.GlassBR.IMods (iMods) -import Drasil.GlassBR.TMods (lrIsSafe, pbIsSafe) -import Drasil.GlassBR.Unitals (blast, isSafeLR, isSafePb, loadSF, notSafe, +import IMods (iMods) +import TMods (lrIsSafe, pbIsSafe) +import Unitals (blast, isSafeLR, isSafePb, loadSF, notSafe, pbTolfail, safeMessage) {--Functional Requirements--} diff --git a/code/drasil-example/Drasil/GlassBR/Symbols.hs b/code/drasil-example/Drasil/GlassBR/Symbols.hs index b1fe15f8e5..931ef27419 100644 --- a/code/drasil-example/Drasil/GlassBR/Symbols.hs +++ b/code/drasil-example/Drasil/GlassBR/Symbols.hs @@ -1,11 +1,11 @@ -module Drasil.GlassBR.Symbols where +module Symbols where import Language.Drasil (QuantityDict, qw) import Language.Drasil.Code (Mod(Mod), asVC, asVC') -import Drasil.GlassBR.IMods (iMods) -import Drasil.GlassBR.ModuleDefs (allMods, implVars, interpY, interpZ) -import Drasil.GlassBR.Unitals (inputDataConstraints, inputs, outputs, +import IMods (iMods) +import ModuleDefs (allMods, implVars, interpY, interpZ) +import Unitals (inputDataConstraints, inputs, outputs, specParamVals, symbols, symbolsWithDefns, unitless, tmSymbols) import Data.List ((\\)) diff --git a/code/drasil-example/Drasil/GlassBR/TMods.hs b/code/drasil-example/Drasil/GlassBR/TMods.hs index 982a63ef4b..7a5715c25e 100644 --- a/code/drasil-example/Drasil/GlassBR/TMods.hs +++ b/code/drasil-example/Drasil/GlassBR/TMods.hs @@ -1,15 +1,15 @@ -module Drasil.GlassBR.TMods (tMods, pbIsSafe, lrIsSafe) where +module TMods (tMods, pbIsSafe, lrIsSafe) where import Language.Drasil import Language.Drasil.Code (relToQD) -- FIXME, this should not be needed import Database.Drasil (cdb) import Theory.Drasil (TheoryModel, tm) -import Drasil.GlassBR.IMods (symb) -import Drasil.GlassBR.References (astm2009) -import Drasil.GlassBR.Unitals (isSafeLoad, isSafeProb, pbTolfail, probFail, +import IMods (symb) +import References (astm2009) +import Unitals (isSafeLoad, isSafeProb, pbTolfail, probFail, tmDemand, tmLRe) -import Drasil.GlassBR.Symbols (thisSymbols) +import Symbols (thisSymbols) {--} diff --git a/code/drasil-example/Drasil/GlassBR/Unitals.hs b/code/drasil-example/Drasil/GlassBR/Unitals.hs index c9897d040b..895ae30b32 100644 --- a/code/drasil-example/Drasil/GlassBR/Unitals.hs +++ b/code/drasil-example/Drasil/GlassBR/Unitals.hs @@ -1,4 +1,4 @@ -module Drasil.GlassBR.Unitals where --whole file is used +module Unitals where --whole file is used import Language.Drasil import Language.Drasil.ShortHands @@ -12,11 +12,11 @@ import Data.Drasil.Constraints (gtZeroConstr, probConstr) import Data.Drasil.Quantities.Physics (subMax, subMin, subX, subY, subZ) import Data.Drasil.SI_Units (kilogram, metre, millimetre, pascal, second) -import Drasil.GlassBR.Concepts (aR, annealed, fullyT, glaPlane, glassTypeFac, +import Concepts (aR, annealed, fullyT, glaPlane, glassTypeFac, heatS, iGlass, lGlass, lResistance, lShareFac, loadDurFactor, nFL, responseTy, stdOffDist) -import Drasil.GlassBR.References (astm2009, astm2012, astm2016) -import Drasil.GlassBR.Units (sFlawPU) +import References (astm2009, astm2012, astm2016) +import Units (sFlawPU) --FIXME: Many of the current terms can be separated into terms and defns? diff --git a/code/drasil-example/Drasil/GlassBR/Units.hs b/code/drasil-example/Drasil/GlassBR/Units.hs index 5a92df1655..bd94084e08 100644 --- a/code/drasil-example/Drasil/GlassBR/Units.hs +++ b/code/drasil-example/Drasil/GlassBR/Units.hs @@ -1,4 +1,4 @@ -module Drasil.GlassBR.Units (sFlawPU) where +module Units (sFlawPU) where import Language.Drasil (UnitDefn, newUnit, (^$), (^:)) import Data.Drasil.SI_Units (metre, newton) diff --git a/code/drasil-example/Drasil/HGHC/Body.hs b/code/drasil-example/Drasil/HGHC/Body.hs index aa0bf6e2e6..451c0ada11 100644 --- a/code/drasil-example/Drasil/HGHC/Body.hs +++ b/code/drasil-example/Drasil/HGHC/Body.hs @@ -1,4 +1,4 @@ -module Drasil.HGHC.Body (srs, si, symbMap, printSetting) where +module Body (srs, si, symbMap, printSetting) where import Language.Drasil hiding (Manual, Symbol(..)) -- Citation name conflict. FIXME: Move to different namespace import Drasil.DocLang (DocSection(RefSec, SSDSec), Literature(Lit, Manual), @@ -14,7 +14,7 @@ import Database.Drasil (Block, ChunkDB, SystemInformation(SI), cdb, _sys, _sysinfodb, _usedinfodb) import Utils.Drasil -import Drasil.HGHC.HeatTransfer (fp, hghc, dataDefs, htInputs, htOutputs, +import HeatTransfer (fp, hghc, dataDefs, htInputs, htOutputs, nuclearPhys, symbols) import Data.Drasil.SI_Units (siUnits, fundamentals, derived, degree) diff --git a/code/drasil-example/Drasil/HGHC/HeatTransfer.hs b/code/drasil-example/Drasil/HGHC/HeatTransfer.hs index 51a9af1019..2208189545 100644 --- a/code/drasil-example/Drasil/HGHC/HeatTransfer.hs +++ b/code/drasil-example/Drasil/HGHC/HeatTransfer.hs @@ -1,4 +1,4 @@ -module Drasil.HGHC.HeatTransfer where --whole file is used +module HeatTransfer where --whole file is used import Language.Drasil import Language.Drasil.ShortHands diff --git a/code/drasil-example/Drasil/HGHC/Main.hs b/code/drasil-example/Drasil/HGHC/Main.hs index 9eac84ff56..3555cb04de 100644 --- a/code/drasil-example/Drasil/HGHC/Main.hs +++ b/code/drasil-example/Drasil/HGHC/Main.hs @@ -11,7 +11,7 @@ import GHC.IO.Encoding import Language.Drasil.Generate (gen) import Language.Drasil.Printers (DocType(SRS, Website), DocSpec(DocSpec)) -import Drasil.HGHC.Body (srs, printSetting) --thisSI +import Body (srs, printSetting) --thisSI -- thisCode :: CodeSpec -- thisCode = codeSpec thisSI choices [] diff --git a/code/drasil-example/drasil-example.cabal b/code/drasil-example/drasil-example.cabal index 4a702e0cea..d165570470 100644 --- a/code/drasil-example/drasil-example.cabal +++ b/code/drasil-example/drasil-example.cabal @@ -1,336 +1,91 @@ -Name: drasil-example -Version: 0.1.24 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith -build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Example SubPackage - -executable hghc - hs-source-dirs: . - main-is: Drasil/HGHC/Main.hs - other-modules: - Drasil.HGHC.Body - , Drasil.HGHC.HeatTransfer - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - drasil-lang >= 0.1.58, - drasil-data >= 0.1.13, - drasil-code >= 0.1.9, - drasil-database >= 0.1.0, - drasil-printers >= 0.1.8, - drasil-gen >= 0.1.3, - drasil-docLang >= 0.1.26, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -O2 -Wredundant-constraints - -executable glassbr - hs-source-dirs: . - main-is: Drasil/GlassBR/Main.hs - other-modules: - Drasil.GlassBR.Assumptions - , Drasil.GlassBR.Body - , Drasil.GlassBR.Changes - , Drasil.GlassBR.Concepts - , Drasil.GlassBR.DataDefs - , Drasil.GlassBR.Figures - , Drasil.GlassBR.Goals - , Drasil.GlassBR.ModuleDefs - , Drasil.GlassBR.IMods - , Drasil.GlassBR.References - , Drasil.GlassBR.Requirements - , Drasil.GlassBR.Symbols - , Drasil.GlassBR.TMods - , Drasil.GlassBR.Unitals - , Drasil.GlassBR.Units - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - drasil-lang >= 0.1.58, - drasil-data >= 0.1.13, - drasil-code >= 0.1.9, - drasil-database >= 0.1.1, - drasil-printers >= 0.1.8, - drasil-gen >= 0.1.3, - drasil-docLang >= 0.1.26, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -executable nopcm - hs-source-dirs: . - main-is: Drasil/NoPCM/Main.hs - other-modules: - Drasil.NoPCM.Assumptions - , Drasil.NoPCM.Body - , Drasil.NoPCM.Changes - , Drasil.NoPCM.Unitals - , Drasil.NoPCM.DataDefs - , Drasil.NoPCM.Definitions - , Drasil.NoPCM.IMods - , Drasil.NoPCM.GenDefs - , Drasil.NoPCM.Goals - , Drasil.NoPCM.Requirements - , Drasil.NoPCM.References - , Drasil.SWHS.Assumptions - , Drasil.SWHS.Body - , Drasil.SWHS.Changes - , Drasil.SWHS.Concepts - , Drasil.SWHS.DataDefs - , Drasil.SWHS.GenDefs - , Drasil.SWHS.Goals - , Drasil.SWHS.Changes - , Drasil.SWHS.References - , Drasil.SWHS.Requirements - , Drasil.SWHS.TMods - , Drasil.SWHS.IMods - , Drasil.SWHS.Unitals - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - drasil-lang >= 0.1.58, - drasil-data >= 0.1.13, - drasil-code >= 0.1.9, - drasil-database >= 0.1.1, - drasil-printers >= 0.1.8, - drasil-gen >= 0.1.3, - drasil-docLang >= 0.1.26, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -executable swhs - hs-source-dirs: . - main-is: Drasil/SWHS/Main.hs - other-modules: - Drasil.SWHS.Assumptions - , Drasil.SWHS.Body - , Drasil.SWHS.Changes - , Drasil.SWHS.Concepts - , Drasil.SWHS.DataDefs - , Drasil.SWHS.GenDefs - , Drasil.SWHS.Generate - , Drasil.SWHS.Goals - , Drasil.SWHS.IMods - , Drasil.SWHS.References - , Drasil.SWHS.Requirements - , Drasil.SWHS.TMods - , Drasil.SWHS.Unitals - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - drasil-lang >= 0.1.58, - drasil-data >= 0.1.13, - drasil-code >= 0.1.9, - drasil-database >= 0.1.1, - drasil-printers >= 0.1.8, - drasil-gen >= 0.1.3, - drasil-docLang >= 0.1.26, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints +cabal-version: 1.12 -executable ssp - hs-source-dirs: . - main-is: Drasil/SSP/Main.hs - other-modules: - Drasil.SSP.Assumptions - , Drasil.SSP.BasicExprs - , Drasil.SSP.Body - , Drasil.SSP.Changes - , Drasil.SSP.DataDefs - , Drasil.SSP.Defs - , Drasil.SSP.Figures - , Drasil.SSP.GenDefs - , Drasil.SSP.Goals - , Drasil.SSP.IMods - , Drasil.SSP.References - , Drasil.SSP.Requirements - , Drasil.SSP.TMods - , Drasil.SSP.Unitals - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - drasil-lang >= 0.1.58, - drasil-data >= 0.1.13, - drasil-code >= 0.1.9, - drasil-database >= 0.1.1, - drasil-printers >= 0.1.8, - drasil-gen >= 0.1.3, - drasil-docLang >= 0.1.26, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints +-- This file has been generated from package.yaml by hpack version 0.33.0. +-- +-- see: https://github.com/sol/hpack +-- +-- hash: d6fb82f6ffb1eb897c05508b77ed8bc7a1d7db92c35509e828ccf8cb6845369a -executable gamephysics - hs-source-dirs: . - main-is: Drasil/GamePhysics/Main.hs - other-modules: - Drasil.GamePhysics.Assumptions - , Drasil.GamePhysics.Body - , Drasil.GamePhysics.Changes - , Drasil.GamePhysics.Concepts - , Drasil.GamePhysics.DataDefs - , Drasil.GamePhysics.GenDefs - , Drasil.GamePhysics.Goals - , Drasil.GamePhysics.TMods - , Drasil.GamePhysics.Unitals - , Drasil.GamePhysics.IMods - , Drasil.GamePhysics.References - , Drasil.GamePhysics.Requirements - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - drasil-lang >= 0.1.58, - drasil-data >= 0.1.13, - drasil-code >= 0.1.9, - drasil-database >= 0.1.1, - drasil-printers >= 0.1.8, - drasil-gen >= 0.1.3, - drasil-docLang >= 0.1.26, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints +name: drasil-example +version: 0.1.24.0 +synopsis: A framework for code and document generation for scientific software - Example SubPackage +description: Please see the README on GitHub at +homepage: https://jacquescarette.github.io/Drasil/ +bug-reports: https://github.com/JacquesCarette/Drasil/issues +author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +maintainer: Jacques Carette +license: BSD3 +build-type: Simple -executable projectile - hs-source-dirs: . - main-is: Drasil/Projectile/Main.hs - other-modules: - Drasil.Projectile.Assumptions - , Drasil.Projectile.Body - , Drasil.Projectile.Concepts - , Drasil.Projectile.DataDefs - , Drasil.Projectile.Figures - , Drasil.Projectile.GenDefs - , Drasil.Projectile.Goals - , Drasil.Projectile.IMods - , Drasil.Projectile.References - , Drasil.Projectile.Requirements - , Drasil.Projectile.TMods - , Drasil.Projectile.Unitals - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - drasil-lang >= 0.1.58, - drasil-data >= 0.1.13, - drasil-gool >= 0.1.1, - drasil-code >= 0.1.9, - drasil-database >= 0.1.1, - drasil-printers >= 0.1.8, - drasil-gen >= 0.1.3, - drasil-docLang >= 0.1.26, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints +source-repository head + type: git + location: https://github.com/JacquesCarette/Drasil -executable template - hs-source-dirs: . - main-is: Drasil/Template/Main.hs +executable glassbr + main-is: Main.hs other-modules: - Drasil.Template.Body - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - drasil-lang >= 0.1.58, - drasil-data >= 0.1.13, - drasil-code >= 0.1.9, - drasil-database >= 0.1.1, - drasil-printers >= 0.1.8, - drasil-gen >= 0.1.3, - drasil-docLang >= 0.1.26, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 + Assumptions + Body + Changes + Concepts + DataDefs + Figures + Goals + IMods + ModuleDefs + References + Requirements + Symbols + TMods + Unitals + Units + Paths_drasil_example + hs-source-dirs: + Drasil/GlassBR/ + ghc-options: -Wall -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N -O2 -Wall -Wredundant-constraints + build-depends: + base >=4.7 + , containers >=0.5.5.1 + , directory >=1.2.6.2 + , drasil-code + , drasil-data + , drasil-database + , drasil-docLang + , drasil-gen + , drasil-lang + , drasil-printers + , drasil-theory + , drasil-utils + , lens >=4.12 + , mtl >=2.2.1 + , pretty >=1.1.1.1 + , split >=0.2.3.1 default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints -executable dblpendulum - hs-source-dirs: . - main-is: Drasil/DblPendulum/Main.hs +executable hghc + main-is: Main.hs other-modules: - Drasil.DblPendulum.Body - , Drasil.DblPendulum.Figures - , Drasil.DblPendulum.Concepts - , Drasil.DblPendulum.Assumptions - , Drasil.DblPendulum.Goals - , Drasil.DblPendulum.DataDefs - , Drasil.DblPendulum.Unitals - , Drasil.DblPendulum.TMods - , Drasil.Projectile.References - , Drasil.DblPendulum.GenDefs - , Drasil.DblPendulum.References - , Drasil.DblPendulum.IMods - , Drasil.DblPendulum.Requirements - - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - drasil-lang >= 0.1.58, - drasil-data >= 0.1.13, - drasil-code >= 0.1.9, - drasil-database >= 0.1.1, - drasil-printers >= 0.1.8, - drasil-gen >= 0.1.3, - drasil-docLang >= 0.1.26, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 + Body + HeatTransfer + Paths_drasil_example + hs-source-dirs: + Drasil/HGHC/ + ghc-options: -Wall -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N -O2 -Wall -Wredundant-constraints + build-depends: + base >=4.7 + , containers >=0.5.5.1 + , directory >=1.2.6.2 + , drasil-code + , drasil-data + , drasil-database + , drasil-docLang + , drasil-gen + , drasil-lang + , drasil-printers + , drasil-theory + , drasil-utils + , lens >=4.12 + , mtl >=2.2.1 + , pretty >=1.1.1.1 + , split >=0.2.3.1 default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-example/drasil-example.cabal.bak b/code/drasil-example/drasil-example.cabal.bak new file mode 100644 index 0000000000..4a702e0cea --- /dev/null +++ b/code/drasil-example/drasil-example.cabal.bak @@ -0,0 +1,336 @@ +Name: drasil-example +Version: 0.1.24 +Cabal-Version: >= 1.18 +Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +build-type: Simple +Synopsis: A framework for code and document generation for scientific software - Example SubPackage + +executable hghc + hs-source-dirs: . + main-is: Drasil/HGHC/Main.hs + other-modules: + Drasil.HGHC.Body + , Drasil.HGHC.HeatTransfer + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + split >= 0.2.3.1, + drasil-lang >= 0.1.58, + drasil-data >= 0.1.13, + drasil-code >= 0.1.9, + drasil-database >= 0.1.0, + drasil-printers >= 0.1.8, + drasil-gen >= 0.1.3, + drasil-docLang >= 0.1.26, + drasil-theory >= 0.1.0, + drasil-utils >= 0.1.0 + default-language: Haskell2010 + ghc-options: -Wall -O2 -Wredundant-constraints + +executable glassbr + hs-source-dirs: . + main-is: Drasil/GlassBR/Main.hs + other-modules: + Drasil.GlassBR.Assumptions + , Drasil.GlassBR.Body + , Drasil.GlassBR.Changes + , Drasil.GlassBR.Concepts + , Drasil.GlassBR.DataDefs + , Drasil.GlassBR.Figures + , Drasil.GlassBR.Goals + , Drasil.GlassBR.ModuleDefs + , Drasil.GlassBR.IMods + , Drasil.GlassBR.References + , Drasil.GlassBR.Requirements + , Drasil.GlassBR.Symbols + , Drasil.GlassBR.TMods + , Drasil.GlassBR.Unitals + , Drasil.GlassBR.Units + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + split >= 0.2.3.1, + drasil-lang >= 0.1.58, + drasil-data >= 0.1.13, + drasil-code >= 0.1.9, + drasil-database >= 0.1.1, + drasil-printers >= 0.1.8, + drasil-gen >= 0.1.3, + drasil-docLang >= 0.1.26, + drasil-theory >= 0.1.0, + drasil-utils >= 0.1.0 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + +executable nopcm + hs-source-dirs: . + main-is: Drasil/NoPCM/Main.hs + other-modules: + Drasil.NoPCM.Assumptions + , Drasil.NoPCM.Body + , Drasil.NoPCM.Changes + , Drasil.NoPCM.Unitals + , Drasil.NoPCM.DataDefs + , Drasil.NoPCM.Definitions + , Drasil.NoPCM.IMods + , Drasil.NoPCM.GenDefs + , Drasil.NoPCM.Goals + , Drasil.NoPCM.Requirements + , Drasil.NoPCM.References + , Drasil.SWHS.Assumptions + , Drasil.SWHS.Body + , Drasil.SWHS.Changes + , Drasil.SWHS.Concepts + , Drasil.SWHS.DataDefs + , Drasil.SWHS.GenDefs + , Drasil.SWHS.Goals + , Drasil.SWHS.Changes + , Drasil.SWHS.References + , Drasil.SWHS.Requirements + , Drasil.SWHS.TMods + , Drasil.SWHS.IMods + , Drasil.SWHS.Unitals + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + split >= 0.2.3.1, + drasil-lang >= 0.1.58, + drasil-data >= 0.1.13, + drasil-code >= 0.1.9, + drasil-database >= 0.1.1, + drasil-printers >= 0.1.8, + drasil-gen >= 0.1.3, + drasil-docLang >= 0.1.26, + drasil-theory >= 0.1.0, + drasil-utils >= 0.1.0 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + +executable swhs + hs-source-dirs: . + main-is: Drasil/SWHS/Main.hs + other-modules: + Drasil.SWHS.Assumptions + , Drasil.SWHS.Body + , Drasil.SWHS.Changes + , Drasil.SWHS.Concepts + , Drasil.SWHS.DataDefs + , Drasil.SWHS.GenDefs + , Drasil.SWHS.Generate + , Drasil.SWHS.Goals + , Drasil.SWHS.IMods + , Drasil.SWHS.References + , Drasil.SWHS.Requirements + , Drasil.SWHS.TMods + , Drasil.SWHS.Unitals + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + drasil-lang >= 0.1.58, + drasil-data >= 0.1.13, + drasil-code >= 0.1.9, + drasil-database >= 0.1.1, + drasil-printers >= 0.1.8, + drasil-gen >= 0.1.3, + drasil-docLang >= 0.1.26, + drasil-theory >= 0.1.0, + drasil-utils >= 0.1.0 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + +executable ssp + hs-source-dirs: . + main-is: Drasil/SSP/Main.hs + other-modules: + Drasil.SSP.Assumptions + , Drasil.SSP.BasicExprs + , Drasil.SSP.Body + , Drasil.SSP.Changes + , Drasil.SSP.DataDefs + , Drasil.SSP.Defs + , Drasil.SSP.Figures + , Drasil.SSP.GenDefs + , Drasil.SSP.Goals + , Drasil.SSP.IMods + , Drasil.SSP.References + , Drasil.SSP.Requirements + , Drasil.SSP.TMods + , Drasil.SSP.Unitals + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + split >= 0.2.3.1, + drasil-lang >= 0.1.58, + drasil-data >= 0.1.13, + drasil-code >= 0.1.9, + drasil-database >= 0.1.1, + drasil-printers >= 0.1.8, + drasil-gen >= 0.1.3, + drasil-docLang >= 0.1.26, + drasil-theory >= 0.1.0, + drasil-utils >= 0.1.0 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + +executable gamephysics + hs-source-dirs: . + main-is: Drasil/GamePhysics/Main.hs + other-modules: + Drasil.GamePhysics.Assumptions + , Drasil.GamePhysics.Body + , Drasil.GamePhysics.Changes + , Drasil.GamePhysics.Concepts + , Drasil.GamePhysics.DataDefs + , Drasil.GamePhysics.GenDefs + , Drasil.GamePhysics.Goals + , Drasil.GamePhysics.TMods + , Drasil.GamePhysics.Unitals + , Drasil.GamePhysics.IMods + , Drasil.GamePhysics.References + , Drasil.GamePhysics.Requirements + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + split >= 0.2.3.1, + drasil-lang >= 0.1.58, + drasil-data >= 0.1.13, + drasil-code >= 0.1.9, + drasil-database >= 0.1.1, + drasil-printers >= 0.1.8, + drasil-gen >= 0.1.3, + drasil-docLang >= 0.1.26, + drasil-theory >= 0.1.0, + drasil-utils >= 0.1.0 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + +executable projectile + hs-source-dirs: . + main-is: Drasil/Projectile/Main.hs + other-modules: + Drasil.Projectile.Assumptions + , Drasil.Projectile.Body + , Drasil.Projectile.Concepts + , Drasil.Projectile.DataDefs + , Drasil.Projectile.Figures + , Drasil.Projectile.GenDefs + , Drasil.Projectile.Goals + , Drasil.Projectile.IMods + , Drasil.Projectile.References + , Drasil.Projectile.Requirements + , Drasil.Projectile.TMods + , Drasil.Projectile.Unitals + + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + split >= 0.2.3.1, + drasil-lang >= 0.1.58, + drasil-data >= 0.1.13, + drasil-gool >= 0.1.1, + drasil-code >= 0.1.9, + drasil-database >= 0.1.1, + drasil-printers >= 0.1.8, + drasil-gen >= 0.1.3, + drasil-docLang >= 0.1.26, + drasil-theory >= 0.1.0, + drasil-utils >= 0.1.0 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + +executable template + hs-source-dirs: . + main-is: Drasil/Template/Main.hs + other-modules: + Drasil.Template.Body + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + split >= 0.2.3.1, + drasil-lang >= 0.1.58, + drasil-data >= 0.1.13, + drasil-code >= 0.1.9, + drasil-database >= 0.1.1, + drasil-printers >= 0.1.8, + drasil-gen >= 0.1.3, + drasil-docLang >= 0.1.26, + drasil-theory >= 0.1.0, + drasil-utils >= 0.1.0 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + +executable dblpendulum + hs-source-dirs: . + main-is: Drasil/DblPendulum/Main.hs + other-modules: + Drasil.DblPendulum.Body + , Drasil.DblPendulum.Figures + , Drasil.DblPendulum.Concepts + , Drasil.DblPendulum.Assumptions + , Drasil.DblPendulum.Goals + , Drasil.DblPendulum.DataDefs + , Drasil.DblPendulum.Unitals + , Drasil.DblPendulum.TMods + , Drasil.Projectile.References + , Drasil.DblPendulum.GenDefs + , Drasil.DblPendulum.References + , Drasil.DblPendulum.IMods + , Drasil.DblPendulum.Requirements + + + Build-Depends: + base >= 4.7, + lens >= 4.12, + containers >= 0.5.5.1, + pretty >= 1.1.1.1, + mtl >= 2.2.1, + directory >= 1.2.6.2, + split >= 0.2.3.1, + drasil-lang >= 0.1.58, + drasil-data >= 0.1.13, + drasil-code >= 0.1.9, + drasil-database >= 0.1.1, + drasil-printers >= 0.1.8, + drasil-gen >= 0.1.3, + drasil-docLang >= 0.1.26, + drasil-theory >= 0.1.0, + drasil-utils >= 0.1.0 + default-language: Haskell2010 + ghc-options: -Wall -Wredundant-constraints + +source-repository head + type: git + location: git://github.com/JacquesCarette/Drasil.git + subdir: code diff --git a/code/drasil-example/package.yaml b/code/drasil-example/package.yaml new file mode 100644 index 0000000000..235ade9fa9 --- /dev/null +++ b/code/drasil-example/package.yaml @@ -0,0 +1,64 @@ +name: drasil-example +version: 0.1.24.0 +license: BSD3 +author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" +maintainer: "Jacques Carette" +synopsis: A framework for code and document generation for scientific software - Example SubPackage +github: JacquesCarette/Drasil +homepage: https://jacquescarette.github.io/Drasil/ + +extra-source-files: [] + +# Metadata used when publishing your package +# category: Web + +# To avoid duplicated efforts in documentation and dealing with the +# complications of embedding Haddock markup inside cabal files, it is +# common to point users to the README.md file. +description: Please see the README on GitHub at + +dependencies: +- base >= 4.7 && < 5 +- base >= 4.7 +- lens >= 4.12 +- containers >= 0.5.5.1 +- pretty >= 1.1.1.1 +- mtl >= 2.2.1 +- directory >= 1.2.6.2 +- split >= 0.2.3.1 +- drasil-lang +- drasil-data +- drasil-code +- drasil-database +- drasil-printers +- drasil-gen +- drasil-docLang +- drasil-theory +- drasil-utils + +ghc-options: +- -Wall +- -Wredundant-constraints + +executables: + hghc: + main: Main.hs + source-dirs: Drasil/HGHC/ + ghc-options: + - -threaded + - -rtsopts + - -with-rtsopts=-N + - -O2 + - -Wall + - -Wredundant-constraints + + glassbr: + main: Main.hs + source-dirs: Drasil/GlassBR/ + ghc-options: + - -threaded + - -rtsopts + - -with-rtsopts=-N + - -O2 + - -Wall + - -Wredundant-constraints diff --git a/code/drasil-example/stack.yaml b/code/drasil-example/stack.yaml index a95ad867d0..5f555017c1 100644 --- a/code/drasil-example/stack.yaml +++ b/code/drasil-example/stack.yaml @@ -11,11 +11,14 @@ # resolver: lts-3.5 # resolver: nightly-2015-09-21 # resolver: ghc-7.10.2 -# resolver: ghcjs-0.1.0_ghc-7.10.2 -# resolver: -# name: custom-snapshot -# location: "./custom-snapshot.yaml" -resolver: lts-11.2 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# resolver: ./custom-snapshot.yaml +# resolver: https://example.com/snapshots/2018-01-01.yaml +resolver: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. @@ -23,32 +26,36 @@ resolver: lts-11.2 # packages: # - some-directory # - https://example.com/foo/bar/baz-0.0.2.tar.gz -# - location: -# git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# extra-dep: true -# subdirs: -# - auto-update -# - wai -# -# A package marked 'extra-dep: true' will only be built if demanded by a -# non-dependency (i.e. a user package), and its test suites and benchmarks -# will not be run. This is useful for tweaking upstream packages. +# subdirs: +# - auto-update +# - wai packages: -- ../drasil-lang -- ../drasil-data +- . +- ../drasil-build - ../drasil-code -- ../drasil-printers -- ../drasil-gen -- ../drasil-docLang +- ../drasil-data - ../drasil-database +- ../drasil-docLang +- ../drasil-gen +- ../drasil-gool +- ../drasil-lang +- ../drasil-printers - ../drasil-theory - ../drasil-utils -- ./ -# Dependency packages to be pulled from upstream that are not in the resolver -# (e.g., acme-missiles-0.3) -# extra-deps: [] + +# Dependency packages to be pulled from upstream that are not in the resolver. +# These entries can reference officially published versions as well as +# forks / in-progress versions pinned to a git hash. For example: +# +# extra-deps: +# - acme-missiles-0.3 +# - git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# +extra-deps: +- unicode-names-3.2.0.0@sha256:fef7241d93170e26265e84553090253a5e8ee207645d47cf271816f5834d07d2,470 +- unicode-properties-3.2.0.0@sha256:239766a6ac4322329353f6b9cd546024fd8c5f0235c8e32b3cba2d6bd245a699,1000 +- multiplate-0.0.3@sha256:5d2ffc50d23c55008100b7a8b70f77b5fcce08c6f23822c5a6adc5b5b9356a32,1311 # Override default flag values for local packages and extra-deps # flags: {} @@ -61,7 +68,7 @@ packages: # # Require a specific version of stack, using version ranges # require-stack-version: -any # Default -# require-stack-version: ">=1.6" +# require-stack-version: ">=2.5" # # Override the architecture used by stack, especially useful on Windows # arch: i386 From bd5bdc63663fd6d6f380bd67b0f0c21ccb021bda Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Sun, 24 Jan 2021 11:51:14 -0500 Subject: [PATCH 04/13] 2292 : WIP : drasil-examples, drasil-code --- code/drasil-code/drasil-code.cabal | 106 +++--- code/drasil-code/drasil-code.cabal.newbak | 184 ++++++++++ code/drasil-code/package.yaml | 107 +++++- .../drasil-example/Drasil/DblPendulum/Main.hs | 2 +- .../Drasil/GamePhysics/DesignDec/Arbiter.hs | 2 +- .../Drasil/GamePhysics/{GDef.hs => GDefs.hs} | 0 .../drasil-example/Drasil/GamePhysics/Main.hs | 2 +- .../Drasil/GlassBR/Assumptions.hs | 8 +- code/drasil-example/Drasil/GlassBR/Body.hs | 28 +- code/drasil-example/Drasil/GlassBR/Changes.hs | 8 +- .../drasil-example/Drasil/GlassBR/Concepts.hs | 2 +- .../drasil-example/Drasil/GlassBR/DataDefs.hs | 14 +- code/drasil-example/Drasil/GlassBR/Figures.hs | 6 +- code/drasil-example/Drasil/GlassBR/Goals.hs | 6 +- code/drasil-example/Drasil/GlassBR/IMods.hs | 10 +- code/drasil-example/Drasil/GlassBR/Main.hs | 6 +- .../Drasil/GlassBR/ModuleDefs.hs | 2 +- .../Drasil/GlassBR/References.hs | 2 +- .../Drasil/GlassBR/Requirements.hs | 14 +- code/drasil-example/Drasil/GlassBR/Symbols.hs | 8 +- code/drasil-example/Drasil/GlassBR/TMods.hs | 10 +- code/drasil-example/Drasil/GlassBR/Unitals.hs | 8 +- code/drasil-example/Drasil/GlassBR/Units.hs | 2 +- code/drasil-example/Drasil/HGHC/Body.hs | 4 +- .../Drasil/HGHC/HeatTransfer.hs | 2 +- code/drasil-example/Drasil/HGHC/Main.hs | 4 +- code/drasil-example/Drasil/NoPCM/Main.hs | 2 +- code/drasil-example/Drasil/Projectile/Main.hs | 2 +- code/drasil-example/Drasil/SSP/Main.hs | 2 +- code/drasil-example/Drasil/SWHS/Main.hs | 2 +- code/drasil-example/Drasil/Template/Main.hs | 2 +- code/drasil-example/drasil-example.cabal | 327 ++++++++++++++++-- code/drasil-example/package.yaml | 171 +++++++-- 33 files changed, 863 insertions(+), 192 deletions(-) create mode 100644 code/drasil-code/drasil-code.cabal.newbak rename code/drasil-example/Drasil/GamePhysics/{GDef.hs => GDefs.hs} (100%) diff --git a/code/drasil-code/drasil-code.cabal b/code/drasil-code/drasil-code.cabal index ac38a3a35b..23b0d0afc9 100644 --- a/code/drasil-code/drasil-code.cabal +++ b/code/drasil-code/drasil-code.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: b6618c3d3c5fa45e4ccec9bb470180364427a953ef1cdf14b3277b4a1ff19a40 +-- hash: 10266f7294e250c7dcd10deac1e95b00253d1c04352dd28f66e6437814d07dc1 name: drasil-code version: 0.1.9.0 @@ -25,60 +25,52 @@ library exposed-modules: Language.Drasil.Code other-modules: - Language.Drasil.Choices Language.Drasil.Chunk.Code Language.Drasil.Chunk.CodeDefinition Language.Drasil.Chunk.Parameter - Language.Drasil.Code.AST Language.Drasil.Code.Code - Language.Drasil.Code.CodeGeneration Language.Drasil.Code.CodeQuantityDicts Language.Drasil.Code.DataDesc Language.Drasil.Code.ExternalLibrary Language.Drasil.Code.ExternalLibraryCall Language.Drasil.Code.ExtLibImport + Language.Drasil.Code.Lang Language.Drasil.Code.Imperative.Build.AST Language.Drasil.Code.Imperative.Build.Import - Language.Drasil.Code.Imperative.Comments Language.Drasil.Code.Imperative.ConceptMatch - Language.Drasil.Code.Imperative.Descriptions + Language.Drasil.Code.Imperative.SpaceMatch Language.Drasil.Code.Imperative.Doxygen.Import - Language.Drasil.Code.Imperative.DrasilState - Language.Drasil.Code.Imperative.FunctionCalls - Language.Drasil.Code.Imperative.GenerateGOOL - Language.Drasil.Code.Imperative.Generator - Language.Drasil.Code.Imperative.GenODE - Language.Drasil.Code.Imperative.GOOL.ClassInterface + Language.Drasil.Code.Imperative.ReadInput + Language.Drasil.Code.Imperative.WriteInput + Language.Drasil.Code.Imperative.WriteReadMe Language.Drasil.Code.Imperative.GOOL.Data + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.LanguagePolymorphic Language.Drasil.Code.Imperative.GOOL.LanguageRenderer - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CppRenderer - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CSharpRenderer Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.JavaRenderer - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.LanguagePolymorphic Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.PythonRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CSharpRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CppRenderer Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.SwiftRenderer + Language.Drasil.Code.Imperative.GOOL.ClassInterface + Language.Drasil.Code.Imperative.Comments + Language.Drasil.Code.Imperative.Descriptions + Language.Drasil.Code.Imperative.FunctionCalls + Language.Drasil.Code.Imperative.GenerateGOOL + Language.Drasil.Code.Imperative.Generator + Language.Drasil.Code.Imperative.GenODE Language.Drasil.Code.Imperative.Helpers Language.Drasil.Code.Imperative.Import Language.Drasil.Code.Imperative.Logging Language.Drasil.Code.Imperative.Modules Language.Drasil.Code.Imperative.Parameters - Language.Drasil.Code.Imperative.ReadInput - Language.Drasil.Code.Imperative.SpaceMatch - Language.Drasil.Code.Imperative.WriteInput - Language.Drasil.Code.Imperative.WriteReadMe - Language.Drasil.Code.Lang - Language.Drasil.CodeExpr - Language.Drasil.CodeSpec + Language.Drasil.Code.Imperative.DrasilState + Language.Drasil.Code.CodeGeneration Language.Drasil.Data.ODEInfo Language.Drasil.Data.ODELibPckg + Language.Drasil.Choices + Language.Drasil.CodeExpr + Language.Drasil.CodeSpec Language.Drasil.Mod - Test.FileTests - Test.HelloWorld - Test.Helper - Test.Main - Test.Observer - Test.PatternTest - Paths_drasil_code hs-source-dirs: ./ ghc-options: -Wall -Wredundant-constraints @@ -105,63 +97,61 @@ library executable codegenTest main-is: Test/Main.hs other-modules: - Language.Drasil.Choices + Test.FileTests + Test.HelloWorld + Test.Helper + Test.Observer + Test.PatternTest + Language.Drasil.Code Language.Drasil.Chunk.Code Language.Drasil.Chunk.CodeDefinition Language.Drasil.Chunk.Parameter - Language.Drasil.Code - Language.Drasil.Code.AST Language.Drasil.Code.Code - Language.Drasil.Code.CodeGeneration Language.Drasil.Code.CodeQuantityDicts Language.Drasil.Code.DataDesc Language.Drasil.Code.ExternalLibrary Language.Drasil.Code.ExternalLibraryCall Language.Drasil.Code.ExtLibImport + Language.Drasil.Code.Lang Language.Drasil.Code.Imperative.Build.AST Language.Drasil.Code.Imperative.Build.Import - Language.Drasil.Code.Imperative.Comments Language.Drasil.Code.Imperative.ConceptMatch - Language.Drasil.Code.Imperative.Descriptions + Language.Drasil.Code.Imperative.SpaceMatch Language.Drasil.Code.Imperative.Doxygen.Import - Language.Drasil.Code.Imperative.DrasilState - Language.Drasil.Code.Imperative.FunctionCalls - Language.Drasil.Code.Imperative.GenerateGOOL - Language.Drasil.Code.Imperative.Generator - Language.Drasil.Code.Imperative.GenODE - Language.Drasil.Code.Imperative.GOOL.ClassInterface + Language.Drasil.Code.Imperative.ReadInput + Language.Drasil.Code.Imperative.WriteInput + Language.Drasil.Code.Imperative.WriteReadMe Language.Drasil.Code.Imperative.GOOL.Data + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.LanguagePolymorphic Language.Drasil.Code.Imperative.GOOL.LanguageRenderer - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CppRenderer - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CSharpRenderer Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.JavaRenderer - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.LanguagePolymorphic Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.PythonRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CSharpRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CppRenderer Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.SwiftRenderer + Language.Drasil.Code.Imperative.GOOL.ClassInterface + Language.Drasil.Code.Imperative.Comments + Language.Drasil.Code.Imperative.Descriptions + Language.Drasil.Code.Imperative.FunctionCalls + Language.Drasil.Code.Imperative.GenerateGOOL + Language.Drasil.Code.Imperative.Generator + Language.Drasil.Code.Imperative.GenODE Language.Drasil.Code.Imperative.Helpers Language.Drasil.Code.Imperative.Import Language.Drasil.Code.Imperative.Logging Language.Drasil.Code.Imperative.Modules Language.Drasil.Code.Imperative.Parameters - Language.Drasil.Code.Imperative.ReadInput - Language.Drasil.Code.Imperative.SpaceMatch - Language.Drasil.Code.Imperative.WriteInput - Language.Drasil.Code.Imperative.WriteReadMe - Language.Drasil.Code.Lang - Language.Drasil.CodeExpr - Language.Drasil.CodeSpec + Language.Drasil.Code.Imperative.DrasilState + Language.Drasil.Code.CodeGeneration Language.Drasil.Data.ODEInfo Language.Drasil.Data.ODELibPckg + Language.Drasil.Choices + Language.Drasil.CodeExpr + Language.Drasil.CodeSpec Language.Drasil.Mod - Test.FileTests - Test.HelloWorld - Test.Helper - Test.Observer - Test.PatternTest - Paths_drasil_code hs-source-dirs: ./ - ghc-options: -Wall -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N -O2 -Wall -Wredundant-constraints -main-is Test.Main + ghc-options: -Wall -Wredundant-constraints -threaded -O2 -main-is Test.Main build-depends: MissingH >=1.4.0.1 , base >=4.7 && <5 diff --git a/code/drasil-code/drasil-code.cabal.newbak b/code/drasil-code/drasil-code.cabal.newbak new file mode 100644 index 0000000000..ac38a3a35b --- /dev/null +++ b/code/drasil-code/drasil-code.cabal.newbak @@ -0,0 +1,184 @@ +cabal-version: 1.12 + +-- This file has been generated from package.yaml by hpack version 0.33.0. +-- +-- see: https://github.com/sol/hpack +-- +-- hash: b6618c3d3c5fa45e4ccec9bb470180364427a953ef1cdf14b3277b4a1ff19a40 + +name: drasil-code +version: 0.1.9.0 +synopsis: A framework for code and document generation for scientific software - Code SubPackage +description: Please see the README on GitHub at +homepage: https://jacquescarette.github.io/Drasil/ +bug-reports: https://github.com/JacquesCarette/Drasil/issues +author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith +maintainer: Jacques Carette +license: BSD3 +build-type: Simple + +source-repository head + type: git + location: https://github.com/JacquesCarette/Drasil + +library + exposed-modules: + Language.Drasil.Code + other-modules: + Language.Drasil.Choices + Language.Drasil.Chunk.Code + Language.Drasil.Chunk.CodeDefinition + Language.Drasil.Chunk.Parameter + Language.Drasil.Code.AST + Language.Drasil.Code.Code + Language.Drasil.Code.CodeGeneration + Language.Drasil.Code.CodeQuantityDicts + Language.Drasil.Code.DataDesc + Language.Drasil.Code.ExternalLibrary + Language.Drasil.Code.ExternalLibraryCall + Language.Drasil.Code.ExtLibImport + Language.Drasil.Code.Imperative.Build.AST + Language.Drasil.Code.Imperative.Build.Import + Language.Drasil.Code.Imperative.Comments + Language.Drasil.Code.Imperative.ConceptMatch + Language.Drasil.Code.Imperative.Descriptions + Language.Drasil.Code.Imperative.Doxygen.Import + Language.Drasil.Code.Imperative.DrasilState + Language.Drasil.Code.Imperative.FunctionCalls + Language.Drasil.Code.Imperative.GenerateGOOL + Language.Drasil.Code.Imperative.Generator + Language.Drasil.Code.Imperative.GenODE + Language.Drasil.Code.Imperative.GOOL.ClassInterface + Language.Drasil.Code.Imperative.GOOL.Data + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CppRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CSharpRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.JavaRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.LanguagePolymorphic + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.PythonRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.SwiftRenderer + Language.Drasil.Code.Imperative.Helpers + Language.Drasil.Code.Imperative.Import + Language.Drasil.Code.Imperative.Logging + Language.Drasil.Code.Imperative.Modules + Language.Drasil.Code.Imperative.Parameters + Language.Drasil.Code.Imperative.ReadInput + Language.Drasil.Code.Imperative.SpaceMatch + Language.Drasil.Code.Imperative.WriteInput + Language.Drasil.Code.Imperative.WriteReadMe + Language.Drasil.Code.Lang + Language.Drasil.CodeExpr + Language.Drasil.CodeSpec + Language.Drasil.Data.ODEInfo + Language.Drasil.Data.ODELibPckg + Language.Drasil.Mod + Test.FileTests + Test.HelloWorld + Test.Helper + Test.Main + Test.Observer + Test.PatternTest + Paths_drasil_code + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints + build-depends: + MissingH >=1.4.0.1 + , base >=4.7 && <5 + , containers >=0.5.5.1 + , directory >=1.2.6.2 + , drasil-build + , drasil-database + , drasil-gool + , drasil-lang + , drasil-printers + , drasil-theory + , drasil-utils + , filepath >=1.4.1 + , lens >=4.12 + , mtl >=2.2.1 + , parsec >=3.1.9 + , pretty >=1.1.1.1 + , split >=0.2.3.1 + default-language: Haskell2010 + +executable codegenTest + main-is: Test/Main.hs + other-modules: + Language.Drasil.Choices + Language.Drasil.Chunk.Code + Language.Drasil.Chunk.CodeDefinition + Language.Drasil.Chunk.Parameter + Language.Drasil.Code + Language.Drasil.Code.AST + Language.Drasil.Code.Code + Language.Drasil.Code.CodeGeneration + Language.Drasil.Code.CodeQuantityDicts + Language.Drasil.Code.DataDesc + Language.Drasil.Code.ExternalLibrary + Language.Drasil.Code.ExternalLibraryCall + Language.Drasil.Code.ExtLibImport + Language.Drasil.Code.Imperative.Build.AST + Language.Drasil.Code.Imperative.Build.Import + Language.Drasil.Code.Imperative.Comments + Language.Drasil.Code.Imperative.ConceptMatch + Language.Drasil.Code.Imperative.Descriptions + Language.Drasil.Code.Imperative.Doxygen.Import + Language.Drasil.Code.Imperative.DrasilState + Language.Drasil.Code.Imperative.FunctionCalls + Language.Drasil.Code.Imperative.GenerateGOOL + Language.Drasil.Code.Imperative.Generator + Language.Drasil.Code.Imperative.GenODE + Language.Drasil.Code.Imperative.GOOL.ClassInterface + Language.Drasil.Code.Imperative.GOOL.Data + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CppRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CSharpRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.JavaRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.LanguagePolymorphic + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.PythonRenderer + Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.SwiftRenderer + Language.Drasil.Code.Imperative.Helpers + Language.Drasil.Code.Imperative.Import + Language.Drasil.Code.Imperative.Logging + Language.Drasil.Code.Imperative.Modules + Language.Drasil.Code.Imperative.Parameters + Language.Drasil.Code.Imperative.ReadInput + Language.Drasil.Code.Imperative.SpaceMatch + Language.Drasil.Code.Imperative.WriteInput + Language.Drasil.Code.Imperative.WriteReadMe + Language.Drasil.Code.Lang + Language.Drasil.CodeExpr + Language.Drasil.CodeSpec + Language.Drasil.Data.ODEInfo + Language.Drasil.Data.ODELibPckg + Language.Drasil.Mod + Test.FileTests + Test.HelloWorld + Test.Helper + Test.Observer + Test.PatternTest + Paths_drasil_code + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N -O2 -Wall -Wredundant-constraints -main-is Test.Main + build-depends: + MissingH >=1.4.0.1 + , base >=4.7 && <5 + , containers >=0.5.5.1 + , directory >=1.2.6.2 + , drasil-build + , drasil-code + , drasil-database + , drasil-gool + , drasil-lang + , drasil-printers + , drasil-theory + , drasil-utils + , filepath >=1.4.1 + , lens >=4.12 + , mtl >=2.2.1 + , parsec >=3.1.9 + , pretty >=1.1.1.1 + , split >=0.2.3.1 + default-language: Haskell2010 diff --git a/code/drasil-code/package.yaml b/code/drasil-code/package.yaml index 39dd32afa6..9d51a13539 100644 --- a/code/drasil-code/package.yaml +++ b/code/drasil-code/package.yaml @@ -44,18 +44,113 @@ library: source-dirs: ./ exposed-modules: - Language.Drasil.Code + other-modules: + - Language.Drasil.Chunk.Code + - Language.Drasil.Chunk.CodeDefinition + - Language.Drasil.Chunk.Parameter + - Language.Drasil.Code.Code + - Language.Drasil.Code.CodeQuantityDicts + - Language.Drasil.Code.DataDesc + - Language.Drasil.Code.ExternalLibrary + - Language.Drasil.Code.ExternalLibraryCall + - Language.Drasil.Code.ExtLibImport + - Language.Drasil.Code.Lang + - Language.Drasil.Code.Imperative.Build.AST + - Language.Drasil.Code.Imperative.Build.Import + - Language.Drasil.Code.Imperative.ConceptMatch + - Language.Drasil.Code.Imperative.SpaceMatch + - Language.Drasil.Code.Imperative.Doxygen.Import + - Language.Drasil.Code.Imperative.ReadInput + - Language.Drasil.Code.Imperative.WriteInput + - Language.Drasil.Code.Imperative.WriteReadMe + - Language.Drasil.Code.Imperative.GOOL.Data + - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.LanguagePolymorphic + - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer + - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.JavaRenderer + - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.PythonRenderer + - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CSharpRenderer + - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CppRenderer + - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.SwiftRenderer + - Language.Drasil.Code.Imperative.GOOL.ClassInterface + - Language.Drasil.Code.Imperative.Comments + - Language.Drasil.Code.Imperative.Descriptions + - Language.Drasil.Code.Imperative.FunctionCalls + - Language.Drasil.Code.Imperative.GenerateGOOL + - Language.Drasil.Code.Imperative.Generator + - Language.Drasil.Code.Imperative.GenODE + - Language.Drasil.Code.Imperative.Helpers + - Language.Drasil.Code.Imperative.Import + - Language.Drasil.Code.Imperative.Logging + - Language.Drasil.Code.Imperative.Modules + - Language.Drasil.Code.Imperative.Parameters + - Language.Drasil.Code.Imperative.DrasilState + - Language.Drasil.Code.CodeGeneration + - Language.Drasil.Data.ODEInfo + - Language.Drasil.Data.ODELibPckg + - Language.Drasil.Choices + - Language.Drasil.CodeExpr + - Language.Drasil.CodeSpec + - Language.Drasil.Mod executables: codegenTest: - main: Test/Main.hs + main: Test.Main source-dirs: ./ + other-modules: + - Test.FileTests + - Test.HelloWorld + - Test.Helper + - Test.Observer + - Test.PatternTest + - Language.Drasil.Code + - Language.Drasil.Chunk.Code + - Language.Drasil.Chunk.CodeDefinition + - Language.Drasil.Chunk.Parameter + - Language.Drasil.Code.Code + - Language.Drasil.Code.CodeQuantityDicts + - Language.Drasil.Code.DataDesc + - Language.Drasil.Code.ExternalLibrary + - Language.Drasil.Code.ExternalLibraryCall + - Language.Drasil.Code.ExtLibImport + - Language.Drasil.Code.Lang + - Language.Drasil.Code.Imperative.Build.AST + - Language.Drasil.Code.Imperative.Build.Import + - Language.Drasil.Code.Imperative.ConceptMatch + - Language.Drasil.Code.Imperative.SpaceMatch + - Language.Drasil.Code.Imperative.Doxygen.Import + - Language.Drasil.Code.Imperative.ReadInput + - Language.Drasil.Code.Imperative.WriteInput + - Language.Drasil.Code.Imperative.WriteReadMe + - Language.Drasil.Code.Imperative.GOOL.Data + - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.LanguagePolymorphic + - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer + - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.JavaRenderer + - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.PythonRenderer + - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CSharpRenderer + - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CppRenderer + - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.SwiftRenderer + - Language.Drasil.Code.Imperative.GOOL.ClassInterface + - Language.Drasil.Code.Imperative.Comments + - Language.Drasil.Code.Imperative.Descriptions + - Language.Drasil.Code.Imperative.FunctionCalls + - Language.Drasil.Code.Imperative.GenerateGOOL + - Language.Drasil.Code.Imperative.Generator + - Language.Drasil.Code.Imperative.GenODE + - Language.Drasil.Code.Imperative.Helpers + - Language.Drasil.Code.Imperative.Import + - Language.Drasil.Code.Imperative.Logging + - Language.Drasil.Code.Imperative.Modules + - Language.Drasil.Code.Imperative.Parameters + - Language.Drasil.Code.Imperative.DrasilState + - Language.Drasil.Code.CodeGeneration + - Language.Drasil.Data.ODEInfo + - Language.Drasil.Data.ODELibPckg + - Language.Drasil.Choices + - Language.Drasil.CodeExpr + - Language.Drasil.CodeSpec + - Language.Drasil.Mod ghc-options: - -threaded - - -rtsopts - - -with-rtsopts=-N - -O2 - - -Wall - - -Wredundant-constraints - - -main-is Test.Main dependencies: - drasil-code diff --git a/code/drasil-example/Drasil/DblPendulum/Main.hs b/code/drasil-example/Drasil/DblPendulum/Main.hs index d81d79e5c5..caf986b23a 100644 --- a/code/drasil-example/Drasil/DblPendulum/Main.hs +++ b/code/drasil-example/Drasil/DblPendulum/Main.hs @@ -1,4 +1,4 @@ -module Main (main) where +module Drasil.DblPendulum.Main (main) where import GHC.IO.Encoding diff --git a/code/drasil-example/Drasil/GamePhysics/DesignDec/Arbiter.hs b/code/drasil-example/Drasil/GamePhysics/DesignDec/Arbiter.hs index 810b6a053f..99b51f6658 100644 --- a/code/drasil-example/Drasil/GamePhysics/DesignDec/Arbiter.hs +++ b/code/drasil-example/Drasil/GamePhysics/DesignDec/Arbiter.hs @@ -1,4 +1,4 @@ -module Drasil.GamePhysics.DesignDec.Vector where +module Drasil.GamePhysics.DesignDec.Arbiter where import Language.Drasil diff --git a/code/drasil-example/Drasil/GamePhysics/GDef.hs b/code/drasil-example/Drasil/GamePhysics/GDefs.hs similarity index 100% rename from code/drasil-example/Drasil/GamePhysics/GDef.hs rename to code/drasil-example/Drasil/GamePhysics/GDefs.hs diff --git a/code/drasil-example/Drasil/GamePhysics/Main.hs b/code/drasil-example/Drasil/GamePhysics/Main.hs index 1594bfd0a8..200e666a07 100644 --- a/code/drasil-example/Drasil/GamePhysics/Main.hs +++ b/code/drasil-example/Drasil/GamePhysics/Main.hs @@ -1,4 +1,4 @@ -module Main where +module Drasil.GamePhysics.Main where import GHC.IO.Encoding diff --git a/code/drasil-example/Drasil/GlassBR/Assumptions.hs b/code/drasil-example/Drasil/GlassBR/Assumptions.hs index 28c4bc4cf8..0a532181ce 100644 --- a/code/drasil-example/Drasil/GlassBR/Assumptions.hs +++ b/code/drasil-example/Drasil/GlassBR/Assumptions.hs @@ -1,4 +1,4 @@ -module Assumptions (assumpGT, assumpGC, assumpES, assumpSV, +module Drasil.GlassBR.Assumptions (assumpGT, assumpGC, assumpES, assumpSV, assumpGL, assumpBC, assumpRT, assumpLDFC, assumptionConstants, assumptions) where @@ -11,10 +11,10 @@ import Data.Drasil.Concepts.Documentation as Doc (assumpDom, condition, import Data.Drasil.Concepts.Math (calculation, surface, shape) import Data.Drasil.Concepts.PhysicalProperties (materialProprty) -import Concepts (beam, cantilever, edge, glaSlab, glass, glassBR, +import Drasil.GlassBR.Concepts (beam, cantilever, edge, glaSlab, glass, glassBR, lShareFac, plane, responseTy) -import References (astm2009) -import Unitals (constantK, constantLoadDur, +import Drasil.GlassBR.References (astm2009) +import Drasil.GlassBR.Unitals (constantK, constantLoadDur, constantLoadSF, constantM, constantModElas, explosion, lateral, lDurFac, loadDur) diff --git a/code/drasil-example/Drasil/GlassBR/Body.hs b/code/drasil-example/Drasil/GlassBR/Body.hs index c47f5815b4..88c489ae3a 100644 --- a/code/drasil-example/Drasil/GlassBR/Body.hs +++ b/code/drasil-example/Drasil/GlassBR/Body.hs @@ -1,4 +1,4 @@ -module Body where +module Drasil.GlassBR.Body where import Control.Lens ((^.)) import Language.Drasil hiding (Symbol(..), organization, section) @@ -47,20 +47,20 @@ import Data.Drasil.People (mCampidelli, nikitha, spencerSmith) import Data.Drasil.SI_Units (kilogram, metre, newton, pascal, second, fundamentals, derived) -import Assumptions (assumptionConstants, assumptions) -import Changes (likelyChgs, unlikelyChgs) -import Concepts (acronyms, blastRisk, glaPlane, glaSlab, glassBR, +import Drasil.GlassBR.Assumptions (assumptionConstants, assumptions) +import Drasil.GlassBR.Changes (likelyChgs, unlikelyChgs) +import Drasil.GlassBR.Concepts (acronyms, blastRisk, glaPlane, glaSlab, glassBR, ptOfExplsn, con, con') -import DataDefs (qDefns, configFp) -import qualified DataDefs as GB (dataDefs) -import Figures -import Goals (goals) -import IMods (symb, iMods, instModIntro) -import References (astm2009, astm2012, astm2016, citations, rbrtsn2012) -import Requirements (funcReqs, inReqDesc, funcReqsTables, nonfuncReqs) -import Symbols (symbolsForTable, thisSymbols) -import TMods (tMods) -import Unitals (blast, blastTy, bomb, explosion, constants, +import Drasil.GlassBR.DataDefs (qDefns, configFp) +import qualified Drasil.GlassBR.DataDefs as GB (dataDefs) +import Drasil.GlassBR.Figures +import Drasil.GlassBR.Goals (goals) +import Drasil.GlassBR.IMods (symb, iMods, instModIntro) +import Drasil.GlassBR.References (astm2009, astm2012, astm2016, citations, rbrtsn2012) +import Drasil.GlassBR.Requirements (funcReqs, inReqDesc, funcReqsTables, nonfuncReqs) +import Drasil.GlassBR.Symbols (symbolsForTable, thisSymbols) +import Drasil.GlassBR.TMods (tMods) +import Drasil.GlassBR.Unitals (blast, blastTy, bomb, explosion, constants, constrained, inputDataConstraints, inputs, outputs, specParamVals, glassTy, glassTypes, glBreakage, lateralLoad, load, loadTypes, pbTol, probBr, stressDistFac, probBreak, sD, termsWithAccDefn, termsWithDefsOnly, terms) diff --git a/code/drasil-example/Drasil/GlassBR/Changes.hs b/code/drasil-example/Drasil/GlassBR/Changes.hs index 7f9b44e913..721b3d9758 100644 --- a/code/drasil-example/Drasil/GlassBR/Changes.hs +++ b/code/drasil-example/Drasil/GlassBR/Changes.hs @@ -1,4 +1,4 @@ -module Changes (likelyChgs, unlikelyChgs) where +module Drasil.GlassBR.Changes (likelyChgs, unlikelyChgs) where --A list of likely and unlikely changes for GlassBR @@ -10,10 +10,10 @@ import Data.Drasil.Concepts.Documentation (condition, goal, input_, likeChgDom, import Data.Drasil.Concepts.Math (calculation) import Data.Drasil.Concepts.PhysicalProperties (flexure) -import Assumptions (assumpGC, assumpES, assumpSV, assumpGL, +import Drasil.GlassBR.Assumptions (assumpGC, assumpES, assumpSV, assumpGL, assumpBC, assumpRT, assumpLDFC, assumptionConstants) -import Concepts (blastRisk, glaSlab, glass) -import Unitals (explosion, lite) +import Drasil.GlassBR.Concepts (blastRisk, glaSlab, glass) +import Drasil.GlassBR.Unitals (explosion, lite) {--LIKELY CHANGES--} diff --git a/code/drasil-example/Drasil/GlassBR/Concepts.hs b/code/drasil-example/Drasil/GlassBR/Concepts.hs index ce1aa9d3d3..42a627b09b 100644 --- a/code/drasil-example/Drasil/GlassBR/Concepts.hs +++ b/code/drasil-example/Drasil/GlassBR/Concepts.hs @@ -1,4 +1,4 @@ -module Concepts where --whole file is used +module Drasil.GlassBR.Concepts where --whole file is used import Language.Drasil import Utils.Drasil diff --git a/code/drasil-example/Drasil/GlassBR/DataDefs.hs b/code/drasil-example/Drasil/GlassBR/DataDefs.hs index f2faf39f39..4d9d8f3022 100644 --- a/code/drasil-example/Drasil/GlassBR/DataDefs.hs +++ b/code/drasil-example/Drasil/GlassBR/DataDefs.hs @@ -1,4 +1,4 @@ -module DataDefs (aspRat, dataDefs, dimLL, qDefns, glaTyFac, +module Drasil.GlassBR.DataDefs (aspRat, dataDefs, dimLL, qDefns, glaTyFac, hFromt, loadDF, nonFL, risk, standOffDis, strDisFac, tolPre, tolStrDisFac, eqTNTWDD, probOfBreak, calofCapacity, calofDemand, pbTolUsr, qRef,configFp) where @@ -17,12 +17,12 @@ import Data.Drasil.Concepts.PhysicalProperties (dimension) import Data.Drasil.Citations (campidelli) -import Assumptions (assumpSV, assumpLDFC) -import Concepts (annealed, fullyT, glass, heatS) -import Figures (demandVsSDFig, dimlessloadVsARFig) -import ModuleDefs (interpY, interpZ) -import References (astm2009, beasonEtAl1998) -import Unitals (actualThicknesses, aspectRatio, charWeight, +import Drasil.GlassBR.Assumptions (assumpSV, assumpLDFC) +import Drasil.GlassBR.Concepts (annealed, fullyT, glass, heatS) +import Drasil.GlassBR.Figures (demandVsSDFig, dimlessloadVsARFig) +import Drasil.GlassBR.ModuleDefs (interpY, interpZ) +import Drasil.GlassBR.References (astm2009, beasonEtAl1998) +import Drasil.GlassBR.Unitals (actualThicknesses, aspectRatio, charWeight, demand, demandq, dimlessLoad, eqTNTWeight, gTF, glassType, glassTypeCon, glassTypeFactors, lDurFac, lRe, loadDur, loadSF, minThick, modElas, nomThick, nominalThicknesses, nonFactorL, pbTol, plateLen, plateWidth, probBr, riskFun, diff --git a/code/drasil-example/Drasil/GlassBR/Figures.hs b/code/drasil-example/Drasil/GlassBR/Figures.hs index 0ecff9b3cf..8eea8817d8 100644 --- a/code/drasil-example/Drasil/GlassBR/Figures.hs +++ b/code/drasil-example/Drasil/GlassBR/Figures.hs @@ -1,4 +1,4 @@ -module Figures where +module Drasil.GlassBR.Figures where import Control.Lens((^.)) @@ -8,8 +8,8 @@ import Utils.Drasil import Data.Drasil.Concepts.Documentation (assumption, item, physicalSystem, requirement, section_, sysCont, traceyMatrix) -import Concepts (aR, stdOffDist) -import Unitals (aspectRatio, charWeight, demand, demandq, +import Drasil.GlassBR.Concepts (aR, stdOffDist) +import Drasil.GlassBR.Unitals (aspectRatio, charWeight, demand, demandq, dimlessLoad, lateralLoad, sD, stressDistFac) resourcePath :: String diff --git a/code/drasil-example/Drasil/GlassBR/Goals.hs b/code/drasil-example/Drasil/GlassBR/Goals.hs index eab7fd65b6..802fc1f7f7 100644 --- a/code/drasil-example/Drasil/GlassBR/Goals.hs +++ b/code/drasil-example/Drasil/GlassBR/Goals.hs @@ -1,4 +1,4 @@ -module Goals (goals, willBreakGS) where +module Drasil.GlassBR.Goals (goals, willBreakGS) where import Language.Drasil import Utils.Drasil @@ -6,8 +6,8 @@ import Utils.Drasil import Data.Drasil.Concepts.Documentation (goalStmtDom, userInput) import Data.Drasil.Concepts.Thermodynamics (degree_') -import Concepts (glaSlab) -import Unitals (explosion) +import Drasil.GlassBR.Concepts (glaSlab) +import Drasil.GlassBR.Unitals (explosion) goals :: [ConceptInstance] goals = [willBreakGS] diff --git a/code/drasil-example/Drasil/GlassBR/IMods.hs b/code/drasil-example/Drasil/GlassBR/IMods.hs index bee77ecf62..2f6bea7319 100644 --- a/code/drasil-example/Drasil/GlassBR/IMods.hs +++ b/code/drasil-example/Drasil/GlassBR/IMods.hs @@ -1,15 +1,15 @@ -module IMods (symb, iMods, pbIsSafe, lrIsSafe, instModIntro) where +module Drasil.GlassBR.IMods (symb, iMods, pbIsSafe, lrIsSafe, instModIntro) where import Prelude hiding (exp) import Language.Drasil import Theory.Drasil (InstanceModel, imNoDeriv, qwC) import Utils.Drasil -import DataDefs (probOfBreak, calofCapacity, calofDemand, +import Drasil.GlassBR.DataDefs (probOfBreak, calofCapacity, calofDemand, pbTolUsr, qRef) -import Goals (willBreakGS) -import References (astm2009) -import Unitals (charWeight, demand, demandq, isSafeLR, isSafePb, +import Drasil.GlassBR.Goals (willBreakGS) +import Drasil.GlassBR.References (astm2009) +import Drasil.GlassBR.Unitals (charWeight, demand, demandq, isSafeLR, isSafePb, lRe, pbTol, plateLen, plateWidth, probBr, standOffDist) import Data.Drasil.Concepts.Documentation (goal) diff --git a/code/drasil-example/Drasil/GlassBR/Main.hs b/code/drasil-example/Drasil/GlassBR/Main.hs index 4ed5cebbe2..4f23fe8623 100644 --- a/code/drasil-example/Drasil/GlassBR/Main.hs +++ b/code/drasil-example/Drasil/GlassBR/Main.hs @@ -1,4 +1,4 @@ -module Main (main) where +module Drasil.GlassBR.Main (main) where import GHC.IO.Encoding @@ -10,8 +10,8 @@ import Language.Drasil.Code (Choices(..), CodeSpec, codeSpec, Comments(..), import Language.Drasil.Generate (gen, genCode) import Language.Drasil.Printers (DocSpec(DocSpec), DocType(SRS, Website)) -import Body (si, srs, printSetting) -import ModuleDefs (allMods) +import Drasil.GlassBR.Body (si, srs, printSetting) +import Drasil.GlassBR.ModuleDefs (allMods) code :: CodeSpec code = codeSpec si choices allMods diff --git a/code/drasil-example/Drasil/GlassBR/ModuleDefs.hs b/code/drasil-example/Drasil/GlassBR/ModuleDefs.hs index 86679fd1ab..4c792aeceb 100644 --- a/code/drasil-example/Drasil/GlassBR/ModuleDefs.hs +++ b/code/drasil-example/Drasil/GlassBR/ModuleDefs.hs @@ -2,7 +2,7 @@ -- when 'name' and 'nameCT' both appear, 'name' is the Haskell function and -- 'nameCT' is the "Code Template" that 'name' builds. -module ModuleDefs (allMods, implVars, interpY, interpZ) where +module Drasil.GlassBR.ModuleDefs (allMods, implVars, interpY, interpZ) where import Language.Drasil import Language.Drasil.ShortHands diff --git a/code/drasil-example/Drasil/GlassBR/References.hs b/code/drasil-example/Drasil/GlassBR/References.hs index c26c56d444..d6258ac1ac 100644 --- a/code/drasil-example/Drasil/GlassBR/References.hs +++ b/code/drasil-example/Drasil/GlassBR/References.hs @@ -1,4 +1,4 @@ -module References where +module Drasil.GlassBR.References where import Language.Drasil diff --git a/code/drasil-example/Drasil/GlassBR/Requirements.hs b/code/drasil-example/Drasil/GlassBR/Requirements.hs index 221dd6e7ad..6e9007477e 100644 --- a/code/drasil-example/Drasil/GlassBR/Requirements.hs +++ b/code/drasil-example/Drasil/GlassBR/Requirements.hs @@ -1,4 +1,4 @@ -module Requirements (funcReqs, funcReqsTables, inReqDesc, nonfuncReqs) where +module Drasil.GlassBR.Requirements (funcReqs, funcReqsTables, inReqDesc, nonfuncReqs) where import Control.Lens ((^.)) @@ -19,13 +19,13 @@ import Data.Drasil.Concepts.Software (errMsg) import Data.Drasil.IdeaDicts (dataDefn, genDefn, inModel, thModel) -import Assumptions (assumpSV, assumpGL, assumptionConstants) -import Concepts (glass) -import DataDefs (aspRat, dimLL, glaTyFac, hFromt, loadDF, nonFL, +import Drasil.GlassBR.Assumptions (assumpSV, assumpGL, assumptionConstants) +import Drasil.GlassBR.Concepts (glass) +import Drasil.GlassBR.DataDefs (aspRat, dimLL, glaTyFac, hFromt, loadDF, nonFL, risk, standOffDis, strDisFac, tolPre, tolStrDisFac) -import IMods (iMods) -import TMods (lrIsSafe, pbIsSafe) -import Unitals (blast, isSafeLR, isSafePb, loadSF, notSafe, +import Drasil.GlassBR.IMods (iMods) +import Drasil.GlassBR.TMods (lrIsSafe, pbIsSafe) +import Drasil.GlassBR.Unitals (blast, isSafeLR, isSafePb, loadSF, notSafe, pbTolfail, safeMessage) {--Functional Requirements--} diff --git a/code/drasil-example/Drasil/GlassBR/Symbols.hs b/code/drasil-example/Drasil/GlassBR/Symbols.hs index 931ef27419..b1fe15f8e5 100644 --- a/code/drasil-example/Drasil/GlassBR/Symbols.hs +++ b/code/drasil-example/Drasil/GlassBR/Symbols.hs @@ -1,11 +1,11 @@ -module Symbols where +module Drasil.GlassBR.Symbols where import Language.Drasil (QuantityDict, qw) import Language.Drasil.Code (Mod(Mod), asVC, asVC') -import IMods (iMods) -import ModuleDefs (allMods, implVars, interpY, interpZ) -import Unitals (inputDataConstraints, inputs, outputs, +import Drasil.GlassBR.IMods (iMods) +import Drasil.GlassBR.ModuleDefs (allMods, implVars, interpY, interpZ) +import Drasil.GlassBR.Unitals (inputDataConstraints, inputs, outputs, specParamVals, symbols, symbolsWithDefns, unitless, tmSymbols) import Data.List ((\\)) diff --git a/code/drasil-example/Drasil/GlassBR/TMods.hs b/code/drasil-example/Drasil/GlassBR/TMods.hs index 7a5715c25e..982a63ef4b 100644 --- a/code/drasil-example/Drasil/GlassBR/TMods.hs +++ b/code/drasil-example/Drasil/GlassBR/TMods.hs @@ -1,15 +1,15 @@ -module TMods (tMods, pbIsSafe, lrIsSafe) where +module Drasil.GlassBR.TMods (tMods, pbIsSafe, lrIsSafe) where import Language.Drasil import Language.Drasil.Code (relToQD) -- FIXME, this should not be needed import Database.Drasil (cdb) import Theory.Drasil (TheoryModel, tm) -import IMods (symb) -import References (astm2009) -import Unitals (isSafeLoad, isSafeProb, pbTolfail, probFail, +import Drasil.GlassBR.IMods (symb) +import Drasil.GlassBR.References (astm2009) +import Drasil.GlassBR.Unitals (isSafeLoad, isSafeProb, pbTolfail, probFail, tmDemand, tmLRe) -import Symbols (thisSymbols) +import Drasil.GlassBR.Symbols (thisSymbols) {--} diff --git a/code/drasil-example/Drasil/GlassBR/Unitals.hs b/code/drasil-example/Drasil/GlassBR/Unitals.hs index 895ae30b32..c9897d040b 100644 --- a/code/drasil-example/Drasil/GlassBR/Unitals.hs +++ b/code/drasil-example/Drasil/GlassBR/Unitals.hs @@ -1,4 +1,4 @@ -module Unitals where --whole file is used +module Drasil.GlassBR.Unitals where --whole file is used import Language.Drasil import Language.Drasil.ShortHands @@ -12,11 +12,11 @@ import Data.Drasil.Constraints (gtZeroConstr, probConstr) import Data.Drasil.Quantities.Physics (subMax, subMin, subX, subY, subZ) import Data.Drasil.SI_Units (kilogram, metre, millimetre, pascal, second) -import Concepts (aR, annealed, fullyT, glaPlane, glassTypeFac, +import Drasil.GlassBR.Concepts (aR, annealed, fullyT, glaPlane, glassTypeFac, heatS, iGlass, lGlass, lResistance, lShareFac, loadDurFactor, nFL, responseTy, stdOffDist) -import References (astm2009, astm2012, astm2016) -import Units (sFlawPU) +import Drasil.GlassBR.References (astm2009, astm2012, astm2016) +import Drasil.GlassBR.Units (sFlawPU) --FIXME: Many of the current terms can be separated into terms and defns? diff --git a/code/drasil-example/Drasil/GlassBR/Units.hs b/code/drasil-example/Drasil/GlassBR/Units.hs index bd94084e08..5a92df1655 100644 --- a/code/drasil-example/Drasil/GlassBR/Units.hs +++ b/code/drasil-example/Drasil/GlassBR/Units.hs @@ -1,4 +1,4 @@ -module Units (sFlawPU) where +module Drasil.GlassBR.Units (sFlawPU) where import Language.Drasil (UnitDefn, newUnit, (^$), (^:)) import Data.Drasil.SI_Units (metre, newton) diff --git a/code/drasil-example/Drasil/HGHC/Body.hs b/code/drasil-example/Drasil/HGHC/Body.hs index 451c0ada11..aa0bf6e2e6 100644 --- a/code/drasil-example/Drasil/HGHC/Body.hs +++ b/code/drasil-example/Drasil/HGHC/Body.hs @@ -1,4 +1,4 @@ -module Body (srs, si, symbMap, printSetting) where +module Drasil.HGHC.Body (srs, si, symbMap, printSetting) where import Language.Drasil hiding (Manual, Symbol(..)) -- Citation name conflict. FIXME: Move to different namespace import Drasil.DocLang (DocSection(RefSec, SSDSec), Literature(Lit, Manual), @@ -14,7 +14,7 @@ import Database.Drasil (Block, ChunkDB, SystemInformation(SI), cdb, _sys, _sysinfodb, _usedinfodb) import Utils.Drasil -import HeatTransfer (fp, hghc, dataDefs, htInputs, htOutputs, +import Drasil.HGHC.HeatTransfer (fp, hghc, dataDefs, htInputs, htOutputs, nuclearPhys, symbols) import Data.Drasil.SI_Units (siUnits, fundamentals, derived, degree) diff --git a/code/drasil-example/Drasil/HGHC/HeatTransfer.hs b/code/drasil-example/Drasil/HGHC/HeatTransfer.hs index 2208189545..51a9af1019 100644 --- a/code/drasil-example/Drasil/HGHC/HeatTransfer.hs +++ b/code/drasil-example/Drasil/HGHC/HeatTransfer.hs @@ -1,4 +1,4 @@ -module HeatTransfer where --whole file is used +module Drasil.HGHC.HeatTransfer where --whole file is used import Language.Drasil import Language.Drasil.ShortHands diff --git a/code/drasil-example/Drasil/HGHC/Main.hs b/code/drasil-example/Drasil/HGHC/Main.hs index 3555cb04de..3796873400 100644 --- a/code/drasil-example/Drasil/HGHC/Main.hs +++ b/code/drasil-example/Drasil/HGHC/Main.hs @@ -1,4 +1,4 @@ -module Main (main) where +module Drasil.HGHC.Main (main) where import GHC.IO.Encoding @@ -11,7 +11,7 @@ import GHC.IO.Encoding import Language.Drasil.Generate (gen) import Language.Drasil.Printers (DocType(SRS, Website), DocSpec(DocSpec)) -import Body (srs, printSetting) --thisSI +import Drasil.HGHC.Body (srs, printSetting) --thisSI -- thisCode :: CodeSpec -- thisCode = codeSpec thisSI choices [] diff --git a/code/drasil-example/Drasil/NoPCM/Main.hs b/code/drasil-example/Drasil/NoPCM/Main.hs index 8f2b2e29b9..1e813366ad 100644 --- a/code/drasil-example/Drasil/NoPCM/Main.hs +++ b/code/drasil-example/Drasil/NoPCM/Main.hs @@ -1,4 +1,4 @@ -module Main (main) where +module Drasil.NoPCM.Main (main) where import GHC.IO.Encoding diff --git a/code/drasil-example/Drasil/Projectile/Main.hs b/code/drasil-example/Drasil/Projectile/Main.hs index acc17c6ea3..0f5b838672 100644 --- a/code/drasil-example/Drasil/Projectile/Main.hs +++ b/code/drasil-example/Drasil/Projectile/Main.hs @@ -1,6 +1,6 @@ {-# LANGUAGE TupleSections #-} -module Main (main) where +module Drasil.Projectile.Main (main) where import GHC.IO.Encoding diff --git a/code/drasil-example/Drasil/SSP/Main.hs b/code/drasil-example/Drasil/SSP/Main.hs index 174e44835c..89a4054b48 100644 --- a/code/drasil-example/Drasil/SSP/Main.hs +++ b/code/drasil-example/Drasil/SSP/Main.hs @@ -1,4 +1,4 @@ -module Main (main) where +module Drasil.SSP.Main (main) where import GHC.IO.Encoding diff --git a/code/drasil-example/Drasil/SWHS/Main.hs b/code/drasil-example/Drasil/SWHS/Main.hs index 25c8f0eefb..174523f148 100644 --- a/code/drasil-example/Drasil/SWHS/Main.hs +++ b/code/drasil-example/Drasil/SWHS/Main.hs @@ -1,4 +1,4 @@ -module Main where +module Drasil.SWHS.Main where import GHC.IO.Encoding diff --git a/code/drasil-example/Drasil/Template/Main.hs b/code/drasil-example/Drasil/Template/Main.hs index fcd4ad2253..b13f6d464d 100644 --- a/code/drasil-example/Drasil/Template/Main.hs +++ b/code/drasil-example/Drasil/Template/Main.hs @@ -1,4 +1,4 @@ -module Main (main) where +module Drasil.Template.Main (main) where import GHC.IO.Encoding diff --git a/code/drasil-example/drasil-example.cabal b/code/drasil-example/drasil-example.cabal index d165570470..0687748c45 100644 --- a/code/drasil-example/drasil-example.cabal +++ b/code/drasil-example/drasil-example.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: d6fb82f6ffb1eb897c05508b77ed8bc7a1d7db92c35509e828ccf8cb6845369a +-- hash: e325ece332473f323ce919f25bfbe66d6510971002bbcb8836dbf03402d0a303 name: drasil-example version: 0.1.24.0 @@ -21,30 +21,106 @@ source-repository head type: git location: https://github.com/JacquesCarette/Drasil +executable dblpendulum + main-is: Drasil/DblPendulum/Main.hs + other-modules: + Drasil.DblPendulum.Body + Drasil.DblPendulum.Figures + Drasil.DblPendulum.Concepts + Drasil.DblPendulum.Assumptions + Drasil.DblPendulum.Goals + Drasil.DblPendulum.DataDefs + Drasil.DblPendulum.Unitals + Drasil.DblPendulum.TMods + Drasil.Projectile.References + Drasil.DblPendulum.GenDefs + Drasil.DblPendulum.References + Drasil.DblPendulum.IMods + Drasil.DblPendulum.Requirements + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints -threaded -O2 -main-is Drasil.DblPendulum.Main + build-depends: + base >=4.7 && <5 + , containers >=0.5.5.1 + , directory >=1.2.6.2 + , drasil-code + , drasil-data + , drasil-database + , drasil-docLang + , drasil-gen + , drasil-gool + , drasil-lang + , drasil-printers + , drasil-theory + , drasil-utils + , lens >=4.12 + , mtl >=2.2.1 + , pretty >=1.1.1.1 + , split >=0.2.3.1 + default-language: Haskell2010 + +executable gamephysics + main-is: Drasil/GamePhysics/Main.hs + other-modules: + Drasil.GamePhysics.Assumptions + Drasil.GamePhysics.Body + Drasil.GamePhysics.Changes + Drasil.GamePhysics.Concepts + Drasil.GamePhysics.DataDefs + Drasil.GamePhysics.GenDefs + Drasil.GamePhysics.Goals + Drasil.GamePhysics.TMods + Drasil.GamePhysics.Unitals + Drasil.GamePhysics.IMods + Drasil.GamePhysics.References + Drasil.GamePhysics.Requirements + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints -threaded -O2 -main-is Drasil.GamePhysics.Main + build-depends: + base >=4.7 && <5 + , containers >=0.5.5.1 + , directory >=1.2.6.2 + , drasil-code + , drasil-data + , drasil-database + , drasil-docLang + , drasil-gen + , drasil-gool + , drasil-lang + , drasil-printers + , drasil-theory + , drasil-utils + , lens >=4.12 + , mtl >=2.2.1 + , pretty >=1.1.1.1 + , split >=0.2.3.1 + default-language: Haskell2010 + executable glassbr - main-is: Main.hs + main-is: Drasil/GlassBR/Main.hs other-modules: - Assumptions - Body - Changes - Concepts - DataDefs - Figures - Goals - IMods - ModuleDefs - References - Requirements - Symbols - TMods - Unitals - Units - Paths_drasil_example + Drasil.GlassBR.Assumptions + Drasil.GlassBR.Body + Drasil.GlassBR.Changes + Drasil.GlassBR.Concepts + Drasil.GlassBR.DataDefs + Drasil.GlassBR.Figures + Drasil.GlassBR.Goals + Drasil.GlassBR.ModuleDefs + Drasil.GlassBR.IMods + Drasil.GlassBR.References + Drasil.GlassBR.Requirements + Drasil.GlassBR.Symbols + Drasil.GlassBR.TMods + Drasil.GlassBR.Unitals + Drasil.GlassBR.Units hs-source-dirs: - Drasil/GlassBR/ - ghc-options: -Wall -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N -O2 -Wall -Wredundant-constraints + ./ + ghc-options: -Wall -Wredundant-constraints -threaded -O2 -main-is Drasil.GlassBR.Main build-depends: - base >=4.7 + base >=4.7 && <5 , containers >=0.5.5.1 , directory >=1.2.6.2 , drasil-code @@ -52,6 +128,7 @@ executable glassbr , drasil-database , drasil-docLang , drasil-gen + , drasil-gool , drasil-lang , drasil-printers , drasil-theory @@ -63,16 +140,209 @@ executable glassbr default-language: Haskell2010 executable hghc - main-is: Main.hs + main-is: Drasil/HGHC/Main.hs + other-modules: + Drasil.HGHC.HeatTransfer + Drasil.HGHC.Body + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints -threaded -O2 -main-is Drasil.HGHC.Main + build-depends: + base >=4.7 && <5 + , containers >=0.5.5.1 + , directory >=1.2.6.2 + , drasil-code + , drasil-data + , drasil-database + , drasil-docLang + , drasil-gen + , drasil-gool + , drasil-lang + , drasil-printers + , drasil-theory + , drasil-utils + , lens >=4.12 + , mtl >=2.2.1 + , pretty >=1.1.1.1 + , split >=0.2.3.1 + default-language: Haskell2010 + +executable nopcm + main-is: Drasil/NoPCM/Main.hs + other-modules: + Drasil.NoPCM.Assumptions + Drasil.NoPCM.Body + Drasil.NoPCM.Changes + Drasil.NoPCM.Unitals + Drasil.NoPCM.DataDefs + Drasil.NoPCM.Definitions + Drasil.NoPCM.IMods + Drasil.NoPCM.GenDefs + Drasil.NoPCM.Goals + Drasil.NoPCM.Requirements + Drasil.NoPCM.References + Drasil.SWHS.Assumptions + Drasil.SWHS.Body + Drasil.SWHS.Changes + Drasil.SWHS.Concepts + Drasil.SWHS.DataDefs + Drasil.SWHS.GenDefs + Drasil.SWHS.Goals + Drasil.SWHS.Changes + Drasil.SWHS.References + Drasil.SWHS.Requirements + Drasil.SWHS.TMods + Drasil.SWHS.IMods + Drasil.SWHS.Unitals + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints -threaded -O2 -main-is Drasil.NoPCM.Main + build-depends: + base >=4.7 && <5 + , containers >=0.5.5.1 + , directory >=1.2.6.2 + , drasil-code + , drasil-data + , drasil-database + , drasil-docLang + , drasil-gen + , drasil-gool + , drasil-lang + , drasil-printers + , drasil-theory + , drasil-utils + , lens >=4.12 + , mtl >=2.2.1 + , pretty >=1.1.1.1 + , split >=0.2.3.1 + default-language: Haskell2010 + +executable projectile + main-is: Drasil/Projectile/Main.hs + other-modules: + Drasil.Projectile.Assumptions + Drasil.Projectile.Body + Drasil.Projectile.Concepts + Drasil.Projectile.DataDefs + Drasil.Projectile.Figures + Drasil.Projectile.GenDefs + Drasil.Projectile.Goals + Drasil.Projectile.IMods + Drasil.Projectile.References + Drasil.Projectile.Requirements + Drasil.Projectile.TMods + Drasil.Projectile.Unitals + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints -threaded -O2 -main-is Drasil.Projectile.Main + build-depends: + base >=4.7 && <5 + , containers >=0.5.5.1 + , directory >=1.2.6.2 + , drasil-code + , drasil-data + , drasil-database + , drasil-docLang + , drasil-gen + , drasil-gool + , drasil-lang + , drasil-printers + , drasil-theory + , drasil-utils + , lens >=4.12 + , mtl >=2.2.1 + , pretty >=1.1.1.1 + , split >=0.2.3.1 + default-language: Haskell2010 + +executable ssp + main-is: Drasil/SSP/Main.hs + other-modules: + Drasil.SSP.Assumptions + Drasil.SSP.BasicExprs + Drasil.SSP.Body + Drasil.SSP.Changes + Drasil.SSP.DataDefs + Drasil.SSP.Defs + Drasil.SSP.Figures + Drasil.SSP.GenDefs + Drasil.SSP.Goals + Drasil.SSP.IMods + Drasil.SSP.References + Drasil.SSP.Requirements + Drasil.SSP.TMods + Drasil.SSP.Unitals + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints -threaded -O2 -main-is Drasil.SSP.Main + build-depends: + base >=4.7 && <5 + , containers >=0.5.5.1 + , directory >=1.2.6.2 + , drasil-code + , drasil-data + , drasil-database + , drasil-docLang + , drasil-gen + , drasil-gool + , drasil-lang + , drasil-printers + , drasil-theory + , drasil-utils + , lens >=4.12 + , mtl >=2.2.1 + , pretty >=1.1.1.1 + , split >=0.2.3.1 + default-language: Haskell2010 + +executable swhs + main-is: Drasil/SWHS/Main.hs + other-modules: + Drasil.SWHS.Assumptions + Drasil.SWHS.Body + Drasil.SWHS.Changes + Drasil.SWHS.Concepts + Drasil.SWHS.DataDefs + Drasil.SWHS.GenDefs + Drasil.SWHS.Generate + Drasil.SWHS.Goals + Drasil.SWHS.IMods + Drasil.SWHS.References + Drasil.SWHS.Requirements + Drasil.SWHS.TMods + Drasil.SWHS.Unitals + hs-source-dirs: + ./ + ghc-options: -Wall -Wredundant-constraints -threaded -O2 -main-is Drasil.SWHS.Main + build-depends: + base >=4.7 && <5 + , containers >=0.5.5.1 + , directory >=1.2.6.2 + , drasil-code + , drasil-data + , drasil-database + , drasil-docLang + , drasil-gen + , drasil-gool + , drasil-lang + , drasil-printers + , drasil-theory + , drasil-utils + , lens >=4.12 + , mtl >=2.2.1 + , pretty >=1.1.1.1 + , split >=0.2.3.1 + default-language: Haskell2010 + +executable template + main-is: Drasil/Template/Main.hs other-modules: - Body - HeatTransfer - Paths_drasil_example + Drasil.Template.Body hs-source-dirs: - Drasil/HGHC/ - ghc-options: -Wall -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N -O2 -Wall -Wredundant-constraints + ./ + ghc-options: -Wall -Wredundant-constraints -threaded -O2 -main-is Drasil.Template.Main build-depends: - base >=4.7 + base >=4.7 && <5 , containers >=0.5.5.1 , directory >=1.2.6.2 , drasil-code @@ -80,6 +350,7 @@ executable hghc , drasil-database , drasil-docLang , drasil-gen + , drasil-gool , drasil-lang , drasil-printers , drasil-theory diff --git a/code/drasil-example/package.yaml b/code/drasil-example/package.yaml index 235ade9fa9..3232140e78 100644 --- a/code/drasil-example/package.yaml +++ b/code/drasil-example/package.yaml @@ -19,7 +19,6 @@ description: Please see the README on GitHub at = 4.7 && < 5 -- base >= 4.7 - lens >= 4.12 - containers >= 0.5.5.1 - pretty >= 1.1.1.1 @@ -32,6 +31,7 @@ dependencies: - drasil-database - drasil-printers - drasil-gen +- drasil-gool - drasil-docLang - drasil-theory - drasil-utils @@ -39,26 +39,157 @@ dependencies: ghc-options: - -Wall - -Wredundant-constraints +- -threaded +- -O2 executables: - hghc: - main: Main.hs - source-dirs: Drasil/HGHC/ - ghc-options: - - -threaded - - -rtsopts - - -with-rtsopts=-N - - -O2 - - -Wall - - -Wredundant-constraints + dblpendulum: + main: Drasil.DblPendulum.Main + source-dirs: ./ + other-modules: + - Drasil.DblPendulum.Body + - Drasil.DblPendulum.Figures + - Drasil.DblPendulum.Concepts + - Drasil.DblPendulum.Assumptions + - Drasil.DblPendulum.Goals + - Drasil.DblPendulum.DataDefs + - Drasil.DblPendulum.Unitals + - Drasil.DblPendulum.TMods + - Drasil.Projectile.References + - Drasil.DblPendulum.GenDefs + - Drasil.DblPendulum.References + - Drasil.DblPendulum.IMods + - Drasil.DblPendulum.Requirements + + gamephysics: + main: Drasil.GamePhysics.Main + source-dirs: ./ + other-modules: + - Drasil.GamePhysics.Assumptions + - Drasil.GamePhysics.Body + - Drasil.GamePhysics.Changes + - Drasil.GamePhysics.Concepts + - Drasil.GamePhysics.DataDefs + - Drasil.GamePhysics.GenDefs + - Drasil.GamePhysics.Goals + - Drasil.GamePhysics.TMods + - Drasil.GamePhysics.Unitals + - Drasil.GamePhysics.IMods + - Drasil.GamePhysics.References + - Drasil.GamePhysics.Requirements glassbr: - main: Main.hs - source-dirs: Drasil/GlassBR/ - ghc-options: - - -threaded - - -rtsopts - - -with-rtsopts=-N - - -O2 - - -Wall - - -Wredundant-constraints + main: Drasil.GlassBR.Main + source-dirs: ./ + other-modules: + - Drasil.GlassBR.Assumptions + - Drasil.GlassBR.Body + - Drasil.GlassBR.Changes + - Drasil.GlassBR.Concepts + - Drasil.GlassBR.DataDefs + - Drasil.GlassBR.Figures + - Drasil.GlassBR.Goals + - Drasil.GlassBR.ModuleDefs + - Drasil.GlassBR.IMods + - Drasil.GlassBR.References + - Drasil.GlassBR.Requirements + - Drasil.GlassBR.Symbols + - Drasil.GlassBR.TMods + - Drasil.GlassBR.Unitals + - Drasil.GlassBR.Units + + hghc: + main: Drasil.HGHC.Main + source-dirs: ./ + other-modules: + - Drasil.HGHC.HeatTransfer + - Drasil.HGHC.Body + + nopcm: + main: Drasil.NoPCM.Main + source-dirs: ./ + other-modules: + - Drasil.NoPCM.Assumptions + - Drasil.NoPCM.Body + - Drasil.NoPCM.Changes + - Drasil.NoPCM.Unitals + - Drasil.NoPCM.DataDefs + - Drasil.NoPCM.Definitions + - Drasil.NoPCM.IMods + - Drasil.NoPCM.GenDefs + - Drasil.NoPCM.Goals + - Drasil.NoPCM.Requirements + - Drasil.NoPCM.References + - Drasil.SWHS.Assumptions + - Drasil.SWHS.Body + - Drasil.SWHS.Changes + - Drasil.SWHS.Concepts + - Drasil.SWHS.DataDefs + - Drasil.SWHS.GenDefs + - Drasil.SWHS.Goals + - Drasil.SWHS.Changes + - Drasil.SWHS.References + - Drasil.SWHS.Requirements + - Drasil.SWHS.TMods + - Drasil.SWHS.IMods + - Drasil.SWHS.Unitals + + projectile: + main: Drasil.Projectile.Main + source-dirs: ./ + other-modules: + - Drasil.Projectile.Assumptions + - Drasil.Projectile.Body + - Drasil.Projectile.Concepts + - Drasil.Projectile.DataDefs + - Drasil.Projectile.Figures + - Drasil.Projectile.GenDefs + - Drasil.Projectile.Goals + - Drasil.Projectile.IMods + - Drasil.Projectile.References + - Drasil.Projectile.Requirements + - Drasil.Projectile.TMods + - Drasil.Projectile.Unitals + + ssp: + main: Drasil.SSP.Main + source-dirs: ./ + other-modules: + - Drasil.SSP.Assumptions + - Drasil.SSP.BasicExprs + - Drasil.SSP.Body + - Drasil.SSP.Changes + - Drasil.SSP.DataDefs + - Drasil.SSP.Defs + - Drasil.SSP.Figures + - Drasil.SSP.GenDefs + - Drasil.SSP.Goals + - Drasil.SSP.IMods + - Drasil.SSP.References + - Drasil.SSP.Requirements + - Drasil.SSP.TMods + - Drasil.SSP.Unitals + + swhs: + main: Drasil.SWHS.Main + source-dirs: ./ + other-modules: + - Drasil.SWHS.Assumptions + - Drasil.SWHS.Body + - Drasil.SWHS.Changes + - Drasil.SWHS.Concepts + - Drasil.SWHS.DataDefs + - Drasil.SWHS.GenDefs + - Drasil.SWHS.Generate + - Drasil.SWHS.Goals + - Drasil.SWHS.IMods + - Drasil.SWHS.References + - Drasil.SWHS.Requirements + - Drasil.SWHS.TMods + - Drasil.SWHS.Unitals + + template: + main: Drasil.Template.Main + source-dirs: ./ + other-modules: + - Drasil.Template.Body From efe47fc65143d20b35e1eb3015f4e4fddca89ea6 Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Sun, 24 Jan 2021 12:26:57 -0500 Subject: [PATCH 05/13] 2292 : WIP : haddock tables out of scope error --- code/drasil-lang/Language/Drasil/URI/AST.hs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/drasil-lang/Language/Drasil/URI/AST.hs b/code/drasil-lang/Language/Drasil/URI/AST.hs index 7953b82299..1a5d059c6c 100644 --- a/code/drasil-lang/Language/Drasil/URI/AST.hs +++ b/code/drasil-lang/Language/Drasil/URI/AST.hs @@ -17,10 +17,10 @@ data Authority = Full Username Password Host Port type Path = String -- ^ Type the full path excluding the first / type Query = [String] -- ^ Make sure [] doesn't print a "?" - ---Separate elements with "&" -type Fragment = String ---Make sure "" becomes "" not "#" when printing -type Username = String ---Again make sure "" doesn't print anything -type Password = String ---Don't print anything if "" or if Username="" -type Host = String -- | Type the host address (ex. "www.github.com") -data Port = P Int -- | Take an integer port number if applicable - | NA -- | Do nothing if port is not applicable + -- Separate elements with "&" +type Fragment = String -- Make sure "" becomes "" not "#" when printing +type Username = String -- Again make sure "" doesn't print anything +type Password = String -- Don't print anything if "" or if Username="" +type Host = String -- Type the host address (ex. "www.github.com") +data Port = P Int -- Take an integer port number if applicable + | NA -- Do nothing if port is not applicable From a62d419bba795011f713d0078aed816085983877 Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Mon, 25 Jan 2021 09:39:21 -0500 Subject: [PATCH 06/13] 2292 : WIP : Stack LTS 17.0 was released --- code/drasil-build/stack.yaml | 2 +- code/drasil-code/stack.yaml | 2 +- code/drasil-data/stack.yaml | 2 +- code/drasil-database/stack.yaml | 2 +- code/drasil-docLang/stack.yaml | 2 +- code/drasil-example/stack.yaml | 2 +- code/drasil-gen/stack.yaml | 2 +- code/drasil-gool/stack.yaml | 2 +- code/drasil-lang/stack.yaml | 2 +- code/drasil-printers/stack.yaml | 2 +- code/drasil-theory/stack.yaml | 2 +- code/drasil-utils/stack.yaml | 2 +- code/stack.yaml | 3 ++- 13 files changed, 14 insertions(+), 13 deletions(-) diff --git a/code/drasil-build/stack.yaml b/code/drasil-build/stack.yaml index 025e49c55c..026067c165 100644 --- a/code/drasil-build/stack.yaml +++ b/code/drasil-build/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-code/stack.yaml b/code/drasil-code/stack.yaml index e3c3b27fcb..374f1f2308 100644 --- a/code/drasil-code/stack.yaml +++ b/code/drasil-code/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-data/stack.yaml b/code/drasil-data/stack.yaml index 6afd8e09ec..2c134897bd 100644 --- a/code/drasil-data/stack.yaml +++ b/code/drasil-data/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-database/stack.yaml b/code/drasil-database/stack.yaml index 6dbf006c38..a4d606edbd 100644 --- a/code/drasil-database/stack.yaml +++ b/code/drasil-database/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-docLang/stack.yaml b/code/drasil-docLang/stack.yaml index 1715fb3769..aa8542faef 100644 --- a/code/drasil-docLang/stack.yaml +++ b/code/drasil-docLang/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-example/stack.yaml b/code/drasil-example/stack.yaml index 5f555017c1..d93feb9b0f 100644 --- a/code/drasil-example/stack.yaml +++ b/code/drasil-example/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-gen/stack.yaml b/code/drasil-gen/stack.yaml index bb760bf025..6d969fac84 100644 --- a/code/drasil-gen/stack.yaml +++ b/code/drasil-gen/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-gool/stack.yaml b/code/drasil-gool/stack.yaml index 1496dab7a6..6ff1d04beb 100644 --- a/code/drasil-gool/stack.yaml +++ b/code/drasil-gool/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-lang/stack.yaml b/code/drasil-lang/stack.yaml index 620e39f51f..d90d19baf4 100644 --- a/code/drasil-lang/stack.yaml +++ b/code/drasil-lang/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-printers/stack.yaml b/code/drasil-printers/stack.yaml index b188271297..61e1d37774 100644 --- a/code/drasil-printers/stack.yaml +++ b/code/drasil-printers/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-theory/stack.yaml b/code/drasil-theory/stack.yaml index 111756ef82..8ee5fa120f 100644 --- a/code/drasil-theory/stack.yaml +++ b/code/drasil-theory/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-utils/stack.yaml b/code/drasil-utils/stack.yaml index 5cf8245201..165a4059ad 100644 --- a/code/drasil-utils/stack.yaml +++ b/code/drasil-utils/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/stack.yaml b/code/stack.yaml index 176c0f3f5e..afd3d08048 100644 --- a/code/stack.yaml +++ b/code/stack.yaml @@ -15,7 +15,8 @@ # resolver: # name: custom-snapshot # location: "./custom-snapshot.yaml" -resolver: lts-14.27 +resolver: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml # User packages to be built. # Various formats can be used as shown in the example below. From 80811c0d8abcad4de95fa906a03dc26712e5684b Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Mon, 25 Jan 2021 11:19:48 -0500 Subject: [PATCH 07/13] 2292 : WIP : Revert a62d419bba795011f713d0078aed816085983877 --- code/drasil-build/stack.yaml | 2 +- code/drasil-code/stack.yaml | 2 +- code/drasil-data/stack.yaml | 2 +- code/drasil-database/stack.yaml | 2 +- code/drasil-docLang/stack.yaml | 2 +- code/drasil-example/stack.yaml | 2 +- code/drasil-gen/stack.yaml | 2 +- code/drasil-gool/stack.yaml | 2 +- code/drasil-lang/stack.yaml | 2 +- code/drasil-printers/stack.yaml | 2 +- code/drasil-theory/stack.yaml | 2 +- code/drasil-utils/stack.yaml | 2 +- code/stack.yaml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/drasil-build/stack.yaml b/code/drasil-build/stack.yaml index 026067c165..025e49c55c 100644 --- a/code/drasil-build/stack.yaml +++ b/code/drasil-build/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-code/stack.yaml b/code/drasil-code/stack.yaml index 374f1f2308..e3c3b27fcb 100644 --- a/code/drasil-code/stack.yaml +++ b/code/drasil-code/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-data/stack.yaml b/code/drasil-data/stack.yaml index 2c134897bd..6afd8e09ec 100644 --- a/code/drasil-data/stack.yaml +++ b/code/drasil-data/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-database/stack.yaml b/code/drasil-database/stack.yaml index a4d606edbd..6dbf006c38 100644 --- a/code/drasil-database/stack.yaml +++ b/code/drasil-database/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-docLang/stack.yaml b/code/drasil-docLang/stack.yaml index aa8542faef..1715fb3769 100644 --- a/code/drasil-docLang/stack.yaml +++ b/code/drasil-docLang/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-example/stack.yaml b/code/drasil-example/stack.yaml index d93feb9b0f..5f555017c1 100644 --- a/code/drasil-example/stack.yaml +++ b/code/drasil-example/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-gen/stack.yaml b/code/drasil-gen/stack.yaml index 6d969fac84..bb760bf025 100644 --- a/code/drasil-gen/stack.yaml +++ b/code/drasil-gen/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-gool/stack.yaml b/code/drasil-gool/stack.yaml index 6ff1d04beb..1496dab7a6 100644 --- a/code/drasil-gool/stack.yaml +++ b/code/drasil-gool/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-lang/stack.yaml b/code/drasil-lang/stack.yaml index d90d19baf4..620e39f51f 100644 --- a/code/drasil-lang/stack.yaml +++ b/code/drasil-lang/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-printers/stack.yaml b/code/drasil-printers/stack.yaml index 61e1d37774..b188271297 100644 --- a/code/drasil-printers/stack.yaml +++ b/code/drasil-printers/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-theory/stack.yaml b/code/drasil-theory/stack.yaml index 8ee5fa120f..111756ef82 100644 --- a/code/drasil-theory/stack.yaml +++ b/code/drasil-theory/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/drasil-utils/stack.yaml b/code/drasil-utils/stack.yaml index 165a4059ad..5cf8245201 100644 --- a/code/drasil-utils/stack.yaml +++ b/code/drasil-utils/stack.yaml @@ -18,7 +18,7 @@ # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/code/stack.yaml b/code/stack.yaml index afd3d08048..8d4d693b34 100644 --- a/code/stack.yaml +++ b/code/stack.yaml @@ -16,7 +16,7 @@ # name: custom-snapshot # location: "./custom-snapshot.yaml" resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/0.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml # User packages to be built. # Various formats can be used as shown in the example below. From f18c68a256687cfbee16929911eff1cf45351a61 Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Mon, 25 Jan 2021 11:30:42 -0500 Subject: [PATCH 08/13] 2292 : WIP : Remove autogenerated comments in package.yaml files --- code/drasil-build/package.yaml | 9 +-------- code/drasil-code/package.yaml | 9 +-------- code/drasil-data/package.yaml | 9 +-------- code/drasil-database/package.yaml | 9 +-------- code/drasil-docLang/package.yaml | 9 +-------- code/drasil-example/package.yaml | 9 +-------- code/drasil-gen/package.yaml | 9 +-------- code/drasil-gool/package.yaml | 9 +-------- code/drasil-lang/package.yaml | 9 +-------- code/drasil-printers/package.yaml | 9 +-------- code/drasil-theory/package.yaml | 9 +-------- code/drasil-utils/package.yaml | 9 +-------- 12 files changed, 12 insertions(+), 96 deletions(-) diff --git a/code/drasil-build/package.yaml b/code/drasil-build/package.yaml index decccc68d7..c79e089688 100644 --- a/code/drasil-build/package.yaml +++ b/code/drasil-build/package.yaml @@ -6,17 +6,10 @@ maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Build System SubPackage github: JacquesCarette/Drasil homepage: https://jacquescarette.github.io/Drasil/ +description: Please see the README on GitHub at extra-source-files: [] -# Metadata used when publishing your package -# category: Web - -# To avoid duplicated efforts in documentation and dealing with the -# complications of embedding Haddock markup inside cabal files, it is -# common to point users to the README.md file. -description: Please see the README on GitHub at - dependencies: - base >= 4.7 && < 5 - pretty >= 1.1.1.1 diff --git a/code/drasil-code/package.yaml b/code/drasil-code/package.yaml index 9d51a13539..72ee3d4166 100644 --- a/code/drasil-code/package.yaml +++ b/code/drasil-code/package.yaml @@ -6,17 +6,10 @@ maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Code SubPackage github: JacquesCarette/Drasil homepage: https://jacquescarette.github.io/Drasil/ +description: Please see the README on GitHub at extra-source-files: [] -# Metadata used when publishing your package -# category: Web - -# To avoid duplicated efforts in documentation and dealing with the -# complications of embedding Haddock markup inside cabal files, it is -# common to point users to the README.md file. -description: Please see the README on GitHub at - dependencies: - base >= 4.7 && < 5 - lens >= 4.12 diff --git a/code/drasil-data/package.yaml b/code/drasil-data/package.yaml index 106d9212e2..9ce72901c5 100644 --- a/code/drasil-data/package.yaml +++ b/code/drasil-data/package.yaml @@ -6,17 +6,10 @@ maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Data System SubPackage github: JacquesCarette/Drasil homepage: https://jacquescarette.github.io/Drasil/ +description: Please see the README on GitHub at extra-source-files: [] -# Metadata used when publishing your package -# category: Web - -# To avoid duplicated efforts in documentation and dealing with the -# complications of embedding Haddock markup inside cabal files, it is -# common to point users to the README.md file. -description: Please see the README on GitHub at - dependencies: - base >= 4.7 && < 5 - lens >= 4.12 diff --git a/code/drasil-database/package.yaml b/code/drasil-database/package.yaml index 147cf0ef1e..2409f7151a 100644 --- a/code/drasil-database/package.yaml +++ b/code/drasil-database/package.yaml @@ -6,17 +6,10 @@ maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Database SubPackage github: JacquesCarette/Drasil homepage: https://jacquescarette.github.io/Drasil/ +description: Please see the README on GitHub at extra-source-files: [] -# Metadata used when publishing your package -# category: Web - -# To avoid duplicated efforts in documentation and dealing with the -# complications of embedding Haddock markup inside cabal files, it is -# common to point users to the README.md file. -description: Please see the README on GitHub at - dependencies: - base >= 4.7 && < 5 - lens >= 4.12 diff --git a/code/drasil-docLang/package.yaml b/code/drasil-docLang/package.yaml index 3ad511de6a..a043ce203c 100644 --- a/code/drasil-docLang/package.yaml +++ b/code/drasil-docLang/package.yaml @@ -6,17 +6,10 @@ maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Document Language SubPackage github: JacquesCarette/Drasil homepage: https://jacquescarette.github.io/Drasil/ +description: Please see the README on GitHub at extra-source-files: [] -# Metadata used when publishing your package -# category: Web - -# To avoid duplicated efforts in documentation and dealing with the -# complications of embedding Haddock markup inside cabal files, it is -# common to point users to the README.md file. -description: Please see the README on GitHub at - dependencies: - base >= 4.7 && < 5 - lens >= 4.12 diff --git a/code/drasil-example/package.yaml b/code/drasil-example/package.yaml index 3232140e78..4e14e94641 100644 --- a/code/drasil-example/package.yaml +++ b/code/drasil-example/package.yaml @@ -6,17 +6,10 @@ maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Example SubPackage github: JacquesCarette/Drasil homepage: https://jacquescarette.github.io/Drasil/ +description: Please see the README on GitHub at extra-source-files: [] -# Metadata used when publishing your package -# category: Web - -# To avoid duplicated efforts in documentation and dealing with the -# complications of embedding Haddock markup inside cabal files, it is -# common to point users to the README.md file. -description: Please see the README on GitHub at - dependencies: - base >= 4.7 && < 5 - lens >= 4.12 diff --git a/code/drasil-gen/package.yaml b/code/drasil-gen/package.yaml index 82ccfd737d..88a14cb7ff 100644 --- a/code/drasil-gen/package.yaml +++ b/code/drasil-gen/package.yaml @@ -6,17 +6,10 @@ maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Utils SubPackage github: JacquesCarette/Drasil homepage: https://jacquescarette.github.io/Drasil/ +description: Please see the README on GitHub at extra-source-files: [] -# Metadata used when publishing your package -# category: Web - -# To avoid duplicated efforts in documentation and dealing with the -# complications of embedding Haddock markup inside cabal files, it is -# common to point users to the README.md file. -description: Please see the README on GitHub at - dependencies: - base >= 4.7 && < 5 - lens >= 4.12 diff --git a/code/drasil-gool/package.yaml b/code/drasil-gool/package.yaml index 3746101bbf..b89ce0de5e 100644 --- a/code/drasil-gool/package.yaml +++ b/code/drasil-gool/package.yaml @@ -6,17 +6,10 @@ maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - GOOL SubPackage github: JacquesCarette/Drasil homepage: https://jacquescarette.github.io/Drasil/ +description: Please see the README on GitHub at extra-source-files: [] -# Metadata used when publishing your package -# category: Web - -# To avoid duplicated efforts in documentation and dealing with the -# complications of embedding Haddock markup inside cabal files, it is -# common to point users to the README.md file. -description: Please see the README on GitHub at - dependencies: - base >= 4.7 && < 5 - lens >= 4.12 diff --git a/code/drasil-lang/package.yaml b/code/drasil-lang/package.yaml index 2824ae64b3..5b830b97a5 100644 --- a/code/drasil-lang/package.yaml +++ b/code/drasil-lang/package.yaml @@ -6,17 +6,10 @@ maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Language SubPackage github: JacquesCarette/Drasil homepage: https://jacquescarette.github.io/Drasil/ +description: Please see the README on GitHub at extra-source-files: [] -# Metadata used when publishing your package -# category: Web - -# To avoid duplicated efforts in documentation and dealing with the -# complications of embedding Haddock markup inside cabal files, it is -# common to point users to the README.md file. -description: Please see the README on GitHub at - dependencies: - base >= 4.7 && < 5 - lens >= 4.12 diff --git a/code/drasil-printers/package.yaml b/code/drasil-printers/package.yaml index 091f51105d..3f685fc946 100644 --- a/code/drasil-printers/package.yaml +++ b/code/drasil-printers/package.yaml @@ -6,17 +6,10 @@ maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Printers SubPackage github: JacquesCarette/Drasil homepage: https://jacquescarette.github.io/Drasil/ +description: Please see the README on GitHub at extra-source-files: [] -# Metadata used when publishing your package -# category: Web - -# To avoid duplicated efforts in documentation and dealing with the -# complications of embedding Haddock markup inside cabal files, it is -# common to point users to the README.md file. -description: Please see the README on GitHub at - dependencies: - base >= 4.7 && < 5 - lens >= 4.12 diff --git a/code/drasil-theory/package.yaml b/code/drasil-theory/package.yaml index 33dfb55cc9..3b8b4d2173 100644 --- a/code/drasil-theory/package.yaml +++ b/code/drasil-theory/package.yaml @@ -6,17 +6,10 @@ maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Theory SubPackage github: JacquesCarette/Drasil homepage: https://jacquescarette.github.io/Drasil/ +description: Please see the README on GitHub at extra-source-files: [] -# Metadata used when publishing your package -# category: Web - -# To avoid duplicated efforts in documentation and dealing with the -# complications of embedding Haddock markup inside cabal files, it is -# common to point users to the README.md file. -description: Please see the README on GitHub at - dependencies: - base >= 4.7 && < 5 - lens >= 4.12 diff --git a/code/drasil-utils/package.yaml b/code/drasil-utils/package.yaml index 08428dbd67..2d289faaf6 100644 --- a/code/drasil-utils/package.yaml +++ b/code/drasil-utils/package.yaml @@ -6,17 +6,10 @@ maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Utils SubPackage github: JacquesCarette/Drasil homepage: https://jacquescarette.github.io/Drasil/ +description: Please see the README on GitHub at extra-source-files: [] -# Metadata used when publishing your package -# category: Web - -# To avoid duplicated efforts in documentation and dealing with the -# complications of embedding Haddock markup inside cabal files, it is -# common to point users to the README.md file. -description: Please see the README on GitHub at - dependencies: - base >= 4.7 && < 5 - lens >= 4.12 From 3df3f8a9ff850ef4070bbe590f5fcdbe35a752fb Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Mon, 25 Jan 2021 11:38:22 -0500 Subject: [PATCH 09/13] 2292 : WIP : Remove .bak files --- code/drasil-build/drasil-build.cabal.bak | 29 -- code/drasil-code/drasil-code.cabal.bak | 160 --------- code/drasil-code/drasil-code.cabal.newbak | 184 ---------- code/drasil-data/drasil-data.cabal.bak | 59 --- .../drasil-database/drasil-database.cabal.bak | 35 -- code/drasil-docLang/drasil-docLang.cabal.bak | 60 ---- code/drasil-example/drasil-example.cabal.bak | 336 ------------------ code/drasil-gen/drasil-gen.cabal.bak | 35 -- code/drasil-gool/drasil-gool.cabal.bak | 51 --- code/drasil-lang/drasil-lang.cabal.bak | 85 ----- .../drasil-printers/drasil-printers.cabal.bak | 55 --- code/drasil-theory/drasil-theory.cabal.bak | 36 -- code/drasil-utils/drasil-utils.cabal.bak | 41 --- 13 files changed, 1166 deletions(-) delete mode 100644 code/drasil-build/drasil-build.cabal.bak delete mode 100644 code/drasil-code/drasil-code.cabal.bak delete mode 100644 code/drasil-code/drasil-code.cabal.newbak delete mode 100644 code/drasil-data/drasil-data.cabal.bak delete mode 100644 code/drasil-database/drasil-database.cabal.bak delete mode 100644 code/drasil-docLang/drasil-docLang.cabal.bak delete mode 100644 code/drasil-example/drasil-example.cabal.bak delete mode 100644 code/drasil-gen/drasil-gen.cabal.bak delete mode 100644 code/drasil-gool/drasil-gool.cabal.bak delete mode 100644 code/drasil-lang/drasil-lang.cabal.bak delete mode 100644 code/drasil-printers/drasil-printers.cabal.bak delete mode 100644 code/drasil-theory/drasil-theory.cabal.bak delete mode 100644 code/drasil-utils/drasil-utils.cabal.bak diff --git a/code/drasil-build/drasil-build.cabal.bak b/code/drasil-build/drasil-build.cabal.bak deleted file mode 100644 index 6fd0a3eaa2..0000000000 --- a/code/drasil-build/drasil-build.cabal.bak +++ /dev/null @@ -1,29 +0,0 @@ -Name: drasil-build -Version: 0.1.1 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith -build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Build System SubPackage - -library - exposed-modules: - Build.Drasil - other-modules: - Build.Drasil.Make.AST, - Build.Drasil.Make.Helpers, - Build.Drasil.Make.Import, - Build.Drasil.Make.MakeString, - Build.Drasil.Make.Print - - Build-Depends: - base >= 4.7, - pretty >= 1.1.1.1, - drasil-lang >= 0.1.52 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: build diff --git a/code/drasil-code/drasil-code.cabal.bak b/code/drasil-code/drasil-code.cabal.bak deleted file mode 100644 index d04eb84a16..0000000000 --- a/code/drasil-code/drasil-code.cabal.bak +++ /dev/null @@ -1,160 +0,0 @@ -Name: drasil-code -Version: 0.1.9 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith -build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Code SubPackage - -library - exposed-modules: - Language.Drasil.Code - other-modules: - Language.Drasil.Chunk.Code - , Language.Drasil.Chunk.CodeDefinition - , Language.Drasil.Chunk.Parameter - , Language.Drasil.Code.Code - , Language.Drasil.Code.CodeQuantityDicts - , Language.Drasil.Code.DataDesc - , Language.Drasil.Code.ExternalLibrary - , Language.Drasil.Code.ExternalLibraryCall - , Language.Drasil.Code.ExtLibImport - , Language.Drasil.Code.Lang - , Language.Drasil.Code.Imperative.Build.AST - , Language.Drasil.Code.Imperative.Build.Import - , Language.Drasil.Code.Imperative.ConceptMatch - , Language.Drasil.Code.Imperative.SpaceMatch - , Language.Drasil.Code.Imperative.Doxygen.Import - , Language.Drasil.Code.Imperative.ReadInput - , Language.Drasil.Code.Imperative.WriteInput - , Language.Drasil.Code.Imperative.WriteReadMe - , Language.Drasil.Code.Imperative.GOOL.Data - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.LanguagePolymorphic - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.JavaRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.PythonRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CSharpRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CppRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.SwiftRenderer - , Language.Drasil.Code.Imperative.GOOL.ClassInterface - , Language.Drasil.Code.Imperative.Comments - , Language.Drasil.Code.Imperative.Descriptions - , Language.Drasil.Code.Imperative.FunctionCalls - , Language.Drasil.Code.Imperative.GenerateGOOL - , Language.Drasil.Code.Imperative.Generator - , Language.Drasil.Code.Imperative.GenODE - , Language.Drasil.Code.Imperative.Helpers - , Language.Drasil.Code.Imperative.Import - , Language.Drasil.Code.Imperative.Logging - , Language.Drasil.Code.Imperative.Modules - , Language.Drasil.Code.Imperative.Parameters - , Language.Drasil.Code.Imperative.DrasilState - , Language.Drasil.Code.CodeGeneration - , Language.Drasil.Data.ODEInfo - , Language.Drasil.Data.ODELibPckg - , Language.Drasil.Choices - , Language.Drasil.CodeExpr - , Language.Drasil.CodeSpec - , Language.Drasil.Mod - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - filepath >= 1.4.1, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - drasil-lang >= 0.1.52, - drasil-utils >= 0.1.1, - drasil-build >= 0.1.1, - drasil-theory >= 0.1.0, - drasil-database >= 0.1.0, - drasil-printers >= 0.1.10, - drasil-gool >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -executable codegenTest - hs-source-dirs: . - main-is: Test/Main.hs - other-modules: - Test.HelloWorld - , Test.FileTests - , Test.PatternTest - , Test.Observer - , Test.Helper - , Language.Drasil.Code - , Language.Drasil.Chunk.Code - , Language.Drasil.Chunk.CodeDefinition - , Language.Drasil.Chunk.Parameter - , Language.Drasil.Code.Code - , Language.Drasil.Code.CodeQuantityDicts - , Language.Drasil.Code.DataDesc - , Language.Drasil.Code.ExternalLibrary - , Language.Drasil.Code.ExternalLibraryCall - , Language.Drasil.Code.ExtLibImport - , Language.Drasil.Code.Lang - , Language.Drasil.Code.Imperative.Build.AST - , Language.Drasil.Code.Imperative.Build.Import - , Language.Drasil.Code.Imperative.ConceptMatch - , Language.Drasil.Code.Imperative.SpaceMatch - , Language.Drasil.Code.Imperative.Doxygen.Import - , Language.Drasil.Code.Imperative.ReadInput - , Language.Drasil.Code.Imperative.WriteInput - , Language.Drasil.Code.Imperative.WriteReadMe - , Language.Drasil.Code.Imperative.GOOL.Data - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.LanguagePolymorphic - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.JavaRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.PythonRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CSharpRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CppRenderer - , Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.SwiftRenderer - , Language.Drasil.Code.Imperative.GOOL.ClassInterface - , Language.Drasil.Code.Imperative.Comments - , Language.Drasil.Code.Imperative.Descriptions - , Language.Drasil.Code.Imperative.FunctionCalls - , Language.Drasil.Code.Imperative.GenerateGOOL - , Language.Drasil.Code.Imperative.Generator - , Language.Drasil.Code.Imperative.GenODE - , Language.Drasil.Code.Imperative.Helpers - , Language.Drasil.Code.Imperative.Import - , Language.Drasil.Code.Imperative.Logging - , Language.Drasil.Code.Imperative.Modules - , Language.Drasil.Code.Imperative.Parameters - , Language.Drasil.Code.Imperative.DrasilState - , Language.Drasil.Code.CodeGeneration - , Language.Drasil.Data.ODEInfo - , Language.Drasil.Data.ODELibPckg - , Language.Drasil.Choices - , Language.Drasil.CodeExpr - , Language.Drasil.CodeSpec - , Language.Drasil.Mod - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - filepath >= 1.4.1, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - drasil-lang >= 0.1.52, - drasil-utils >= 0.1.1, - drasil-build >= 0.1.1, - drasil-theory >= 0.1.0, - drasil-database >= 0.1.0, - drasil-printers >= 0.1.10, - drasil-gool >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -O2 -Wredundant-constraints -main-is Test.Main - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-code/drasil-code.cabal.newbak b/code/drasil-code/drasil-code.cabal.newbak deleted file mode 100644 index ac38a3a35b..0000000000 --- a/code/drasil-code/drasil-code.cabal.newbak +++ /dev/null @@ -1,184 +0,0 @@ -cabal-version: 1.12 - --- This file has been generated from package.yaml by hpack version 0.33.0. --- --- see: https://github.com/sol/hpack --- --- hash: b6618c3d3c5fa45e4ccec9bb470180364427a953ef1cdf14b3277b4a1ff19a40 - -name: drasil-code -version: 0.1.9.0 -synopsis: A framework for code and document generation for scientific software - Code SubPackage -description: Please see the README on GitHub at -homepage: https://jacquescarette.github.io/Drasil/ -bug-reports: https://github.com/JacquesCarette/Drasil/issues -author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith -maintainer: Jacques Carette -license: BSD3 -build-type: Simple - -source-repository head - type: git - location: https://github.com/JacquesCarette/Drasil - -library - exposed-modules: - Language.Drasil.Code - other-modules: - Language.Drasil.Choices - Language.Drasil.Chunk.Code - Language.Drasil.Chunk.CodeDefinition - Language.Drasil.Chunk.Parameter - Language.Drasil.Code.AST - Language.Drasil.Code.Code - Language.Drasil.Code.CodeGeneration - Language.Drasil.Code.CodeQuantityDicts - Language.Drasil.Code.DataDesc - Language.Drasil.Code.ExternalLibrary - Language.Drasil.Code.ExternalLibraryCall - Language.Drasil.Code.ExtLibImport - Language.Drasil.Code.Imperative.Build.AST - Language.Drasil.Code.Imperative.Build.Import - Language.Drasil.Code.Imperative.Comments - Language.Drasil.Code.Imperative.ConceptMatch - Language.Drasil.Code.Imperative.Descriptions - Language.Drasil.Code.Imperative.Doxygen.Import - Language.Drasil.Code.Imperative.DrasilState - Language.Drasil.Code.Imperative.FunctionCalls - Language.Drasil.Code.Imperative.GenerateGOOL - Language.Drasil.Code.Imperative.Generator - Language.Drasil.Code.Imperative.GenODE - Language.Drasil.Code.Imperative.GOOL.ClassInterface - Language.Drasil.Code.Imperative.GOOL.Data - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CppRenderer - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CSharpRenderer - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.JavaRenderer - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.LanguagePolymorphic - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.PythonRenderer - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.SwiftRenderer - Language.Drasil.Code.Imperative.Helpers - Language.Drasil.Code.Imperative.Import - Language.Drasil.Code.Imperative.Logging - Language.Drasil.Code.Imperative.Modules - Language.Drasil.Code.Imperative.Parameters - Language.Drasil.Code.Imperative.ReadInput - Language.Drasil.Code.Imperative.SpaceMatch - Language.Drasil.Code.Imperative.WriteInput - Language.Drasil.Code.Imperative.WriteReadMe - Language.Drasil.Code.Lang - Language.Drasil.CodeExpr - Language.Drasil.CodeSpec - Language.Drasil.Data.ODEInfo - Language.Drasil.Data.ODELibPckg - Language.Drasil.Mod - Test.FileTests - Test.HelloWorld - Test.Helper - Test.Main - Test.Observer - Test.PatternTest - Paths_drasil_code - hs-source-dirs: - ./ - ghc-options: -Wall -Wredundant-constraints - build-depends: - MissingH >=1.4.0.1 - , base >=4.7 && <5 - , containers >=0.5.5.1 - , directory >=1.2.6.2 - , drasil-build - , drasil-database - , drasil-gool - , drasil-lang - , drasil-printers - , drasil-theory - , drasil-utils - , filepath >=1.4.1 - , lens >=4.12 - , mtl >=2.2.1 - , parsec >=3.1.9 - , pretty >=1.1.1.1 - , split >=0.2.3.1 - default-language: Haskell2010 - -executable codegenTest - main-is: Test/Main.hs - other-modules: - Language.Drasil.Choices - Language.Drasil.Chunk.Code - Language.Drasil.Chunk.CodeDefinition - Language.Drasil.Chunk.Parameter - Language.Drasil.Code - Language.Drasil.Code.AST - Language.Drasil.Code.Code - Language.Drasil.Code.CodeGeneration - Language.Drasil.Code.CodeQuantityDicts - Language.Drasil.Code.DataDesc - Language.Drasil.Code.ExternalLibrary - Language.Drasil.Code.ExternalLibraryCall - Language.Drasil.Code.ExtLibImport - Language.Drasil.Code.Imperative.Build.AST - Language.Drasil.Code.Imperative.Build.Import - Language.Drasil.Code.Imperative.Comments - Language.Drasil.Code.Imperative.ConceptMatch - Language.Drasil.Code.Imperative.Descriptions - Language.Drasil.Code.Imperative.Doxygen.Import - Language.Drasil.Code.Imperative.DrasilState - Language.Drasil.Code.Imperative.FunctionCalls - Language.Drasil.Code.Imperative.GenerateGOOL - Language.Drasil.Code.Imperative.Generator - Language.Drasil.Code.Imperative.GenODE - Language.Drasil.Code.Imperative.GOOL.ClassInterface - Language.Drasil.Code.Imperative.GOOL.Data - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CppRenderer - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.CSharpRenderer - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.JavaRenderer - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.LanguagePolymorphic - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.PythonRenderer - Language.Drasil.Code.Imperative.GOOL.LanguageRenderer.SwiftRenderer - Language.Drasil.Code.Imperative.Helpers - Language.Drasil.Code.Imperative.Import - Language.Drasil.Code.Imperative.Logging - Language.Drasil.Code.Imperative.Modules - Language.Drasil.Code.Imperative.Parameters - Language.Drasil.Code.Imperative.ReadInput - Language.Drasil.Code.Imperative.SpaceMatch - Language.Drasil.Code.Imperative.WriteInput - Language.Drasil.Code.Imperative.WriteReadMe - Language.Drasil.Code.Lang - Language.Drasil.CodeExpr - Language.Drasil.CodeSpec - Language.Drasil.Data.ODEInfo - Language.Drasil.Data.ODELibPckg - Language.Drasil.Mod - Test.FileTests - Test.HelloWorld - Test.Helper - Test.Observer - Test.PatternTest - Paths_drasil_code - hs-source-dirs: - ./ - ghc-options: -Wall -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N -O2 -Wall -Wredundant-constraints -main-is Test.Main - build-depends: - MissingH >=1.4.0.1 - , base >=4.7 && <5 - , containers >=0.5.5.1 - , directory >=1.2.6.2 - , drasil-build - , drasil-code - , drasil-database - , drasil-gool - , drasil-lang - , drasil-printers - , drasil-theory - , drasil-utils - , filepath >=1.4.1 - , lens >=4.12 - , mtl >=2.2.1 - , parsec >=3.1.9 - , pretty >=1.1.1.1 - , split >=0.2.3.1 - default-language: Haskell2010 diff --git a/code/drasil-data/drasil-data.cabal.bak b/code/drasil-data/drasil-data.cabal.bak deleted file mode 100644 index 9f29faa554..0000000000 --- a/code/drasil-data/drasil-data.cabal.bak +++ /dev/null @@ -1,59 +0,0 @@ -Name: drasil-data -Version: 0.1.13 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith -build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Data SubPackage - -library - exposed-modules: - Data.Drasil.People - Data.Drasil.Citations - Data.Drasil.Constraints - Data.Drasil.SI_Units - Data.Drasil.Concepts.Computation - Data.Drasil.Concepts.Documentation - Data.Drasil.Concepts.Thermodynamics - Data.Drasil.Concepts.PhysicalProperties - Data.Drasil.Concepts.Education - Data.Drasil.Concepts.Physics - Data.Drasil.Concepts.Software - Data.Drasil.Concepts.Math - Data.Drasil.Concepts.SolidMechanics - Data.Drasil.ExternalLibraries.ODELibraries - Data.Drasil.Software.Products - Data.Drasil.Quantities.Thermodynamics - Data.Drasil.Quantities.PhysicalProperties - Data.Drasil.Quantities.Physics - Data.Drasil.Quantities.Math - Data.Drasil.Quantities.SolidMechanics - Data.Drasil.Units.Thermodynamics - Data.Drasil.Units.PhysicalProperties - Data.Drasil.Units.Physics - Data.Drasil.Units.SolidMechanics - Data.Drasil.Theories.Physics - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - data-fix (>= 0.0.4 && <= 1.0), - Decimal >= 0.5.1, - drasil-code >= 0.1.9, - drasil-gool >= 0.1.1, - drasil-lang >= 0.1.56, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-database/drasil-database.cabal.bak b/code/drasil-database/drasil-database.cabal.bak deleted file mode 100644 index 018fa61f1f..0000000000 --- a/code/drasil-database/drasil-database.cabal.bak +++ /dev/null @@ -1,35 +0,0 @@ -Name: drasil-database -Version: 0.1.1 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith -build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Database SubPackage - -library - exposed-modules: - Database.Drasil - other-modules: - Database.Drasil.ChunkDB - , Database.Drasil.ChunkDB.GetChunk - , Database.Drasil.SystemInformation - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - data-fix (>= 0.0.4 && <= 1.0), - drasil-lang >= 0.1.60, - drasil-theory >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: database diff --git a/code/drasil-docLang/drasil-docLang.cabal.bak b/code/drasil-docLang/drasil-docLang.cabal.bak deleted file mode 100644 index 6d2fec443c..0000000000 --- a/code/drasil-docLang/drasil-docLang.cabal.bak +++ /dev/null @@ -1,60 +0,0 @@ -Name: drasil-docLang -Version: 0.1.26 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith -build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Document Language SubPackage - -library - exposed-modules: - Drasil.DocLang - , Drasil.DocLang.SRS - , Drasil.DocumentLanguage.Units - other-modules: - Drasil.DocDecl - , Drasil.DocumentLanguage - , Drasil.ExtractDocDesc - , Drasil.TraceTable - , Drasil.DocumentLanguage.Core - , Drasil.DocumentLanguage.Definitions - , Drasil.DocumentLanguage.RefHelpers - , Drasil.DocumentLanguage.TraceabilityMatrix - , Drasil.DocumentLanguage.Labels - , Drasil.Sections.AuxiliaryConstants - , Drasil.Sections.GeneralSystDesc - , Drasil.Sections.Introduction - , Drasil.Sections.ReferenceMaterial - , Drasil.Sections.Requirements - , Drasil.Sections.SpecificSystemDescription - , Drasil.Sections.Stakeholders - , Drasil.Sections.TableOfAbbAndAcronyms - , Drasil.Sections.TableOfSymbols - , Drasil.Sections.TableOfUnits - , Drasil.Sections.TraceabilityMandGs - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - transformers >= 0.4.2.0, - multiplate >= 0.0.2, - data-fix (>= 0.0.4 && <= 1.0), - drasil-lang >= 0.1.59, - drasil-data >= 0.1.13, - drasil-database >= 0.1.1, - drasil-printers >= 0.1.8, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-example/drasil-example.cabal.bak b/code/drasil-example/drasil-example.cabal.bak deleted file mode 100644 index 4a702e0cea..0000000000 --- a/code/drasil-example/drasil-example.cabal.bak +++ /dev/null @@ -1,336 +0,0 @@ -Name: drasil-example -Version: 0.1.24 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith -build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Example SubPackage - -executable hghc - hs-source-dirs: . - main-is: Drasil/HGHC/Main.hs - other-modules: - Drasil.HGHC.Body - , Drasil.HGHC.HeatTransfer - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - drasil-lang >= 0.1.58, - drasil-data >= 0.1.13, - drasil-code >= 0.1.9, - drasil-database >= 0.1.0, - drasil-printers >= 0.1.8, - drasil-gen >= 0.1.3, - drasil-docLang >= 0.1.26, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -O2 -Wredundant-constraints - -executable glassbr - hs-source-dirs: . - main-is: Drasil/GlassBR/Main.hs - other-modules: - Drasil.GlassBR.Assumptions - , Drasil.GlassBR.Body - , Drasil.GlassBR.Changes - , Drasil.GlassBR.Concepts - , Drasil.GlassBR.DataDefs - , Drasil.GlassBR.Figures - , Drasil.GlassBR.Goals - , Drasil.GlassBR.ModuleDefs - , Drasil.GlassBR.IMods - , Drasil.GlassBR.References - , Drasil.GlassBR.Requirements - , Drasil.GlassBR.Symbols - , Drasil.GlassBR.TMods - , Drasil.GlassBR.Unitals - , Drasil.GlassBR.Units - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - drasil-lang >= 0.1.58, - drasil-data >= 0.1.13, - drasil-code >= 0.1.9, - drasil-database >= 0.1.1, - drasil-printers >= 0.1.8, - drasil-gen >= 0.1.3, - drasil-docLang >= 0.1.26, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -executable nopcm - hs-source-dirs: . - main-is: Drasil/NoPCM/Main.hs - other-modules: - Drasil.NoPCM.Assumptions - , Drasil.NoPCM.Body - , Drasil.NoPCM.Changes - , Drasil.NoPCM.Unitals - , Drasil.NoPCM.DataDefs - , Drasil.NoPCM.Definitions - , Drasil.NoPCM.IMods - , Drasil.NoPCM.GenDefs - , Drasil.NoPCM.Goals - , Drasil.NoPCM.Requirements - , Drasil.NoPCM.References - , Drasil.SWHS.Assumptions - , Drasil.SWHS.Body - , Drasil.SWHS.Changes - , Drasil.SWHS.Concepts - , Drasil.SWHS.DataDefs - , Drasil.SWHS.GenDefs - , Drasil.SWHS.Goals - , Drasil.SWHS.Changes - , Drasil.SWHS.References - , Drasil.SWHS.Requirements - , Drasil.SWHS.TMods - , Drasil.SWHS.IMods - , Drasil.SWHS.Unitals - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - drasil-lang >= 0.1.58, - drasil-data >= 0.1.13, - drasil-code >= 0.1.9, - drasil-database >= 0.1.1, - drasil-printers >= 0.1.8, - drasil-gen >= 0.1.3, - drasil-docLang >= 0.1.26, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -executable swhs - hs-source-dirs: . - main-is: Drasil/SWHS/Main.hs - other-modules: - Drasil.SWHS.Assumptions - , Drasil.SWHS.Body - , Drasil.SWHS.Changes - , Drasil.SWHS.Concepts - , Drasil.SWHS.DataDefs - , Drasil.SWHS.GenDefs - , Drasil.SWHS.Generate - , Drasil.SWHS.Goals - , Drasil.SWHS.IMods - , Drasil.SWHS.References - , Drasil.SWHS.Requirements - , Drasil.SWHS.TMods - , Drasil.SWHS.Unitals - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - drasil-lang >= 0.1.58, - drasil-data >= 0.1.13, - drasil-code >= 0.1.9, - drasil-database >= 0.1.1, - drasil-printers >= 0.1.8, - drasil-gen >= 0.1.3, - drasil-docLang >= 0.1.26, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -executable ssp - hs-source-dirs: . - main-is: Drasil/SSP/Main.hs - other-modules: - Drasil.SSP.Assumptions - , Drasil.SSP.BasicExprs - , Drasil.SSP.Body - , Drasil.SSP.Changes - , Drasil.SSP.DataDefs - , Drasil.SSP.Defs - , Drasil.SSP.Figures - , Drasil.SSP.GenDefs - , Drasil.SSP.Goals - , Drasil.SSP.IMods - , Drasil.SSP.References - , Drasil.SSP.Requirements - , Drasil.SSP.TMods - , Drasil.SSP.Unitals - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - drasil-lang >= 0.1.58, - drasil-data >= 0.1.13, - drasil-code >= 0.1.9, - drasil-database >= 0.1.1, - drasil-printers >= 0.1.8, - drasil-gen >= 0.1.3, - drasil-docLang >= 0.1.26, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -executable gamephysics - hs-source-dirs: . - main-is: Drasil/GamePhysics/Main.hs - other-modules: - Drasil.GamePhysics.Assumptions - , Drasil.GamePhysics.Body - , Drasil.GamePhysics.Changes - , Drasil.GamePhysics.Concepts - , Drasil.GamePhysics.DataDefs - , Drasil.GamePhysics.GenDefs - , Drasil.GamePhysics.Goals - , Drasil.GamePhysics.TMods - , Drasil.GamePhysics.Unitals - , Drasil.GamePhysics.IMods - , Drasil.GamePhysics.References - , Drasil.GamePhysics.Requirements - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - drasil-lang >= 0.1.58, - drasil-data >= 0.1.13, - drasil-code >= 0.1.9, - drasil-database >= 0.1.1, - drasil-printers >= 0.1.8, - drasil-gen >= 0.1.3, - drasil-docLang >= 0.1.26, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -executable projectile - hs-source-dirs: . - main-is: Drasil/Projectile/Main.hs - other-modules: - Drasil.Projectile.Assumptions - , Drasil.Projectile.Body - , Drasil.Projectile.Concepts - , Drasil.Projectile.DataDefs - , Drasil.Projectile.Figures - , Drasil.Projectile.GenDefs - , Drasil.Projectile.Goals - , Drasil.Projectile.IMods - , Drasil.Projectile.References - , Drasil.Projectile.Requirements - , Drasil.Projectile.TMods - , Drasil.Projectile.Unitals - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - drasil-lang >= 0.1.58, - drasil-data >= 0.1.13, - drasil-gool >= 0.1.1, - drasil-code >= 0.1.9, - drasil-database >= 0.1.1, - drasil-printers >= 0.1.8, - drasil-gen >= 0.1.3, - drasil-docLang >= 0.1.26, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -executable template - hs-source-dirs: . - main-is: Drasil/Template/Main.hs - other-modules: - Drasil.Template.Body - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - drasil-lang >= 0.1.58, - drasil-data >= 0.1.13, - drasil-code >= 0.1.9, - drasil-database >= 0.1.1, - drasil-printers >= 0.1.8, - drasil-gen >= 0.1.3, - drasil-docLang >= 0.1.26, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -executable dblpendulum - hs-source-dirs: . - main-is: Drasil/DblPendulum/Main.hs - other-modules: - Drasil.DblPendulum.Body - , Drasil.DblPendulum.Figures - , Drasil.DblPendulum.Concepts - , Drasil.DblPendulum.Assumptions - , Drasil.DblPendulum.Goals - , Drasil.DblPendulum.DataDefs - , Drasil.DblPendulum.Unitals - , Drasil.DblPendulum.TMods - , Drasil.Projectile.References - , Drasil.DblPendulum.GenDefs - , Drasil.DblPendulum.References - , Drasil.DblPendulum.IMods - , Drasil.DblPendulum.Requirements - - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - drasil-lang >= 0.1.58, - drasil-data >= 0.1.13, - drasil-code >= 0.1.9, - drasil-database >= 0.1.1, - drasil-printers >= 0.1.8, - drasil-gen >= 0.1.3, - drasil-docLang >= 0.1.26, - drasil-theory >= 0.1.0, - drasil-utils >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-gen/drasil-gen.cabal.bak b/code/drasil-gen/drasil-gen.cabal.bak deleted file mode 100644 index 811727f73e..0000000000 --- a/code/drasil-gen/drasil-gen.cabal.bak +++ /dev/null @@ -1,35 +0,0 @@ -Name: drasil-gen -Version: 0.1.3 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith -build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Generate SubPackage - -library - exposed-modules: - Language.Drasil.Generate - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - time >= 1.8.0.2, - drasil-lang >= 0.1.59, - drasil-gool >= 0.1.0, - drasil-build >= 0.1.0, - drasil-code >= 0.1.9, - drasil-printers >= 0.1.8 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-gool/drasil-gool.cabal.bak b/code/drasil-gool/drasil-gool.cabal.bak deleted file mode 100644 index 00643f3089..0000000000 --- a/code/drasil-gool/drasil-gool.cabal.bak +++ /dev/null @@ -1,51 +0,0 @@ -Name: drasil-gool -Version: 0.1.1 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith, Brooks MacLachlan -build-type: Simple -Synopsis: A framework for code and document generation for scientific software - GOOL SubPackage - -library - exposed-modules: - GOOL.Drasil - other-modules: - GOOL.Drasil.CodeType - , GOOL.Drasil.AST - , GOOL.Drasil.Classes - , GOOL.Drasil.Helpers - , GOOL.Drasil.CodeAnalysis - , GOOL.Drasil.CodeInfo - , GOOL.Drasil.LanguageRenderer.Constructors - , GOOL.Drasil.LanguageRenderer.LanguagePolymorphic - , GOOL.Drasil.LanguageRenderer.CommonPseudoOO - , GOOL.Drasil.LanguageRenderer.CLike - , GOOL.Drasil.LanguageRenderer.Macros - , GOOL.Drasil.LanguageRenderer - , GOOL.Drasil.LanguageRenderer.JavaRenderer - , GOOL.Drasil.LanguageRenderer.PythonRenderer - , GOOL.Drasil.LanguageRenderer.CSharpRenderer - , GOOL.Drasil.LanguageRenderer.CppRenderer - , GOOL.Drasil.LanguageRenderer.SwiftRenderer - , GOOL.Drasil.State - , GOOL.Drasil.ClassInterface - , GOOL.Drasil.RendererClasses - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - filepath >= 1.4.1, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - data-ordlist >= 0.4.7.0, - composition >= 1.0.2.1, - drasil-utils >= 0.1.1 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-lang/drasil-lang.cabal.bak b/code/drasil-lang/drasil-lang.cabal.bak deleted file mode 100644 index a3c637d7db..0000000000 --- a/code/drasil-lang/drasil-lang.cabal.bak +++ /dev/null @@ -1,85 +0,0 @@ -Name: drasil-lang -Version: 0.1.60 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith -build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Language SubPackage - -library - exposed-modules: - Language.Drasil - , Language.Drasil.Development - , Data.Drasil.IdeaDicts - , Language.Drasil.ShortHands - other-modules: - Language.Drasil.Chunk.Citation - , Language.Drasil.Chunk.CommonIdea - , Language.Drasil.Chunk.Concept - , Language.Drasil.Chunk.Concept.Core - , Language.Drasil.Chunk.Constrained - , Language.Drasil.Chunk.DefinedQuantity - , Language.Drasil.Chunk.Eq - , Language.Drasil.Chunk.NamedArgument - , Language.Drasil.Chunk.NamedIdea - , Language.Drasil.Chunk.Quantity - , Language.Drasil.Chunk.Relation - , Language.Drasil.Chunk.UncertainQuantity - , Language.Drasil.Chunk.Unital - , Language.Drasil.Chunk.Unitary - , Language.Drasil.Chunk.UnitaryConcept - , Language.Drasil.Chunk.UnitDefn - , Language.Drasil.Classes - , Language.Drasil.Classes.Core - , Language.Drasil.Classes.Citations - , Language.Drasil.Classes.Document - , Language.Drasil.Constraint - , Language.Drasil.Data.Citation - , Language.Drasil.Data.Date - , Language.Drasil.Document - , Language.Drasil.Document.Core - , Language.Drasil.Expr - , Language.Drasil.Expr.Extract - , Language.Drasil.Expr.Math - , Language.Drasil.Expr.Precedence - , Language.Drasil.Label.Type - , Language.Drasil.Misc - , Language.Drasil.NounPhrase - , Language.Drasil.NounPhrase.Core - , Language.Drasil.People - , Language.Drasil.Reference - , Language.Drasil.RefProg - , Language.Drasil.Sentence.Extract - , Language.Drasil.ShortName - , Language.Drasil.Space - , Language.Drasil.Sentence - , Language.Drasil.Stages - , Language.Drasil.Symbol - , Language.Drasil.Symbol.Helpers - , Language.Drasil.UID - , Language.Drasil.Uncertainty - , Language.Drasil.Uncertainty.Core - , Language.Drasil.Unicode - , Language.Drasil.UnitLang - , Language.Drasil.Derivation - , Language.Drasil.Development.Sentence - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - data-fix (>= 0.0.4 && <= 1.0), - unicode-names >= 3.2.0.0, - unicode-properties >= 3.2.0.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-printers/drasil-printers.cabal.bak b/code/drasil-printers/drasil-printers.cabal.bak deleted file mode 100644 index 61ae0701c4..0000000000 --- a/code/drasil-printers/drasil-printers.cabal.bak +++ /dev/null @@ -1,55 +0,0 @@ -Name: drasil-printers -Version: 0.1.10 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith -build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Printers SubPackage - -library - exposed-modules: - Language.Drasil.Printers - other-modules: - Language.Drasil.Config - , Language.Drasil.Format - , Language.Drasil.Output.Formats - , Language.Drasil.HTML.CSS - , Language.Drasil.HTML.Helpers - , Language.Drasil.HTML.Print - , Language.Drasil.HTML.Monad - , Language.Drasil.Markdown.CreateMd - , Language.Drasil.Plain.Helpers - , Language.Drasil.Plain.Print - , Language.Drasil.Printing.Helpers - , Language.Drasil.Printing.AST - , Language.Drasil.Printing.Citation - , Language.Drasil.Printing.Import - , Language.Drasil.Printing.LayoutObj - , Language.Drasil.Printing.PrintingInformation - , Language.Drasil.TeX.Helpers - , Language.Drasil.TeX.Print - , Language.Drasil.TeX.Monad - , Language.Drasil.TeX.Preamble - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - data-fix (>= 0.0.4 && <= 1.0), - drasil-lang >= 0.1.59, - drasil-utils >= 0.1.0, - drasil-build >= 0.1.1, - drasil-database >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-theory/drasil-theory.cabal.bak b/code/drasil-theory/drasil-theory.cabal.bak deleted file mode 100644 index d1cd4c2bdc..0000000000 --- a/code/drasil-theory/drasil-theory.cabal.bak +++ /dev/null @@ -1,36 +0,0 @@ -Name: drasil-theory -Version: 0.1.0 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith -build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Theory SubPackage - -library - exposed-modules: - Theory.Drasil - other-modules: - Theory.Drasil.Classes - , Theory.Drasil.DataDefinition - , Theory.Drasil.GenDefn - , Theory.Drasil.InstanceModel - , Theory.Drasil.Theory - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - data-fix (>= 0.0.4 && <= 1.0), - drasil-lang >= 0.1.60 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code diff --git a/code/drasil-utils/drasil-utils.cabal.bak b/code/drasil-utils/drasil-utils.cabal.bak deleted file mode 100644 index 8ad700c871..0000000000 --- a/code/drasil-utils/drasil-utils.cabal.bak +++ /dev/null @@ -1,41 +0,0 @@ -Name: drasil-utils -Version: 0.1.1 -Cabal-Version: >= 1.18 -Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith -build-type: Simple -Synopsis: A framework for code and document generation for scientific software - Utils SubPackage - -library - exposed-modules: - Utils.Drasil - - other-modules: - Utils.Drasil.Contents - , Utils.Drasil.Document - , Utils.Drasil.English - , Utils.Drasil.Fold - , Utils.Drasil.Misc - , Utils.Drasil.Phrase - , Utils.Drasil.Sentence - - Build-Depends: - base >= 4.7, - lens >= 4.12, - containers >= 0.5.5.1, - pretty >= 1.1.1.1, - mtl >= 2.2.1, - directory >= 1.2.6.2, - split >= 0.2.3.1, - MissingH >= 1.4.0.1, - parsec >= 3.1.9, - data-fix (>= 0.0.4 && <= 1.0), - Decimal >= 0.5.1, - drasil-lang >= 0.1.56, - drasil-theory >= 0.1.0 - default-language: Haskell2010 - ghc-options: -Wall -Wredundant-constraints - -source-repository head - type: git - location: git://github.com/JacquesCarette/Drasil.git - subdir: code From b8ce21d3602effeaaa70cea30b27a8714143e78d Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Mon, 25 Jan 2021 11:43:42 -0500 Subject: [PATCH 10/13] 2292 : WIP : Stack doesnt appear to have a -j option --- code/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/Makefile b/code/Makefile index 4eb07e860a..1033b5c9f3 100644 --- a/code/Makefile +++ b/code/Makefile @@ -105,7 +105,7 @@ override GHCTHREADS = 2 endif override GHCFLAGS += -Wall -j$(GHCTHREADS) -override stackArgs += -j3 --ghc-options="$(GHCFLAGS)" --dump-logs --interleaved-output +override stackArgs += --ghc-options="$(GHCFLAGS)" --dump-logs --interleaved-output # Output amount control NOISY=no From 51eb7cbcaa514176154c361c1a101b7a17900f4b Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Sun, 7 Feb 2021 13:11:09 -0500 Subject: [PATCH 11/13] 2292 : undo 1 change, left file out of build package.yaml, can be fixed later if need be --- code/drasil-code/Language/Drasil/Code/AST.hs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/drasil-code/Language/Drasil/Code/AST.hs b/code/drasil-code/Language/Drasil/Code/AST.hs index 64a52caa29..97b8239e74 100644 --- a/code/drasil-code/Language/Drasil/Code/AST.hs +++ b/code/drasil-code/Language/Drasil/Code/AST.hs @@ -33,10 +33,7 @@ data Visibility = Public | Private data Objective where - -- TODO: Double check that this is the correct correction -- Jason Balaci - -- Remember: Changed EqChunk to QDefinition - - Calculation :: QDefinition -> Objective + Calculation :: EqChunk -> Objective Call :: Function -> [Expr] -> Objective GetInput :: (Quantity c) => c -> Objective PrintOutput :: Output -> Objective From d9f284e03018fc45fb22a48c6aa9e7600e521409 Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Sun, 7 Feb 2021 13:22:39 -0500 Subject: [PATCH 12/13] 2292 : remove licenses from inner packages because the parent package has a license already --- code/drasil-build/drasil-build.cabal | 3 +-- code/drasil-build/package.yaml | 1 - code/drasil-code/drasil-code.cabal | 3 +-- code/drasil-code/package.yaml | 1 - code/drasil-data/drasil-data.cabal | 3 +-- code/drasil-data/package.yaml | 1 - code/drasil-database/drasil-database.cabal | 3 +-- code/drasil-database/package.yaml | 1 - code/drasil-docLang/drasil-docLang.cabal | 3 +-- code/drasil-docLang/package.yaml | 1 - code/drasil-example/drasil-example.cabal | 3 +-- code/drasil-example/package.yaml | 1 - code/drasil-gen/drasil-gen.cabal | 3 +-- code/drasil-gen/package.yaml | 1 - code/drasil-gool/drasil-gool.cabal | 3 +-- code/drasil-gool/package.yaml | 1 - code/drasil-lang/drasil-lang.cabal | 3 +-- code/drasil-lang/package.yaml | 1 - code/drasil-printers/drasil-printers.cabal | 3 +-- code/drasil-printers/package.yaml | 1 - code/drasil-theory/drasil-theory.cabal | 3 +-- code/drasil-theory/package.yaml | 1 - code/drasil-utils/drasil-utils.cabal | 3 +-- code/drasil-utils/package.yaml | 1 - 24 files changed, 12 insertions(+), 36 deletions(-) diff --git a/code/drasil-build/drasil-build.cabal b/code/drasil-build/drasil-build.cabal index a59d5f9353..5c63aae1da 100644 --- a/code/drasil-build/drasil-build.cabal +++ b/code/drasil-build/drasil-build.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 5f845373759a553ff299a5c24284b6e4331e9bd3f54d48ac1e45b043bcdd2b7b +-- hash: 7dfef9af64d6bf0ed24a5a0b033f90a0b6dab4fca27c61e41911a4dabf965c04 name: drasil-build version: 0.1.1.0 @@ -14,7 +14,6 @@ homepage: https://jacquescarette.github.io/Drasil/ bug-reports: https://github.com/JacquesCarette/Drasil/issues author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith maintainer: Jacques Carette -license: BSD3 build-type: Simple source-repository head diff --git a/code/drasil-build/package.yaml b/code/drasil-build/package.yaml index c79e089688..25782d5e18 100644 --- a/code/drasil-build/package.yaml +++ b/code/drasil-build/package.yaml @@ -1,6 +1,5 @@ name: drasil-build version: 0.1.1.0 -license: BSD3 author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Build System SubPackage diff --git a/code/drasil-code/drasil-code.cabal b/code/drasil-code/drasil-code.cabal index 23b0d0afc9..b6e969754c 100644 --- a/code/drasil-code/drasil-code.cabal +++ b/code/drasil-code/drasil-code.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 10266f7294e250c7dcd10deac1e95b00253d1c04352dd28f66e6437814d07dc1 +-- hash: 59b897ea93fe4b853352b0ed94a2d696335f24ceface63f99f8575219bafd04b name: drasil-code version: 0.1.9.0 @@ -14,7 +14,6 @@ homepage: https://jacquescarette.github.io/Drasil/ bug-reports: https://github.com/JacquesCarette/Drasil/issues author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith maintainer: Jacques Carette -license: BSD3 build-type: Simple source-repository head diff --git a/code/drasil-code/package.yaml b/code/drasil-code/package.yaml index 72ee3d4166..26b53d0252 100644 --- a/code/drasil-code/package.yaml +++ b/code/drasil-code/package.yaml @@ -1,6 +1,5 @@ name: drasil-code version: 0.1.9.0 -license: BSD3 author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Code SubPackage diff --git a/code/drasil-data/drasil-data.cabal b/code/drasil-data/drasil-data.cabal index 5473cc5ced..6056172d72 100644 --- a/code/drasil-data/drasil-data.cabal +++ b/code/drasil-data/drasil-data.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: a6d10569cbbcd36bfa4fa593ee019f5c698b1db77a390122fd2201499e4c4d9a +-- hash: fe81bcc0444025c15d6336eb98cf1d80bb868870b9e780464036b8864b472633 name: drasil-data version: 0.1.13.0 @@ -14,7 +14,6 @@ homepage: https://jacquescarette.github.io/Drasil/ bug-reports: https://github.com/JacquesCarette/Drasil/issues author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith maintainer: Jacques Carette -license: BSD3 build-type: Simple source-repository head diff --git a/code/drasil-data/package.yaml b/code/drasil-data/package.yaml index 9ce72901c5..8aed3581eb 100644 --- a/code/drasil-data/package.yaml +++ b/code/drasil-data/package.yaml @@ -1,6 +1,5 @@ name: drasil-data version: 0.1.13.0 -license: BSD3 author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Data System SubPackage diff --git a/code/drasil-database/drasil-database.cabal b/code/drasil-database/drasil-database.cabal index a135653c77..27fafbdeb0 100644 --- a/code/drasil-database/drasil-database.cabal +++ b/code/drasil-database/drasil-database.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 7e82e4bbfd3e9357b3b10c93b3a35273dc5bc6b0eed1516f3406e2fa519f6f74 +-- hash: 2b2a688c5c0e0c245e2680315bc3b6523f8e1413e98f8d495c36a327f10ecd5d name: drasil-database version: 0.1.1.0 @@ -14,7 +14,6 @@ homepage: https://jacquescarette.github.io/Drasil/ bug-reports: https://github.com/JacquesCarette/Drasil/issues author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith maintainer: Jacques Carette -license: BSD3 build-type: Simple source-repository head diff --git a/code/drasil-database/package.yaml b/code/drasil-database/package.yaml index 2409f7151a..0e791fdc4f 100644 --- a/code/drasil-database/package.yaml +++ b/code/drasil-database/package.yaml @@ -1,6 +1,5 @@ name: drasil-database version: 0.1.1.0 -license: BSD3 author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Database SubPackage diff --git a/code/drasil-docLang/drasil-docLang.cabal b/code/drasil-docLang/drasil-docLang.cabal index 46ff9bac44..aa28458cc3 100644 --- a/code/drasil-docLang/drasil-docLang.cabal +++ b/code/drasil-docLang/drasil-docLang.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 2a2a97deb4c346d6f7928b9e26155e153851775ae691be7fda6251d8a154f7f8 +-- hash: 56d4019723a645515190e903e7f8778e175be8df515b6e12aad1e270c4817a3e name: drasil-docLang version: 0.1.26.0 @@ -14,7 +14,6 @@ homepage: https://jacquescarette.github.io/Drasil/ bug-reports: https://github.com/JacquesCarette/Drasil/issues author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith maintainer: Jacques Carette -license: BSD3 build-type: Simple source-repository head diff --git a/code/drasil-docLang/package.yaml b/code/drasil-docLang/package.yaml index a043ce203c..424d68cb4c 100644 --- a/code/drasil-docLang/package.yaml +++ b/code/drasil-docLang/package.yaml @@ -1,6 +1,5 @@ name: drasil-docLang version: 0.1.26.0 -license: BSD3 author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Document Language SubPackage diff --git a/code/drasil-example/drasil-example.cabal b/code/drasil-example/drasil-example.cabal index 0687748c45..b5144dbbe2 100644 --- a/code/drasil-example/drasil-example.cabal +++ b/code/drasil-example/drasil-example.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: e325ece332473f323ce919f25bfbe66d6510971002bbcb8836dbf03402d0a303 +-- hash: 0b309f06021ba88a5f8dbe6e1ac5e159945c09c231ed024dd0d93abcd119c720 name: drasil-example version: 0.1.24.0 @@ -14,7 +14,6 @@ homepage: https://jacquescarette.github.io/Drasil/ bug-reports: https://github.com/JacquesCarette/Drasil/issues author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith maintainer: Jacques Carette -license: BSD3 build-type: Simple source-repository head diff --git a/code/drasil-example/package.yaml b/code/drasil-example/package.yaml index 4e14e94641..bb2265b4ec 100644 --- a/code/drasil-example/package.yaml +++ b/code/drasil-example/package.yaml @@ -1,6 +1,5 @@ name: drasil-example version: 0.1.24.0 -license: BSD3 author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Example SubPackage diff --git a/code/drasil-gen/drasil-gen.cabal b/code/drasil-gen/drasil-gen.cabal index f1c1b13fce..b2a37de67e 100644 --- a/code/drasil-gen/drasil-gen.cabal +++ b/code/drasil-gen/drasil-gen.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 9a1e40bf9dbbb070190c04f7eaae5ef530bcaab1801dcb5b7f25a10d687952ea +-- hash: fe3e8b7bdf2370eb55e51c5697d56bc00cfdf5b1f69baf537cef993db1b362d0 name: drasil-gen version: 0.1.3.0 @@ -14,7 +14,6 @@ homepage: https://jacquescarette.github.io/Drasil/ bug-reports: https://github.com/JacquesCarette/Drasil/issues author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith maintainer: Jacques Carette -license: BSD3 build-type: Simple source-repository head diff --git a/code/drasil-gen/package.yaml b/code/drasil-gen/package.yaml index 88a14cb7ff..778f8192c9 100644 --- a/code/drasil-gen/package.yaml +++ b/code/drasil-gen/package.yaml @@ -1,6 +1,5 @@ name: drasil-gen version: 0.1.3.0 -license: BSD3 author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Utils SubPackage diff --git a/code/drasil-gool/drasil-gool.cabal b/code/drasil-gool/drasil-gool.cabal index f5294f061a..05b3358f78 100644 --- a/code/drasil-gool/drasil-gool.cabal +++ b/code/drasil-gool/drasil-gool.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: d4a7ae9ca32d4daa390a2291caa2231b5e5574a222825f5c072e55f21a81456f +-- hash: ae8be669e69befdfc509a6677c71cc2abd0d3d0938a32035905e70249059d450 name: drasil-gool version: 0.1.1.0 @@ -14,7 +14,6 @@ homepage: https://jacquescarette.github.io/Drasil/ bug-reports: https://github.com/JacquesCarette/Drasil/issues author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith, Brooks MacLachlan maintainer: Jacques Carette -license: BSD3 build-type: Simple source-repository head diff --git a/code/drasil-gool/package.yaml b/code/drasil-gool/package.yaml index b89ce0de5e..df6e2d8f42 100644 --- a/code/drasil-gool/package.yaml +++ b/code/drasil-gool/package.yaml @@ -1,6 +1,5 @@ name: drasil-gool version: 0.1.1.0 -license: BSD3 author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith, Brooks MacLachlan" maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - GOOL SubPackage diff --git a/code/drasil-lang/drasil-lang.cabal b/code/drasil-lang/drasil-lang.cabal index dd67a55393..cfa97003bb 100644 --- a/code/drasil-lang/drasil-lang.cabal +++ b/code/drasil-lang/drasil-lang.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 8591dd00de867f264a114edd2dbe1324059d0b1a4e0b17bf855e1d106cbe7c8f +-- hash: b870349adb17ec02d593846695831694f8cbac6e43b050213269c69d9a9be61f name: drasil-lang version: 0.1.60.0 @@ -14,7 +14,6 @@ homepage: https://jacquescarette.github.io/Drasil/ bug-reports: https://github.com/JacquesCarette/Drasil/issues author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith maintainer: Jacques Carette -license: BSD3 build-type: Simple source-repository head diff --git a/code/drasil-lang/package.yaml b/code/drasil-lang/package.yaml index 5b830b97a5..af0efef323 100644 --- a/code/drasil-lang/package.yaml +++ b/code/drasil-lang/package.yaml @@ -1,6 +1,5 @@ name: drasil-lang version: 0.1.60.0 -license: BSD3 author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Language SubPackage diff --git a/code/drasil-printers/drasil-printers.cabal b/code/drasil-printers/drasil-printers.cabal index 607f43e321..1fc81cb6ef 100644 --- a/code/drasil-printers/drasil-printers.cabal +++ b/code/drasil-printers/drasil-printers.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 50c94568d0af4ca381a2b497c6b22bfcb03c5418f18e9acaaaf6900245b2b421 +-- hash: 1c55ec552fa17c6233d716907a257a0670ba17e84ce08e477f37c348237c44b1 name: drasil-printers version: 0.1.10.0 @@ -14,7 +14,6 @@ homepage: https://jacquescarette.github.io/Drasil/ bug-reports: https://github.com/JacquesCarette/Drasil/issues author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith maintainer: Jacques Carette -license: BSD3 build-type: Simple source-repository head diff --git a/code/drasil-printers/package.yaml b/code/drasil-printers/package.yaml index 3f685fc946..d9bd339c60 100644 --- a/code/drasil-printers/package.yaml +++ b/code/drasil-printers/package.yaml @@ -1,6 +1,5 @@ name: drasil-printers version: 0.1.10.0 -license: BSD3 author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Printers SubPackage diff --git a/code/drasil-theory/drasil-theory.cabal b/code/drasil-theory/drasil-theory.cabal index 0b1ff329e9..ecab5818be 100644 --- a/code/drasil-theory/drasil-theory.cabal +++ b/code/drasil-theory/drasil-theory.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: f0acc47d370c39ad9c04dfb274d7693b5187fe8056274da68391e72bec9b838b +-- hash: 152a151a850f50520e62806a612a2819e43462dc8888f09431ad02a0029c0f21 name: drasil-theory version: 0.1.0.0 @@ -14,7 +14,6 @@ homepage: https://jacquescarette.github.io/Drasil/ bug-reports: https://github.com/JacquesCarette/Drasil/issues author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith maintainer: Jacques Carette -license: BSD3 build-type: Simple source-repository head diff --git a/code/drasil-theory/package.yaml b/code/drasil-theory/package.yaml index 3b8b4d2173..3271cd5840 100644 --- a/code/drasil-theory/package.yaml +++ b/code/drasil-theory/package.yaml @@ -1,6 +1,5 @@ name: drasil-theory version: 0.1.0.0 -license: BSD3 author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Theory SubPackage diff --git a/code/drasil-utils/drasil-utils.cabal b/code/drasil-utils/drasil-utils.cabal index 8006bfd653..0440671a07 100644 --- a/code/drasil-utils/drasil-utils.cabal +++ b/code/drasil-utils/drasil-utils.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: f1f37c423fba2052457c0613f886254999e20582bf93f1ae2bd89b69faac29a7 +-- hash: e23c3428b0c45f5bff96b651fd465e180ae46b07c13c423aa6c7cf8601fe1345 name: drasil-utils version: 0.1.1.0 @@ -14,7 +14,6 @@ homepage: https://jacquescarette.github.io/Drasil/ bug-reports: https://github.com/JacquesCarette/Drasil/issues author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith maintainer: Jacques Carette -license: BSD3 build-type: Simple source-repository head diff --git a/code/drasil-utils/package.yaml b/code/drasil-utils/package.yaml index 2d289faaf6..3306741ed9 100644 --- a/code/drasil-utils/package.yaml +++ b/code/drasil-utils/package.yaml @@ -1,6 +1,5 @@ name: drasil-utils version: 0.1.1.0 -license: BSD3 author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith" maintainer: "Jacques Carette" synopsis: A framework for code and document generation for scientific software - Utils SubPackage From 2cc4541a5c207950e67ac1ecb7ddd62d9e4923a6 Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Tue, 9 Feb 2021 11:47:30 -0500 Subject: [PATCH 13/13] 2292 : remove 1 TODO note --- code/drasil-data/stack.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/code/drasil-data/stack.yaml b/code/drasil-data/stack.yaml index 6afd8e09ec..73ff808791 100644 --- a/code/drasil-data/stack.yaml +++ b/code/drasil-data/stack.yaml @@ -36,7 +36,6 @@ packages: - ../drasil-lang - ../drasil-theory - ../drasil-utils -# depends for drasil-code.... TODO: check if I can remove these packages lists for sub-dependencies! - ../drasil-build - ../drasil-database - ../drasil-printers