From 31e3941f36ac18f094037530c1a8fb8cb5c990b6 Mon Sep 17 00:00:00 2001
From: Johannes Schilling <dario@deaktualisierung.org>
Date: Sat, 2 Jan 2016 00:57:39 +0100
Subject: [PATCH] lib: move ChangeSet.hs to NetProtocol/Types.hs
this reflects the contents better, because the module actually contains
all types that are sent over the network at some point
---
myOwnPad.cabal | 2 +-
server/Server.hs | 2 +-
src/Pad/NetProtocol/Instances.hs | 2 +-
src/Pad/NetProtocol/Parse.hs | 2 +-
src/Pad/{ChangeSet.hs => NetProtocol/Types.hs} | 9 ++++++++-
tests/Pad/Tests.hs | 2 +-
6 files changed, 13 insertions(+), 6 deletions(-)
rename src/Pad/{ChangeSet.hs => NetProtocol/Types.hs} (84%)
diff --git a/myOwnPad.cabal b/myOwnPad.cabal
index 529c35e..8f462ca 100644
--- a/myOwnPad.cabal
+++ b/myOwnPad.cabal
@@ -13,8 +13,8 @@ cabal-version: >=1.10
library
hs-source-dirs: src
exposed-modules:
- Pad.ChangeSet
Pad.NetProtocol
+ Pad.NetProtocol.Types
Pad.NetProtocol.Instances
Pad.NetProtocol.Parse
Pad.PadMessage
diff --git a/server/Server.hs b/server/Server.hs
index 4b49dd7..df6dde3 100644
--- a/server/Server.hs
+++ b/server/Server.hs
@@ -21,9 +21,9 @@ import Control.Exception
import Pad.NetProtocol
+import Pad.NetProtocol.Types
import Pad.NetProtocol.Instances
import Pad.NetProtocol.Parse
-import Pad.ChangeSet
import Pad.PadMessage
diff --git a/src/Pad/NetProtocol/Instances.hs b/src/Pad/NetProtocol/Instances.hs
index 30cad0c..7ec8247 100644
--- a/src/Pad/NetProtocol/Instances.hs
+++ b/src/Pad/NetProtocol/Instances.hs
@@ -9,7 +9,7 @@ import qualified Data.ByteString as BS
import Data.Monoid
import Pad.NetProtocol
-import Pad.ChangeSet
+import Pad.NetProtocol.Types
diff --git a/src/Pad/NetProtocol/Parse.hs b/src/Pad/NetProtocol/Parse.hs
index 0e5dbd2..c1b3dad 100644
--- a/src/Pad/NetProtocol/Parse.hs
+++ b/src/Pad/NetProtocol/Parse.hs
@@ -13,7 +13,7 @@ import Data.Word
import Data.Word8 (isDigit)
import Pad.NetProtocol
-import Pad.ChangeSet
+import Pad.NetProtocol.Types
import Pad.PadMessage
import Control.Applicative ( (<*>), (<|>) )
diff --git a/src/Pad/ChangeSet.hs b/src/Pad/NetProtocol/Types.hs
similarity index 84%
rename from src/Pad/ChangeSet.hs
rename to src/Pad/NetProtocol/Types.hs
index 72d22bf..d783495 100644
--- a/src/Pad/ChangeSet.hs
+++ b/src/Pad/NetProtocol/Types.hs
@@ -1,5 +1,12 @@
{-# LANGUAGE InstanceSigs #-}
-module Pad.ChangeSet where
+module Pad.NetProtocol.Types where
+
+{-
+ - this module contains the types of messages that are sent from the
+ - client to the server to signal changes one client made to the pad's
+ - contents and everything used to build them
+ -
+ - --}
diff --git a/tests/Pad/Tests.hs b/tests/Pad/Tests.hs
index d2a9ec2..7ff4533 100644
--- a/tests/Pad/Tests.hs
+++ b/tests/Pad/Tests.hs
@@ -11,8 +11,8 @@ import qualified Data.Attoparsec.ByteString as APS
import Pad.PadMessage
-import Pad.ChangeSet
import Pad.NetProtocol
+import Pad.NetProtocol.Types
import Pad.NetProtocol.Parse
import Pad.NetProtocol.Instances
--
GitLab