Merge pull request #4 from PPKFS/refactor-again

Finish another refactor

Author: PPKFS

cabal.project

@@ -12,9 +12,15 @@ source-repository-package
   tag: 60093b23ad22302da6ff8e83863a1ee759b229d4
 packages:
   yaifl/yaifl.cabal
-  yaifl-rogue/yaifl-rogue.cabal
-  roguefunctor/roguefunctor.cabal
-  yaifl-discord/yaifl-discord.cabal
+  yaifl-core/yaifl-core.cabal
+  yaifl-objects/yaifl-objects.cabal
+  yaifl-rules/yaifl-rules.cabal
+  yaifl-actions/yaifl-actions.cabal
+  yaifl/yaifl.cabal
+  yaifl-examples/yaifl-examples.cabal
+  -- yaifl-rogue/yaifl-rogue.cabal
+  -- roguefunctor/roguefunctor.cabal
+  -- yaifl-discord/yaifl-discord.cabal
 
 -- documentation: true
 haddock-all: true

hie.yaml

@@ -2,21 +2,21 @@ module Main where
 
 import Yaifl.Prelude
 import Yaifl
-import Yaifl.Core.Action
-import Yaifl.Core.Rules.Rulebook
+import Yaifl.Action
+import Yaifl.Rulebook
 import Yaifl.Text.ResponseCollection
 import Breadcrumbs
 
-import Yaifl.Core.Effects
-import Yaifl.Text.Print
-import Yaifl.Core.Rules.Run
+import Yaifl.Effects.ObjectQuery
+import Yaifl.Effects.Print
+import Yaifl.Rule
 import Yaifl.Text.SayQQ
 import Yaifl.Std.Create.Rule
-import Yaifl.Core.Rules.RuleEffects
+import Yaifl.Effects.RuleEffects
 import Yaifl.Text.SayableValue
 import Yaifl.Gen.Plan
 import Yaifl.Gen.City.ApartmentTower
-import Yaifl.Std.Kinds.Direction
+import Yaifl.Direction.Kind
 
 data ConstructionOptions wm = ConstructionOptions
   { activityCollectionBuilder :: ActivityCollection wm -> ActivityCollector wm

yaifl-city/src/Main.hs old stuff/yaifl-city/src/Main.hsyaifl-city/src/Main.hs renamed to old stuff/yaifl-city/src/Main.hs

@@ -7,11 +7,11 @@ module Yaifl.Gen.City.Apartment
 import Yaifl.Prelude
 import Yaifl.Gen.Plan
 import Control.Placeholder
-import Yaifl.Core.WorldModel
-import Yaifl.Std.Kinds.Region
+import Yaifl.WorldModel
+import Yaifl.Region.Kind
 import Yaifl.Std.Create
-import Yaifl.Core.Entity
-import Yaifl.Core.Rules.Rulebook
+import Yaifl.Entity
+import Yaifl.Rulebook
 import Yaifl.Gen.City.Building
 
 data RoomType = LivingRoom | Kitchen | Bathroom | Bedroom | Study

…ifl-city/src/Yaifl/Gen/City/Apartment.hs …ifl-city/src/Yaifl/Gen/City/Apartment.hsyaifl-city/src/Yaifl/Gen/City/Apartment.hs renamed to old stuff/yaifl-city/src/Yaifl/Gen/City/Apartment.hs yaifl-city/src/Yaifl/Gen/City/Apartment.hs renamed to old stuff/yaifl-city/src/Yaifl/Gen/City/Apartment.hs

@@ -6,19 +6,19 @@ module Yaifl.Gen.City.ApartmentTower
   ) where
 
 import Yaifl.Prelude hiding (State, Down)
-import Yaifl.Std.Create.Object
-import Yaifl.Core.WorldModel
-import Yaifl.Std.Kinds.Direction
-import Yaifl.Std.Create.RoomConnection
+import Yaifl.Object.Create
+import Yaifl.WorldModel
+import Yaifl.Direction.Kind
+import Yaifl.Room.Connection
 import Yaifl.Gen.City.Building
 import Yaifl.Text.DynamicText
