Merge pull request #4704 from JacquesCarette/moreImportRefine

Refine more imports related to `Language.Drasil.NounPhrase.Core`.

Author: JacquesCarette

code/drasil-lang/lib/Language/Drasil/Chunk/CommonIdea.hs

@@ -19,7 +19,7 @@ import Utils.Drasil (repUnd)
 import Language.Drasil.Chunk.NamedIdea (IdeaDict, nc)
 import Language.Drasil.Classes (NamedIdea(term), Idea(getA),
  CommonIdea(abrv), ConceptDomain(cdom))
-import Language.Drasil.NounPhrase.Core (NP)
+import Language.Drasil.NounPhrase.Types (NP)
 
 -- | The common idea (with 'NounPhrase') data type. It must have a 'UID',
 -- 'NounPhrase' for its term, an abbreviation ('String'), and a domain (['UID']).

code/drasil-lang/lib/Language/Drasil/Chunk/Concept/NamedCombinators.hs

@@ -45,7 +45,7 @@ import Language.Drasil.Classes (Idea, NamedIdea(..))
 import Language.Drasil.NounPhrase (NP, CapitalizationRule(CapWords, Replace,
   CapFirst), NounPhrase(phraseNP, pluralNP), nounPhrase'', compoundPhrase,
   compoundPhrase'', compoundPhrase''')
-import Language.Drasil.NounPhrase.Core (NPStruct(S,(:+:)))
+import Language.Drasil.NounPhrase.Types (NPStruct(S,(:+:)))
 import qualified Language.Drasil.NounPhrase as D (NounPhrase(pluralNP, phraseNP))
 import qualified Language.Drasil.NounPhrase.Combinators as NP (
   insertString, insertStringOp, insertStringGen)

code/drasil-lang/lib/Language/Drasil/Chunk/Constrained.hs

@@ -21,7 +21,7 @@ import Language.Drasil.Constraint (ConstraintE)
 import Language.Drasil.Chunk.UnitDefn (unitWrapper, MayHaveUnit(getUnit))
 import Language.Drasil.Expr.Lang (Expr(..))
 import Language.Drasil.Expr.Class (sy)
-import Language.Drasil.NounPhrase.Core (NP)
+import Language.Drasil.NounPhrase.Types (NP)
 import Language.Drasil.Sentence (Sentence(S))
 import Language.Drasil.Space (Space, HasSpace(..))
 import Language.Drasil.Stages (Stage)

code/drasil-lang/lib/Language/Drasil/Chunk/DefinedQuantity.hs

@@ -23,7 +23,7 @@ import Language.Drasil.Chunk.UnitDefn (UnitDefn, unitWrapper,
   MayHaveUnit(getUnit))
 import Language.Drasil.Space (Space, HasSpace(..))
 import Language.Drasil.Stages (Stage (Implementation, Equational))
-import Language.Drasil.NounPhrase.Core (NP)
+import Language.Drasil.NounPhrase.Types (NP)
 import Language.Drasil.Sentence (Sentence)
 
 -- | DefinedQuantityDict is the combination of a 'Concept' and a 'Quantity'.
@@ -36,7 +36,6 @@ data DefinedQuantityDict = DQD { _con :: ConceptChunk
                                , _spa :: Space
                                , _unit' :: Maybe UnitDefn
                                }
-
 makeLenses ''DefinedQuantityDict
 
 class DefinesQuantity d where

code/drasil-lang/lib/Language/Drasil/Chunk/Eq.hs

@@ -31,7 +31,7 @@ import Language.Drasil.Expr.Class (ExprC(apply, sy, ($=)))
 import Language.Drasil.Literal.Lang (Literal)
 import Language.Drasil.ModelExpr.Class (ModelExprC(defines))
 import qualified Language.Drasil.ModelExpr.Lang as M (ModelExpr(C))
-import Language.Drasil.NounPhrase.Core (NP)
+import Language.Drasil.NounPhrase.Types (NP)
 import Language.Drasil.Space (Space(..), HasSpace(..))
 import Language.Drasil.Sentence (Sentence(EmptyS))
 import Language.Drasil.Stages (Stage)

code/drasil-lang/lib/Language/Drasil/Chunk/NamedIdea.hs

@@ -12,7 +12,7 @@ module Language.Drasil.Chunk.NamedIdea (
 import Control.Lens ((^.), makeLenses, Lens')
 
 import Drasil.Database (mkUid, UID, HasUID(..), declareHasChunkRefs, Generically(..))
-import Language.Drasil.NounPhrase.Core (NP)
+import Language.Drasil.NounPhrase.Types (NP)
 
 -- TODO: Why does a NamedIdea need a UID? It might need a UID to be registered in the chunk map.
 -- | A NamedIdea is a 'term' that we've identified (has a 'UID') as

code/drasil-lang/lib/Language/Drasil/Chunk/Relation.hs

@@ -14,7 +14,7 @@ import Language.Drasil.Chunk.Concept (ConceptChunk, dccWDS)
 import Language.Drasil.Classes (Express(..),
   ConceptDomain(..), Definition(..), Idea(..), NamedIdea(..))
 import Language.Drasil.ModelExpr.Lang (ModelExpr)
-import Language.Drasil.NounPhrase.Core (NP)
+import Language.Drasil.NounPhrase.Types (NP)
 import Language.Drasil.Sentence (Sentence)
 
 -- | For a concept ('ConceptChunk') that also has a 'Relation' ('ModelExpr') attached.

code/drasil-lang/lib/Language/Drasil/Chunk/UncertainQuantity.hs

@@ -21,7 +21,7 @@ import Language.Drasil.Constraint (ConstraintE)
 import Language.Drasil.Chunk.UnitDefn (MayHaveUnit(getUnit))
 import Language.Drasil.Expr.Lang (Expr)
 import Language.Drasil.Expr.Class (sy)
-import Language.Drasil.NounPhrase.Core (NP)
+import Language.Drasil.NounPhrase.Types (NP)
 import Language.Drasil.Space (Space, HasSpace(..))
 import Language.Drasil.Uncertainty
 

code/drasil-lang/lib/Language/Drasil/Chunk/Unital.hs

@@ -18,7 +18,7 @@ import Language.Drasil.Classes (NamedIdea(term), Idea(getA), Express(express),
   Definition(defn), ConceptDomain(cdom), Concept, IsUnit, Quantity)
 import Language.Drasil.Chunk.UnitDefn (MayHaveUnit(getUnit), TempHasUnit(findUnit),  UnitDefn, unitWrapper)
 import Language.Drasil.Expr.Class (sy)
-import Language.Drasil.NounPhrase.Core (NP)
+import Language.Drasil.NounPhrase.Types (NP)
 import Language.Drasil.Space (Space(..), HasSpace(..))
 import Language.Drasil.Sentence (Sentence)
 import Language.Drasil.Stages (Stage)

code/drasil-lang/lib/Language/Drasil/NounPhrase.hs

@@ -20,7 +20,7 @@ module Language.Drasil.NounPhrase (
 
 import Data.Char (isLatin1, isLetter, toLower, toUpper)
 
-import Language.Drasil.NounPhrase.Core -- uses whole module
+import Language.Drasil.NounPhrase.Types -- uses whole module
 
 --Linguistically, nounphrase might not be the best name (yet!), but once
 -- it is fleshed out and/or we do more with it, it will likely be a good fit