Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Added drasil.lang.cabal * Branched drasil-code from drasil-lang and removed both from drasil * Split drasil into -example and -data and fixed information of -code * Moved cabal files to appropriate directories * Fixed parse errors * Changed drasil to drasil-code * Moved Language.Drasil.Code.Imperative.Import from drasil-code to -lang * Moved .cabal from build to code and changed file paths in drasil-data.cabal * Undid file path modification and moved files around to preserve module names * Moved /Code files and reworked /Expr/Extract and /DataDesc as per #558 * Reworked .cabal files and module name to facilitate DataDesc move in 1d75a42 as per #558 * Changed type of RefName from Sentence to String (#553) * started update of RefName type; stuck on Title as a Sentence mismatch * Added noSpaces as requested in 73d16d3 comments * added another field specifically for shortname for the section datatype (as discussed in issue #551); Example files broken * Re-added ShortName.hs (oops) * make runs fine; removed some warnings wrt redundant imports; logs no longer empty * hack closes #551 * Added RefAff to Language.Drasil to specify type signature of section' * Formatting and removing Rationale in this branch * Removed D Derivation from Attribute.hs as per issue #537 (#556) * Removed Warnings in Make (#557) * Removed redundancies and unused variables * Removed unused code and renamed shadowed bindings * Reverted changes on ufixme1 and ufixme2 * Started to remove and replace acroDD in SSP (#540) * Started to remove and replace acroDD in SSP * Reverted back to detailed import lists * Moved re-usable Expr functions into BasicExprs.hs * transferred re-usaeable Expr functions into BasicExprs.hs * Moved re-useable Expr functions into BasicExprs.hs * Added BasicExprs.hs to drasil.cabal * Re-did replacement of acroDD with less redundancy * Removed the defintion of acroDD from Data/Drasil/SentenceStructure * Updated stable to matches changes brought about the replacement of acroDD * Moved ShortName.hs to correct place after merge with master * Moved Chunk/Code * Resolved some issues with move of Chunk/Code * Fixed erroneous merge changes * Correct file path to DataDesc in import statement * Moved CodeSpec and Generate - now breaks in Drasil.hs (#558) * Removed wrong imports from Language.Drasil and 'fixed' Code.Imperative.Lang * Removed Language.Drasil.Code.Imperative.Lang * Removed Language.Drasil.Code.Imperative.Lang imports * Improved imports in SWHS/Body.hs * Change instances of String to UID to make progress towards obscuring the implementation of UID. (Comment 6, Bullet 1, Issue #562) * Change DefnAndDomain from a recursive (when used) definition to one which only stores UID. * Add lookup function for definition table. * Improved imports in SWHS/DataDefs.hs * Improved imports in SWHS/GenDefs.hs * Improved imports for Sections/Intorduction.hs * Import game phys (#601) * added specific import statements in GamePhysics/Body * alphabetized list of imports and ensured make runs * Improved imports in SSP/Requirements.hs, TMods.hs, and Unitals.hs (#600) * Alphabetized imports of Requirements.hs * Alphabetized and specified imports of TMods.hs * Alphabetized imports of Unitals.hs * Specified and alphabetized imports in Units.hs * Improved imports in Sections/AuxilaryConstants * Alphabetized both and specified GenDefs.hs * Improved imports in SPP/IMods.hs, Main.hs, and References.hs (#599) * Alphabetized and specified imports of IMods.hs * Alphabetized Main.hs * Alphabetized References.hs * Improved import Sections/GeneralSystDesc (#598) * Improved imports in SSP/DataDefs.hs and Defs.hs (#595) * Specified and alphabetized imports in DataDefs.hs and added a type definition * Alphabetized imports for Defs.hs * Improved imports in SSP/Assumptions.hs, BasicExprs.hs, and Body.hs (#594) * Alphabetize imports for Assumptions.hs * Alphabetize imports for BasicExprs.hs * Specify and alphabetize imports for Body.hs * Improved imports in SWHS/IMods.hs * Improved import statments * Improved imports in NoPCM/Unitals * Improved imports in GlassBR/Main.hs, TMods.hs, and Unitals.hs (#592) * Alphabetized imports in Main.hs * Alphabetized imports in TMods.hs * Specified and alphabetized imports in Unitals.hs * Improved imports in GlassBR/ModuleDefs.hs, References.hs, and Symbols.hs (#590) * Alphabetized ModuleDefs.hs * Alphabetized References.hs * Specified and alphabetized imports in Symbols.hs * Specified and alphabetized imports * Imporved imports in NoPCM/Body.hs * Improved imports in NoPCM/IMods.hs * Improved imports in GlassBR/Concepts.hs, DataDefs.hs, and IMods.hs (#588) * Alphabetized Concepts.hs * Alphabetized DataDefs.hs * Specified and alphabetized imports in IMods.hs * Moved UID.hs and tried to add drasil-lang to dependencies of drasil-code * Made sure drasil-lang was installed and changed 'drasil' to 'drasil-lang' in cabal * drasil-code now works! (#558) * Started work on drasil-data * Reverted some changes - code breaks in Chunk/Code.hs because it can't find imports from Language.Drasil * Changed drasil-lang.cabal to update locations of Derivation, Reference, and ShortName * Reworked Language.Drasil and Chunk.Code to fix erroneous imports * Fixed import issue in Chunk.Code * Fixed import error in Code.DataDesc * Fixed import error in CodeSpec and formatting in NounPhrase * Removed commented out imports in Code.Code and CodeSpec * Fixed import errors in Imperative.Import * Fixed imports in Generate * Added package locations to stack.yaml of drasil-data * Commented out second uid lensing in mkDataDef and mkDataDef' * Fixed makefile so drasil-data works? * Updated stack.yaml to actually find Data package * Moved Language.Drasil to drasil-lang * Moved Language.Drasil.Code to drasil-code * Moved Data.Drasil to drasil-data * Started creating drasil-dev - Breaks in Language.Drasil.Spec (needs drasil-dev?) * Implemented Language.Drasil.Development * Created Language.Drasil.Development * Finished manual merge * Moved Label.Core * Moved Label.Core * Removed import from Expr.Extract from merge * Formatting * Updated version number to 0.1.0 * Added compoundPhraseP1 and compoundNCP1 as per #558 comments; getting a variable not in scope error * Undid commenting out (cncpt ^. uid) - apparently it's needed? * Added compoundNCPlPh and compoundNCPlPl to fix Concepts/Computation * Removed old comments from SI_Units * Reverted file path change in generated code * Reverted file path change in stable * Reverting resource path for troubleshooting * Restoring resource path for troubleshooting * Moved noSpaces to Utils (#558) * Specified imports of Sentence (#558) * Specified Utils module and added Utils to cabal (#558) * Moved noSpaces from Utils to Misc * Updated lts-resolver * Added build_exam to Makefile - getting 'Unknown package: drasil-example' * Update package building, example does not compile (but does begin building!) * Added drasil-data dependency to drasil-example; started fixing issues * added filler data to modelTraceTable function to avoid type mismatch errors in TraceabilityMatrix.hs * Fixed error in SRS.hs * Hiding Vector from Language.Drasil (Ambiguous) * Fixed merge of master * Fixed Mod and Func not in scope? * Trying to import CodeSpec into HGHC/HGHC.hs * Cleaned up make a bit - shadowing and imports * Fixed codeSpec import * Added stack clean in all dirs to make clean * HGHC now compiles * SWHS now compiles * Updated Makefile as per comments on b350622 * Specified import in HGHC * Removed redundant imports * NoPCM compiles and finished SWHS * Removed redundant imports * SSP now compiles * Added drasil-code to dependencies of all examples * GamePhysics now compiles * Fixed redundant import and imports in SWHS\Generate * Fixed GlassBR ModuleDefs * Finished fixing GlassBR ModuleDefs * Fixed GlassBR Symbols * Fixed redundent import in Glass IMods * Fixed GlassBR Body * Added missing imports * Removed redundant imports * Added spaces to fix parse error - Travis CI build should pass now? * Added type definition for ddRef * Bumped version number * Removed comment that broke haddock * Improved import list in CodeSpec.hs
- Loading branch information