Fixed GlassBR inputs hack

JacquesCarette · Aug 7, 2018 · 5e2dfe0 · 5e2dfe0 · JacquesCarette · Aug 7, 2018
1 parent 9cb8887
commit 5e2dfe0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/code/drasil-example/Drasil/GlassBR/Unitals.hs b/code/drasil-example/Drasil/GlassBR/Unitals.hs
@@ -16,11 +16,7 @@ import Data.Drasil.SI_Units (kilogram, metre, millimetre, pascal, second)
 
 --FIXME: Many of the current terms can be separated into terms and defns?
 glassBRsymb :: [DefinedQuantityDict]
-glassBRsymb = map dqdWr [plate_len, plate_width, char_weight, standOffDist] ++ map dqdVc [is_safePb]
-  -- roughly speaking, we'd want to do
-  -- ++ map dqdWr [is_safeLR]
-  -- but that doesn't typecheck. Need the definition of is_safeLR to be
-  -- here rather than implicitly in TMod
+glassBRsymb = map dqdWr [plate_len, plate_width, char_weight, standOffDist]
 {--}
 
 glassBRSymbolsWithDefns :: [UnitalChunk]

diff --git a/code/drasil-lang/Language/Drasil.hs b/code/drasil-lang/Language/Drasil.hs
@@ -94,7 +94,7 @@ module Language.Drasil (
   -- Chunk.Relation
   , RelationConcept, makeRC, makeRC'
   --Chunk.DefinedQuantity
-  , dqd, dqd', dqdEL, DefinedQuantityDict, dqdWr, dqdVc
+  , dqd, dqd', dqdEL, DefinedQuantityDict, dqdWr
   -- Chunk.UnitaryConcept
   , ucw, UnitaryConceptDict
   -- Chunk.Attributes --FIXME: Changed a lot

diff --git a/code/drasil-lang/Language/Drasil/Chunk/DefinedQuantity.hs b/code/drasil-lang/Language/Drasil/Chunk/DefinedQuantity.hs
@@ -2,7 +2,7 @@
 
 module Language.Drasil.Chunk.DefinedQuantity
   ( dqd, dqd', dqdEL, DefinedQuantityDict, dqdWr
-  , dqdQd, dqdVc) where
+  , dqdQd) where
 import Control.Lens ((^.), makeLenses, view)
 
 import qualified Language.Drasil.Chunk.Quantity as Q
@@ -60,7 +60,4 @@ dqdWr :: (Q.Quantity c, Concept c, Q.HasSpace c, HasSymbol c) => c -> DefinedQua
 dqdWr c = DQD (cw c) (symbol c) (c ^. typ) (getUnit c) []
 
 dqdQd :: (Q.Quantity c, Q.HasSpace c, HasSymbol c) => c -> ConceptChunk -> DefinedQuantityDict
-dqdQd c cc = DQD cc (symbol c) (c ^. typ) (getUnit c) []
-
-dqdVc :: VarChunk -> DefinedQuantityDict
-dqdVc (VC idea sym space) = DQD (ConDict (idea) (DAD (S "") [])) (sym) (space) Nothing []
+dqdQd c cc = DQD cc (symbol c) (c ^. typ) (getUnit c) []