From 3d78b81736f8a7fdfcf8b1dc8f6b103b79d5f6bd Mon Sep 17 00:00:00 2001
From: Steven Dee <steve@smartercode.net>
Date: Sun, 20 Oct 2013 21:57:27 -0400
Subject: [PATCH] Clean things up a bit

---
 Language/Nock5K.hs                   |  7 ++++
 {Nock5K => Language/Nock5K}/Parse.hs |  4 +--
 {Nock5K => Language/Nock5K}/Repl.hs  |  6 ++--
 {Nock5K => Language/Nock5K}/Spec.lhs |  2 +-
 hsnock.cabal                         | 51 ++++++++++++++++++++--------
 hsnock.lhs                           |  3 ++
 nock.hs                              |  3 --
 test.hs                              |  3 +-
 8 files changed, 53 insertions(+), 26 deletions(-)
 create mode 100644 Language/Nock5K.hs
 rename {Nock5K => Language/Nock5K}/Parse.hs (90%)
 rename {Nock5K => Language/Nock5K}/Repl.hs (85%)
 rename {Nock5K => Language/Nock5K}/Spec.lhs (98%)
 create mode 100755 hsnock.lhs
 delete mode 100755 nock.hs

diff --git a/Language/Nock5K.hs b/Language/Nock5K.hs
new file mode 100644
index 0000000..093dce2
--- /dev/null
+++ b/Language/Nock5K.hs
@@ -0,0 +1,7 @@
+module Language.Nock5K (
+  Noun(Atom, (:-)), nock, noun, repl
+) where
+
+import Language.Nock5K.Parse
+import Language.Nock5K.Repl
+import Language.Nock5K.Spec
diff --git a/Nock5K/Parse.hs b/Language/Nock5K/Parse.hs
similarity index 90%
rename from Nock5K/Parse.hs
rename to Language/Nock5K/Parse.hs
index be846f9..c2ff45c 100755
--- a/Nock5K/Parse.hs
+++ b/Language/Nock5K/Parse.hs
@@ -1,7 +1,7 @@
-module Nock5K.Parse (noun) where
+module Language.Nock5K.Parse where
 
 import Control.Applicative ((<$>))
-import Nock5K.Spec
+import Language.Nock5K.Spec
 import Text.ParserCombinators.Parsec
 
 instance Show Noun where
diff --git a/Nock5K/Repl.hs b/Language/Nock5K/Repl.hs
similarity index 85%
rename from Nock5K/Repl.hs
rename to Language/Nock5K/Repl.hs
index 67a6393..0df107c 100644
--- a/Nock5K/Repl.hs
+++ b/Language/Nock5K/Repl.hs
@@ -1,7 +1,7 @@
-module Nock5K.Repl (repl) where
+module Language.Nock5K.Repl where
 
-import Nock5K.Parse
-import Nock5K.Spec
+import Language.Nock5K.Parse
+import Language.Nock5K.Spec
 import qualified Control.Exception as C
 import System.Console.Readline
 import Text.ParserCombinators.Parsec
diff --git a/Nock5K/Spec.lhs b/Language/Nock5K/Spec.lhs
similarity index 98%
rename from Nock5K/Spec.lhs
rename to Language/Nock5K/Spec.lhs
index 9f8c140..b9cb20b 100644
--- a/Nock5K/Spec.lhs
+++ b/Language/Nock5K/Spec.lhs
@@ -1,5 +1,5 @@
 
-> module Nock5K.Spec (Noun (Atom, (:-)), nock) where
+> module Language.Nock5K.Spec where
 
 1 Structures
 
diff --git a/hsnock.cabal b/hsnock.cabal
index 37f7945..ef7b134 100644
--- a/hsnock.cabal
+++ b/hsnock.cabal
@@ -1,17 +1,38 @@
-name:                hsnock
-version:             0.1.0.0
-synopsis:            Nock 5K interpreter
-author:              Steven Dee
-maintainer:          mrdomino@gmail.com
-category:            Language
-build-type:          Simple
-cabal-version:       >=1.8
+name                 : hsnock
+version              : 0.1.1
+category             : Language
+license              : PublicDomain
+synopsis             : Nock 5K interpreter.
+author               : Steven Dee
+maintainer           : mrdomino@gmail.com
+homepage             : https://github.com/mrdomino/hsnock/
+
+build-type           : Simple
+cabal-version        : >=1.8
+data-files           : README
+
+source-repository      head
+  type               : git
+  location           : https://github.com/mrdomino/hsnock.git
+
+library
+  build-depends      : base >=4.5
+                     , parsec >=3.1
+                     , readline >=1.0
+  exposed-modules    : Language.Nock5K
+                     , Language.Nock5K.Parse
+                     , Language.Nock5K.Spec
+                     , Language.Nock5K.Repl
+
+executable             hsnock
+  main-is            : hsnock.lhs
+  build-depends      : base >=4.5
+                     , parsec >=3.1
+                     , readline >=1.0
 
 test-suite test
-  type:                exitcode-stdio-1.0
-  main-is:             test.hs
-  build-depends:       base >=4.5, parsec >=3.1, QuickCheck >=2.6
-
-executable hsnock
-  main-is:             nock.hs
-  build-depends:       base >=4.5, parsec >=3.1, readline >=1.0
+  type               : exitcode-stdio-1.0
+  main-is            : test.hs
+  build-depends      : base >=4.5
+                     , parsec >=3.1
+                     , QuickCheck >=2.6
diff --git a/hsnock.lhs b/hsnock.lhs
new file mode 100755
index 0000000..8218e10
--- /dev/null
+++ b/hsnock.lhs
@@ -0,0 +1,3 @@
+#!/usr/bin/env runhaskell
+> import Language.Nock5K
+> main = repl
diff --git a/nock.hs b/nock.hs
deleted file mode 100755
index c6386aa..0000000
--- a/nock.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env runhaskell
-import Nock5K.Repl
-main = repl
diff --git a/test.hs b/test.hs
index 65d3976..b6c1619 100644
--- a/test.hs
+++ b/test.hs
@@ -1,6 +1,5 @@
 import Control.Applicative
-import Nock5K.Parse
-import Nock5K.Spec
+import Language.Nock5K
 import Test.QuickCheck
 import Text.ParserCombinators.Parsec (parse)
 import Text.Printf