-import Yaifl.Core.Entity
-import Yaifl.Core.Rules.Rulebook
+import Yaifl.Entity
+import Yaifl.Rulebook
 import System.Random.Stateful
 import Yaifl.Text.AdaptiveNarrative
-import Yaifl.Core.Query.Object
-import Yaifl.Std.Kinds.Door
-import Yaifl.Core.Tag
+import Yaifl.Object.Query
+import Yaifl.Door.Kind
+import Yaifl.Tag
 import Data.Text (toLower)
 import Yaifl.Std.Create
 import Yaifl

…ity/src/Yaifl/Gen/City/ApartmentTower.hs …ity/src/Yaifl/Gen/City/ApartmentTower.hsyaifl-city/src/Yaifl/Gen/City/ApartmentTower.hs renamed to old stuff/yaifl-city/src/Yaifl/Gen/City/ApartmentTower.hs yaifl-city/src/Yaifl/Gen/City/ApartmentTower.hs renamed to old stuff/yaifl-city/src/Yaifl/Gen/City/ApartmentTower.hs

@@ -6,18 +6,18 @@ module Yaifl.Gen.City.Building
 ) where
 
 import Yaifl.Prelude
-import Yaifl.Core.Entity
-import Yaifl.Std.Kinds.Region
-import Yaifl.Core.WorldModel
-import Yaifl.Core.Effects
-import Yaifl.Core.Rules.Rulebook
-import Yaifl.Core.HasProperty
+import Yaifl.Entity
+import Yaifl.Region.Kind
+import Yaifl.WorldModel
+import Yaifl.Effects.ObjectQuery
+import Yaifl.Rulebook
+import Yaifl.Property.Has
 import Yaifl.Std.Create
-import Yaifl.Std.Kinds.MultiLocated
-import Yaifl.Core.Kinds.Enclosing
-import Yaifl.Std.Kinds.Door
+import Yaifl.MultiLocated.Kind
+import Yaifl.Enclosing.Kind
+import Yaifl.Door.Kind
 import Yaifl.Text.Say (WithPrintingNameOfSomething)
-import Yaifl.Std.Activities.ListingContents (WithListingContents)
+import Yaifl.Activities.ListingContents (WithListingContents)
 
 data Building wm = Building
   { name :: Text
@@ -55,7 +55,7 @@ type BuildingGeneration wm es =
   , RuleEffects wm es
   , WithPrintingNameOfSomething wm
   , WithListingContents wm
-  , NoMissingObjects wm es
+  , WithoutMissingObjects wm es
   , WMStdDirections wm
   , WMWithProperty wm MultiLocated
   , WMWithProperty wm Enclosing

yaifl-city/src/Yaifl/Gen/City/Building.hs …aifl-city/src/Yaifl/Gen/City/Building.hsyaifl-city/src/Yaifl/Gen/City/Building.hs renamed to old stuff/yaifl-city/src/Yaifl/Gen/City/Building.hs yaifl-city/src/Yaifl/Gen/City/Building.hs renamed to old stuff/yaifl-city/src/Yaifl/Gen/City/Building.hs

@@ -13,19 +13,19 @@ import Data.Char (isSpace)
 import Language.Haskell.TH
 import Language.Haskell.TH.Quote hiding (quoteExp)
 import Yaifl
-import Yaifl.Core.Rules.Run
+import Yaifl.Rule
 import Yaifl.Text.ResponseCollection
 
 import qualified Data.Text as T
 
-import Yaifl.Text.Print
+import Yaifl.Effects.Print
 import Yaifl.Text.Verb
 
-import Yaifl.Std.ObjectSpecifics
-import Yaifl.Core.Effects
+import Yaifl.ObjectSpecifics
+import Yaifl.Effects.ObjectQuery
 import Yaifl.Std.Rulebooks.ActionProcessing
-import Yaifl.Core.Rules.RuleEffects
-import Yaifl.Std.EffectHandlers
+import Yaifl.Effects.RuleEffects
+import Yaifl.Effects.Interpreters
 
 expQQ :: (String -> Q Exp) -> QuasiQuoter
 expQQ quoteExp = QuasiQuoter quoteExp notSupported notSupported notSupported where